diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2011-11-29 16:48:04 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2011-11-29 16:48:04 +0000 |
| commit | b2358206d11fbd43a2dd7aa0b27bca66c82ecbf3 (patch) | |
| tree | 284cc6680d9de537d26b8aaf50c2cf10180fa728 | |
| parent | 5bf7ee7671abe771c00c9c79394c6937a1a13b28 (diff) | |
| download | libgphoto2-b2358206d11fbd43a2dd7aa0b27bca66c82ecbf3.tar.gz | |
make libusb 0.1 and libusb 1.0 default-on, but not mandatory
add usbscsi and usbdiskdirect only once (avoids make distclean issue)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13782 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | libgphoto2_port/configure.ac | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index af634fd26..933ae8674 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -338,9 +338,9 @@ AC_CHECK_LIB(pthread, pthread_create) GP_CONFIG_MSG([USB ports]) GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], [usb.h],[usb_open],[ - IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb usbdiskdirect usbscsi" -],[], - [disable-explicitly], + IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb" + ],[], + [default-on], [http://libusb.sourceforge.net/] ) @@ -350,11 +350,16 @@ dnl --------------------------------------------------------------------------- GP_CONFIG_MSG([USB ports]) GP_CHECK_LIBRARY([LIBUSB1],[libusb-1.0],[>= 1.0.0], [libusb.h],[libusb_init],[ - IOLIB_SUBDIRS="$IOLIB_SUBDIRS libusb1 usbdiskdirect usbscsi" + IOLIB_SUBDIRS="$IOLIB_SUBDIRS libusb1" ],[], - [disable-explicitly], + [default-on], [http://libusb.sourceforge.net/] ) + +if test "x$have_LIBUSB" = "xyes" -o "x$have_LIBUSB1" = "xyes" ; then + IOLIB_SUBDIRS="$IOLIB_SUBDIRS usbdiskdirect usbscsi" +fi + dnl depends on libusb's availability GP_UDEV([test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes]) |