diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2011-11-11 18:29:04 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2011-11-11 18:29:04 +0000 |
| commit | bb6a13b9eb0d6c014130af51a5da7c9cf0743fc4 (patch) | |
| tree | a5b4a5e070888a5ab4b08db4a548716f4a0d581f | |
| parent | 4f50919c6c2267a81cb2ce6d38f4b1497a2650fc (diff) | |
| download | libgphoto2-bb6a13b9eb0d6c014130af51a5da7c9cf0743fc4.tar.gz | |
hook in libusb 1.0 driver
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13767 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | libgphoto2_port/configure.ac | 14 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port-version.c | 6 | ||||
| -rw-r--r-- | libgphoto2_port/po/POTFILES.in | 1 |
3 files changed, 18 insertions, 3 deletions
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 32acd90b6..af634fd26 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -344,8 +344,19 @@ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], [http://libusb.sourceforge.net/] ) +dnl --------------------------------------------------------------------------- +dnl libusb1 +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" + ],[], + [disable-explicitly], + [http://libusb.sourceforge.net/] +) dnl depends on libusb's availability -GP_UDEV([test "x$have_LIBUSB" = xyes]) +GP_UDEV([test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes]) dnl --------------------------------------------------------------------------- dnl disk - hal and various stuff @@ -475,6 +486,7 @@ libgphoto2_port/Makefile libgphoto2_port.pc libgphoto2_port-uninstalled.pc serial/Makefile +libusb1/Makefile usb/Makefile usbdiskdirect/Makefile usbscsi/Makefile diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c index ad1296171..c22d0946f 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c @@ -40,8 +40,10 @@ const char **gp_port_library_version(GPVersionVerbosity verbose) #else "no ltdl", #endif -#ifdef HAVE_LIBUSB - "USB", +#ifdef HAVE_LIBUSB1 + "USB (libusb1)", +#elif HAVE_LIBUSB + "USB (libusb0)", #else "no USB", #endif diff --git a/libgphoto2_port/po/POTFILES.in b/libgphoto2_port/po/POTFILES.in index 32514be24..82458bda9 100644 --- a/libgphoto2_port/po/POTFILES.in +++ b/libgphoto2_port/po/POTFILES.in @@ -3,6 +3,7 @@ libgphoto2_port/gphoto2-port-result.c libgphoto2_port/gphoto2-port.c serial/unix.c usb/libusb.c +libusb1/libusb1.c disk/disk.c usbdiskdirect/linux.c usbscsi/linux.c |