summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in12
-rw-r--r--src/Makefile.am10
-rw-r--r--src/ccid/rfid_reader_cm5121_ccid_direct.c2
3 files changed, 21 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 1125175..c141be0 100644
--- a/configure.in
+++ b/configure.in
@@ -11,5 +11,17 @@ AC_EXEEXT
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+AC_ARG_WITH(ccid,
+ [ --with-ccid Include internal CCID driver],
+ [MY_CCID=1], [MY_CCID=0])
+
+# AC_SUBST(MY_CCID)
+AM_CONDITIONAL(MY_CCID, test "$MY_CCID" == "1")
+
+#AC_CHECK_HEADERS(usb.h, [have_libusb="yes"], [ AC_MSG_WARN([usb.h not found, use --enable-libusb=PATH. Otherwise, INDI will compile without Apogee USB support.]) ])
+
+AC_CHECK_LIB(usb, usb_close,,)
+AM_CONDITIONAL(HAVE_LIBUSB, test "x$have_libusb" = "xyes")
+
dnl Output the makefile
AC_OUTPUT(Makefile src/Makefile include/Makefile include/librfid/Makefile utils/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index dbc608f..ef44e7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,8 +6,14 @@ lib_LTLIBRARIES = librfid.la
CORE=rfid.c rfid_layer2.c rfid_protocol.c rfid_reader.c
L2=rfid_layer2_iso14443a.c rfid_layer2_iso14443b.c rfid_layer2_iso15693.c rfid_iso14443_common.c
PROTO=rfid_proto_tcl.c rfid_proto_mifare_ul.c rfid_proto_mifare_classic.c
-READER=rfid_reader_cm5121.c rfid_reader_cm5121_openct.c rfid_asic_rc632.c
+READER=rfid_reader_cm5121.c rfid_asic_rc632.c
+
+if MY_CCID
+READER_LOW=ccid/rfid_reader_cm5121_ccid_direct.c ccid/ccid-driver.c
+else
+READER_LOW=rfid_reader_cm5121_openct.c
+endif
librfid_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION) -lopenct
-librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(READER)
+librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(READER) $(READER_LOW)
diff --git a/src/ccid/rfid_reader_cm5121_ccid_direct.c b/src/ccid/rfid_reader_cm5121_ccid_direct.c
index a2dfb99..c6b2d15 100644
--- a/src/ccid/rfid_reader_cm5121_ccid_direct.c
+++ b/src/ccid/rfid_reader_cm5121_ccid_direct.c
@@ -5,7 +5,7 @@
#include <librfid/rfid_asic.h>
-#include <include/ccid/ccid-driver.h>
+#include "ccid-driver.h"
/* this is the sole function required by rfid_reader_cm5121.c */
int
personal git repositories of Harald Welte. Your mileage may vary