[Pcsclite-cvs-commit] r3272 - /trunk/Drivers/ccid/MacOSX/configure

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Jan  7 16:27:52 2009
New Revision: 3272

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3272
Log:
do not overwrite LIBUSB_CFLAGS and LIBUSB_LIBS if libusb-config is found

Modified:
    trunk/Drivers/ccid/MacOSX/configure

Modified: trunk/Drivers/ccid/MacOSX/configure
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/MacOSX/configure?rev=3272&op=diff
==============================================================================
--- trunk/Drivers/ccid/MacOSX/configure (original)
+++ trunk/Drivers/ccid/MacOSX/configure Wed Jan  7 16:27:52 2009
@@ -48,10 +48,17 @@
 PCSC_CFLAGS=${PCSC_CFLAGS:--I$(pwd)/MacOSX}
 PCSC_LIBS=${PCSC_LIBS:--framework PCSC}
 
-# use libusb from OpenSC (universal binary)
-LIBUSB_CFLAGS=${LIBUSB_CFLAGS:--I/Library/OpenSC/include}
-#LIBUSB_LIBS=${LIBUSB_LIBS:--L/Library/OpenSC/lib -lusb}
-LIBUSB_LIBS=${LIBUSB_LIBS:-/Library/OpenSC/lib/libusb.a -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation}
+libusb-config --version &> /dev/null
+if [ $? -eq 0 ]
+then
+    echo "found libusb-config, using it"
+else
+    echo "no libusb-config found"
+    # use libusb from OpenSC (universal binary)
+    LIBUSB_CFLAGS=${LIBUSB_CFLAGS:--I/Library/OpenSC/include}
+    #LIBUSB_LIBS=${LIBUSB_LIBS:--L/Library/OpenSC/lib -lusb}
+    LIBUSB_LIBS=${LIBUSB_LIBS:-/Library/OpenSC/lib/libusb.a -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation}
+fi
 
 # RESPONSECODE is already defined by PCSC/wintypes.h
 # define needed here to compile examples/scardcontrol.c since config.h is