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

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Fri May 7 17:37:09 UTC 2010


Author: rousseau
Date: Fri May  7 17:37:08 2010
New Revision: 4930

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4930
Log:
- use libusb-1.0 and libusb-compat-0.1
- build for Snow Leopard

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=4930&op=diff
==============================================================================
--- trunk/Drivers/ccid/MacOSX/configure (original)
+++ trunk/Drivers/ccid/MacOSX/configure Fri May  7 17:37:08 2010
@@ -44,23 +44,9 @@
 PCSC_CFLAGS=${PCSC_CFLAGS:--I$(pwd)/MacOSX}
 PCSC_LIBS=${PCSC_LIBS:--framework PCSC}
 
-libusb-config --version &> /dev/null
-if [ $? -eq 0 ]
-then
-    echo "found libusb-config, using it"
-    LIBUSB_CFLAGS=$(libusb-config --cflags)
-    LIBUSB_LIBS=$(libusb-config --libs)
-	# if possible replace "-L/usr/local/lib -lusb"
-	# by "/usr/local/lib/libusb.a" to use a static link
-	LIBUSB_LIBS=${LIBUSB_LIBS/-L\/usr\/local\/lib -lusb//usr/local/lib/libusb.a}
-	echo $LIBUSB_LIBS
-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
+# use libusb-1.0 and libusb-compat-0.1
+LIBUSB_CFLAGS=-I/usr/local/include
+LIBUSB_LIBS="/usr/local/lib/libusb.a /usr/local/lib/libusb-1.0.a -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
 
 # RESPONSECODE is already defined by PCSC/wintypes.h
 # define needed here to compile examples/scardcontrol.c since config.h is
@@ -68,8 +54,8 @@
 CFLAGS="$CFLAGS -DRESPONSECODE_DEFINED_IN_WINTYPES_H"
 
 # Build a Universal Binary
-CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc"
-LDFLAGS="-arch i386 -arch ppc"
+CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64"
+LDFLAGS="-arch i386 -arch x86_64"
 CONFIGURE_ARGS="--disable-dependency-tracking"
 
 # do not build a static driver




More information about the Pcsclite-cvs-commit mailing list