[Pcsclite-cvs-commit] r3063 - in /trunk/Drivers/ccid: configure.in src/Makefile.am

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Jul 30 08:03:13 2008
New Revision: 3063

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3063
Log:
no need to use CoreFoundation and IOKit frameworks since we use libusb
that already includes them

Modified:
    trunk/Drivers/ccid/configure.in
    trunk/Drivers/ccid/src/Makefile.am

Modified: trunk/Drivers/ccid/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/configure.in?rev=3063&op=diff
==============================================================================
--- trunk/Drivers/ccid/configure.in (original)
+++ trunk/Drivers/ccid/configure.in Wed Jul 30 08:03:13 2008
@@ -80,15 +80,6 @@
 *-*-darwin*)
 	BUNDLE_HOST="MacOS"
 	DYN_LIB_EXT="dylib"
-
-	AC_SUBST(COREFOUNDATION)
-	COREFOUNDATION="-Wl,-framework,CoreFoundation"
-
-	AC_SUBST(IOKIT)
-	IOKIT="-Wl,-framework,IOKit"
-	if test "$GCC" = "yes"; then
-		CFLAGS="$CFLAGS -no-cpp-precomp"
-	fi
 	;;
 *-*-freebsd*)
 	BUNDLE_HOST="FreeBSD"
@@ -141,8 +132,6 @@
 
 	AC_CHECK_HEADERS(usb.h, [],
 		[ AC_MSG_ERROR([usb.h not found, install libusb or use ./configure LIBUSB_CFLAGS=...]) ])
-
-	LIBS="$LIBS $COREFOUNDATION $IOKIT"
 
 	AC_MSG_CHECKING([for usb_init])
 	AC_TRY_LINK_FUNC(usb_init, [ AC_MSG_RESULT([yes]) ],

Modified: trunk/Drivers/ccid/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Makefile.am?rev=3063&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Makefile.am (original)
+++ trunk/Drivers/ccid/src/Makefile.am Wed Jul 30 08:03:13 2008
@@ -53,8 +53,7 @@
 endif
 
 libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1)
-libccid_la_LIBADD = $(LEXLIB) $(COREFOUNDATION) $(IOKIT) \
-	$(LIBUSB_LIBS) $(PTHREAD_LIBS)
+libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS)
 libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \
 	$(SYMBOL_VISIBILITY) -D$(CCID_VERSION)