Merge changes from CUPS 1.6svn-r10310.

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

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 04e700eb511db3328b37fd7ab4087591e4b7b736..9b8ac80aa03804f14880e0e033a9dc3c09645584 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -225,24 +225,20 @@ AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing])
 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 -a "x$PKGCONFIG" != x; then
-       AC_MSG_CHECKING(for libusb-1.0)
-       if $PKGCONFIG --exists libusb-1.0; then
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_LIBUSB)
-               CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
-               LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
-       else
-               AC_MSG_RESULT(no)
+if test "x$PKGCONFIG" != x; then
+       if test x$enable_libusb = xyes -o $uname != Darwin; then
+               AC_MSG_CHECKING(for libusb-1.0)
+               if $PKGCONFIG --exists libusb-1.0; then
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_LIBUSB)
+                       CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
+                       LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+               else
+                       AC_MSG_RESULT(no)
+               fi
        fi
+elif x$enable_libusb = xyes; then
+       AC_MSG_ERROR(Need pkg-config to enable libusb support.)
 fi
 
 dnl See if we have libwrap for TCP wrappers support...
@@ -353,12 +349,6 @@ case $uname in
                dnl Check for dynamic store function...
                AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
 
-               dnl Check for new ColorSync APIs...
-               SAVELIBS="$LIBS"
-               LIBS="$LIBS -framework ApplicationServices"
-               AC_CHECK_FUNCS(ColorSyncRegisterDevice)
-               LIBS="$SAVELIBS"
-
                dnl Check for the new membership functions in MacOSX 10.4...
                AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
                AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))