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

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Mon Jan 2 10:58:41 UTC 2012


Author: rousseau
Date: Mon Jan  2 10:58:41 2012
New Revision: 6159

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6159
Log:
Build a Universal Binary driver only if libusb is also a Universal
Binary library

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=6159&op=diff
==============================================================================
--- trunk/Drivers/ccid/MacOSX/configure (original)
+++ trunk/Drivers/ccid/MacOSX/configure Mon Jan  2 10:58:41 2012
@@ -45,8 +45,9 @@
 PCSC_LIBS=${PCSC_LIBS:--framework PCSC}
 
 # use libusb-1.0
+LIBUSB_ARCHIVE=/usr/local/lib/libusb-1.0.a
 LIBUSB_CFLAGS=-I/usr/local/include/libusb-1.0
-LIBUSB_LIBS="/usr/local/lib/libusb-1.0.a -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -lobjc"
+LIBUSB_LIBS="$LIBUSB_ARCHIVE -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -lobjc"
 
 # RESPONSECODE is already defined by PCSC/wintypes.h
 # define needed here to compile examples/scardcontrol.c since config.h is
@@ -54,7 +55,19 @@
 CFLAGS="$CFLAGS -DRESPONSECODE_DEFINED_IN_WINTYPES_H"
 
 # Build a Universal Binary
-CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64"
+UB=$(file $LIBUSB_ARCHIVE | grep "Mach-O universal binary")
+echo $UB
+if [ -z "$UB" ]
+then
+	echo "*************************"
+	echo "No Universal Binary build"
+	echo "*************************"
+else
+	echo "Universal Binary build"
+	CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64"
+fi
+echo
+
 CONFIGURE_ARGS="--disable-dependency-tracking"
 
 # do not build a static driver




More information about the Pcsclite-cvs-commit mailing list