Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / config-scripts / cups-common.m4

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 6e81ea52605d3e2a77c47cf45ab2d4a13b09c17f..a88692f35ddcd4756c694271f91938c3cb116af1 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 6964 2007-09-17 21:33:57Z mike $"
+dnl "$Id: cups-common.m4 7695 2008-06-26 00:46:24Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -83,14 +83,11 @@ LIBMALLOC=""
 AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
 
 if test x$enable_mallinfo = xyes; then
-       AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
-       if test "$ac_cv_lib_c_mallinfo" = "no"; then
-               AC_CHECK_LIB(malloc,mallinfo,
-                            LIBS="$LIBS"
-                            LIBMALLOC="-lmalloc"
-                            AC_DEFINE(HAVE_MALLINFO),
-                            LIBS="$LIBS")
-       fi
+       SAVELIBS="$LIBS"
+       LIBS=""
+       AC_SEARCH_LIBS(mallinfo, malloc, AC_DEFINE(HAVE_MALLINFO))
+       LIBMALLOC="$LIBS"
+       LIBS="$SAVELIBS"
 fi
 
 AC_SUBST(LIBMALLOC)
@@ -170,6 +167,27 @@ AC_TRY_COMPILE([#include <time.h>],[struct tm t;
 dnl See if we have the removefile(3) function for securely removing files
 AC_CHECK_FUNCS(removefile)
 
+dnl See if we have libusb...
+AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing, default=auto])
+
+LIBUSB=""
+AC_SUBST(LIBUSB)
+
+if test x$enable_libusb = xyes; then
+       check_libusb=yes
+elif test x$enable_libusb != xno -a $uname != Darwin; then
+       check_libusb=yes
+else
+       check_libusb=no
+fi
+
+if test $check_libusb = yes; then
+       AC_CHECK_LIB(usb, usb_init,[
+               AC_CHECK_HEADER(usb.h,
+                       AC_DEFINE(HAVE_USB_H)
+                       LIBUSB="-lusb")])
+fi
+
 dnl Flags for "ar" command...
 case $uname in
         Darwin* | *BSD*)
@@ -282,5 +300,5 @@ AC_SUBST(FONTS)
 AC_SUBST(LEGACY_BACKENDS)
 
 dnl
-dnl End of "$Id: cups-common.m4 6964 2007-09-17 21:33:57Z mike $".
+dnl End of "$Id: cups-common.m4 7695 2008-06-26 00:46:24Z mike $".
 dnl