diff --git a/configure.in b/configure.in
index e0be10d3..2b272a8a 100644
--- a/configure.in
+++ b/configure.in
@@ -807,6 +807,7 @@ fi
AM_CONDITIONAL(HAVE_USBTOKEN, test "x$USBTOKEN_MSG" = "xyes")
dnl --with-openct option
+AC_SUBST(LIBOPENCT)
OPENCT_MSG=no
AC_ARG_WITH(openct, AC_HELP_STRING(
[--with-openct=PATH], [enable the OpenCT reader backend]))
@@ -827,10 +828,12 @@ if test "x$with_openct" != "xno"; then
[
AC_DEFINE(HAVE_OPENCT, 1, [Have OpenCT libraries and header files])
OPENCT_MSG=yes
+ LIBOPENCT="-lopenct"
],[
CPPFLAGS="$saved_CPPFLAGS"
LDFLAGS="$saved_LDFLAGS"
LIBS="$saved_LIBS"
+ LIBOPENCT=""
])
AC_MSG_RESULT($OPENCT_MSG)
fi
diff --git a/docs/usbtoken.xml b/docs/usbtoken.xml
index ce01d5ba..54dd7e7a 100644
--- a/docs/usbtoken.xml
+++ b/docs/usbtoken.xml
@@ -183,6 +183,15 @@
+
+ Compiling OpenSC with USBtoken support
+
+
+ Call configure with --enable-usbtoken and it
+ compile ok. No special libraries or stuff needed.
+
+
+
Installation without hotplug utils
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index fa7ee176..1faa51ec 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -4,7 +4,8 @@ includedir = ${prefix}/include/opensc
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = Makefile.mak libopensc.pc.in reader-pcsc.c
+EXTRA_DIST = Makefile.mak libopensc.pc.in \
+ reader-pcsc.c reader-openct.c reader-usbtoken.c
if HAVE_SSL
SSL_LIB = @LIBCRYPTO@
@@ -42,7 +43,7 @@ libopensc_la_SOURCES = sc.c ctx.c module.c asn1.c log.c base64.c \
card-mcrd.c
libopensc_la_LDFLAGS = -version-info 0:6:0
-libopensc_la_LIBADD = @LIBDL@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF) -lopenct
+libopensc_la_LIBADD = @LIBDL@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF) @LIBOPENCT@
include_HEADERS = opensc.h pkcs15.h emv.h \
errors.h types.h \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 43e193d9..ec8199da 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -12,7 +12,7 @@ PROGRAMS_SSL = cryptoflex-tool pkcs15-init
endif
bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
- pkcs11-tool \
+ pkcs11-tool cardos-info \
$(PROGRAMS_SSL)
opensc_tool_SOURCES = opensc-tool.c util.c
diff --git a/src/tools/cardos-info.c b/src/tools/cardos-info.c
index d9fe4964..f5d42feb 100644
--- a/src/tools/cardos-info.c
+++ b/src/tools/cardos-info.c
@@ -40,11 +40,11 @@ int opt_reader = -1, opt_debug = 0, opt_wait = 0;
int quiet = 0;
const struct option options[] = {
- {"reader", 1, 0, 'r'},
+ {"reader", 1, 0, 'r'},
{"card-driver", 1, 0, 'c'},
- {"quiet", 0, 0, 'q'},
- {"wait", 0, 0, 'w'},
- {"debug", 0, 0, 'd'},
+ {"quiet", 0, 0, 'q'},
+ {"wait", 0, 0, 'w'},
+ {"debug", 0, 0, 'd'},
{0, 0, 0, 0}
};
diff --git a/src/usbtoken/etoken.c b/src/usbtoken/etoken.c
index c9061f0c..f9f26708 100644
--- a/src/usbtoken/etoken.c
+++ b/src/usbtoken/etoken.c
@@ -17,7 +17,7 @@ const struct token_drv etoken_drv = {
.name = "Aladdin eToken PRO",
};
-char *etoken_products[] = { "529/50c/100", "529/512/100", "529/514/100", 0 };
+char *etoken_products[] = { "529/50c/100", "529/514/100", 0 };
int etoken_test(char *product)
{