[gphoto-cvs] SF.net SVN: gphoto:[13767] branches/libgphoto2-2_4/libgphoto2/ libgphoto2_port

[<mar...@us...>]

Revision: 13767
          http://gphoto.svn.sourceforge.net/gphoto/?rev=13767&view=rev
Author:   marcusmeissner
Date:     2011-11-11 18:29:04 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
hook in libusb 1.0 driver

Modified Paths:
--------------
    branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/configure.ac
    branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c
    branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/po/POTFILES.in

Modified: branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/configure.ac
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/configure.ac	2011-11-11 18:27:44 UTC (rev 13766)
+++ branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/configure.ac	2011-11-11 18:29:04 UTC (rev 13767)
@@ -344,8 +344,19 @@
 		[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.pc
 libgphoto2_port-uninstalled.pc
 serial/Makefile
+libusb1/Makefile
 usb/Makefile
 usbdiskdirect/Makefile
 usbscsi/Makefile

Modified: branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c	2011-11-11 18:27:44 UTC (rev 13766)
+++ branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c	2011-11-11 18:29:04 UTC (rev 13767)
@@ -40,8 +40,10 @@
 #else
 			"no ltdl",
 #endif
-#ifdef HAVE_LIBUSB
-			"USB",
+#ifdef HAVE_LIBUSB1
+			"USB (libusb1)",
+#elif HAVE_LIBUSB
+			"USB (libusb0)",
 #else
 			"no USB",
 #endif

Modified: branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/po/POTFILES.in
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/po/POTFILES.in	2011-11-11 18:27:44 UTC (rev 13766)
+++ branches/libgphoto2-2_4/libgphoto2/libgphoto2_port/po/POTFILES.in	2011-11-11 18:29:04 UTC (rev 13767)
@@ -3,6 +3,7 @@
 libgphoto2_port/gphoto2-port.c
 serial/unix.c
 usb/libusb.c
+libusb1/libusb1.c
 disk/disk.c
 usbdiskdirect/linux.c
 usbscsi/linux.c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.