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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Jul 30 09:55:55 2008
New Revision: 3064

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3064
Log:
do not overwrite PCSC_CFLAGS, PCSC_LIBS, LIBUSB_CFLAGS and LIBUSB_LIBS
if already defined by the user

Closes [#310945] MacOSX/configure - disable forced OpenSC libusb usage,
permit other builds

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=3064&op=diff
==============================================================================
--- trunk/Drivers/ccid/MacOSX/configure (original)
+++ trunk/Drivers/ccid/MacOSX/configure Wed Jul 30 09:55:55 2008
@@ -44,12 +44,13 @@
 PKG_CONFIG="foobar"
 
 # find pcsc-lite header files in MacOSX/
-PCSC_CFLAGS="-I$(pwd)/MacOSX"
-PCSC_LIBS="-framework PCSC"
+# use ${varname:-word} to return word only if varname is not already defined
+PCSC_CFLAGS=${PCSC_CFLAGS:--I$(pwd)/MacOSX}
+PCSC_LIBS=${PCSC_LIBS:--framework PCSC}
 
 # use libusb from OpenSC (universal binary)
-LIBUSB_CFLAGS="-I/Library/OpenSC/include"
-LIBUSB_LIBS="-L/Library/OpenSC/lib -lusb"
+LIBUSB_CFLAGS=${LIBUSB_CFLAGS:--I/Library/OpenSC/include}
+LIBUSB_LIBS=${LIBUSB_LIBS:--L/Library/OpenSC/lib -lusb}
 
 # RESPONSECODE is already defined by PCSC/wintypes.h
 # define needed here to compile examples/scardcontrol.c since config.h is