- more fixes from Andreas
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1002 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
91deef3734
commit
a9a766fafb
|
@ -807,6 +807,7 @@ fi
|
||||||
AM_CONDITIONAL(HAVE_USBTOKEN, test "x$USBTOKEN_MSG" = "xyes")
|
AM_CONDITIONAL(HAVE_USBTOKEN, test "x$USBTOKEN_MSG" = "xyes")
|
||||||
|
|
||||||
dnl --with-openct option
|
dnl --with-openct option
|
||||||
|
AC_SUBST(LIBOPENCT)
|
||||||
OPENCT_MSG=no
|
OPENCT_MSG=no
|
||||||
AC_ARG_WITH(openct, AC_HELP_STRING(
|
AC_ARG_WITH(openct, AC_HELP_STRING(
|
||||||
[--with-openct=PATH], [enable the OpenCT reader backend]))
|
[--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])
|
AC_DEFINE(HAVE_OPENCT, 1, [Have OpenCT libraries and header files])
|
||||||
OPENCT_MSG=yes
|
OPENCT_MSG=yes
|
||||||
|
LIBOPENCT="-lopenct"
|
||||||
],[
|
],[
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
CPPFLAGS="$saved_CPPFLAGS"
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
LDFLAGS="$saved_LDFLAGS"
|
||||||
LIBS="$saved_LIBS"
|
LIBS="$saved_LIBS"
|
||||||
|
LIBOPENCT=""
|
||||||
])
|
])
|
||||||
AC_MSG_RESULT($OPENCT_MSG)
|
AC_MSG_RESULT($OPENCT_MSG)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -183,6 +183,15 @@
|
||||||
</para>
|
</para>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<title>Compiling OpenSC with USBtoken support</title>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
Call configure with --enable-usbtoken and it
|
||||||
|
compile ok. No special libraries or stuff needed.
|
||||||
|
</para>
|
||||||
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<title>Installation without hotplug utils</title>
|
<title>Installation without hotplug utils</title>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,8 @@ includedir = ${prefix}/include/opensc
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
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
|
if HAVE_SSL
|
||||||
SSL_LIB = @LIBCRYPTO@
|
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
|
card-mcrd.c
|
||||||
|
|
||||||
libopensc_la_LDFLAGS = -version-info 0:6:0
|
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 \
|
include_HEADERS = opensc.h pkcs15.h emv.h \
|
||||||
errors.h types.h \
|
errors.h types.h \
|
||||||
|
|
|
@ -12,7 +12,7 @@ PROGRAMS_SSL = cryptoflex-tool pkcs15-init
|
||||||
endif
|
endif
|
||||||
|
|
||||||
bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
|
bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
|
||||||
pkcs11-tool \
|
pkcs11-tool cardos-info \
|
||||||
$(PROGRAMS_SSL)
|
$(PROGRAMS_SSL)
|
||||||
|
|
||||||
opensc_tool_SOURCES = opensc-tool.c util.c
|
opensc_tool_SOURCES = opensc-tool.c util.c
|
||||||
|
|
|
@ -40,11 +40,11 @@ int opt_reader = -1, opt_debug = 0, opt_wait = 0;
|
||||||
int quiet = 0;
|
int quiet = 0;
|
||||||
|
|
||||||
const struct option options[] = {
|
const struct option options[] = {
|
||||||
{"reader", 1, 0, 'r'},
|
{"reader", 1, 0, 'r'},
|
||||||
{"card-driver", 1, 0, 'c'},
|
{"card-driver", 1, 0, 'c'},
|
||||||
{"quiet", 0, 0, 'q'},
|
{"quiet", 0, 0, 'q'},
|
||||||
{"wait", 0, 0, 'w'},
|
{"wait", 0, 0, 'w'},
|
||||||
{"debug", 0, 0, 'd'},
|
{"debug", 0, 0, 'd'},
|
||||||
{0, 0, 0, 0}
|
{0, 0, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ const struct token_drv etoken_drv = {
|
||||||
.name = "Aladdin eToken PRO",
|
.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)
|
int etoken_test(char *product)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue