Fixed the --disable-libusb configure option (STR #4439)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11950 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 0fb25d7bdccb553064ad9f22eb04abe4ae7d13d6..76eabe97e1816dadd8def82312c8f5c836c8a5b8 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -14,6 +14,7 @@ CHANGES IN CUPS V1.7.4
        - The RPM spec file did not work due to the new Brazilian Portuguese
          localization (STR #4436)
        - Fixed an "IPP read error" issue (STR #4440)
+       - Fixed the --disable-libusb configure option (STR #4439)
 
 
 CHANGES IN CUPS V1.7.3

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 708f613dd2487bf2f3873fd384950d42f96be232..9451561206398651f55406cd3d3bd8467e46fc76 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -231,7 +231,7 @@ AC_SUBST(LIBUSB)
 AC_SUBST(USBQUIRKS)
 
 if test "x$PKGCONFIG" != x; then
-       if test x$enable_libusb = xyes -o $uname != Darwin; then
+       if test x$enable_libusb != xno -a $uname != Darwin; then
                AC_MSG_CHECKING(for libusb-1.0)
                if $PKGCONFIG --exists libusb-1.0; then
                        AC_MSG_RESULT(yes)
@@ -241,6 +241,9 @@ if test "x$PKGCONFIG" != x; then
                        USBQUIRKS="\$(DATADIR)/usb"
                else
                        AC_MSG_RESULT(no)
+                       if test x$enable_libusb = xyes; then
+                               AC_MSG_ERROR(libusb required for --enable-libusb.)
+                       fi
                fi
        fi
 elif test x$enable_libusb = xyes; then