Changeset 1016

Timestamp:

03/14/08 18:20:52 (9 months ago)

Author:

alonbl

Message:

Update conditionals, remove unused pcsc stuff

Location:

branches/alonbl/build

Files:

• configure.ac (modified) (4 diffs)
• src/ifd/sys-linux.c (modified) (2 diffs)
• src/pcsc/Makefile.am (modified) (1 diff)

branches/alonbl/build/configure.ac

@@ -327 +327 @@
                 [LIBUSB],
                 [libusb],
-                [AC_DEFINE([HAVE_LIBUSB], [1], [Have libusb libraries and header files])],
+                [AC_DEFINE([ENABLE_LIBUSB], [1], [Have libusb libraries and header files])],
                 [AC_MSG_ERROR([Cannot detect libusb])]
         )
@@ -345 +345 @@
                                 [PCSC],
                                 [libpcsclite],
-                                [AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation])],
+                                ,
+                                [AC_MSG_ERROR([Cannot locate pcsc-lite])]
                         )
                 ;;
         esac
-
-        saved_LIBS="$LIBS"
-        saved_CFLAGS="$CFLAGS"
-        CFLAGS="${CFLAGS} ${PCSC_CFLAGS}"
-        LIBS="${LIBS} ${PCSC_LIBS}"
-        AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM([[
-#include <stdlib.h>
-#ifdef __APPLE__
-#include <PCSC/wintypes.h>
-#include <PCSC/winscard.h>
-#else
-#include <winscard.h>
-#endif
-
-void f (void) {
-        SCardControl(NULL, NULL, 0, NULL, NULL);
-}
-                ]])],
-                [AC_DEFINE([HAVE_PCSC_OLD], [1], [old version of pc/sc-lite])]
-)
-
-        AC_CHECK_HEADER(
-                [reader.h],
-                [AC_DEFINE([HAVE_READER_H], [1], [Define if pcsc-lite with reader.h exists])],
-                [AC_MSG_WARN([reader.h not found, install pcsc-lite 1.2.9-beta8 or later, or use PCSC_CFLAGS=... ./configure])],
-                [#include <reader.h>]
-        )
-        CFLAGS="${saved_CFLAGS}"
-        LIBS="${saved_LIBS}"
 fi
 
@@ -384 +355 @@
         OPTIONAL_LIBUSB_CFLAGS="${LIBUSB_CFLAGS}"
         OPTIONAL_LIBUSB_LIBS="${LIBUSB_LIBS}"
-fi
-if test "${enable_pcsc}" = "yes"; then
-        OPTIONAL_PCSC_CFLAGS="${PCSC_CFLAGS}"
-        OPTIONAL_PCSC_LIBS="${PCSC_LIBS}"
 fi
 
@@ -424 +391 @@
 AC_SUBST([OPTIONAL_LIBUSB_CFLAGS])
 AC_SUBST([OPTIONAL_LIBUSB_LIBS])
-AC_SUBST([OPTIONAL_PCSC_CFLAGS])
-AC_SUBST([OPTIONAL_PCSC_LIBS])
 
 AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])

branches/alonbl/build/src/ifd/sys-linux.c

@@ -26 +26 @@
 #include <errno.h>
 #include <limits.h>
-#ifdef HAVE_LIBUSB
+#ifdef ENABLE_LIBUSB
 #include <usb.h>
 #endif
@@ -385 +385 @@
 int ifd_scan_usb(void)
 {
-#ifdef HAVE_LIBUSB
+#ifdef ENABLE_LIBUSB
         ifd_devid_t id;
         struct usb_bus *bus;

branches/alonbl/build/src/pcsc/Makefile.am

@@ -7 +7 @@
 openct_ifd_la_SOURCES = pcsc.c
 openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined
-openct_ifd_la_LIBADD = $(OPTIONAL_PCSC_LIBS) $(top_srcdir)/src/ctapi/libopenctapi.la
+openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_srcdir)/src/ctapi/libopenctapi.la
 openct_ifd_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/ctapi \
-        $(OPTIONAL_PCSC_CFLAGS)
+        $(PCSC_CFLAGS)
 
 # Don't use ENABLE_BUNDLES for this case, pcsc-lite loads