giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge opensc-signer to opensc/src/signer, part #1 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@438 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2002-04-04 10:40:24 +00:00
parent d232bf29dd
commit 5c3c163862
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
configure.in
View File

@ -922,6 +922,63 @@ fi
AM_CONDITIONAL(HAVE_LDAP, test "x$LDAP_MSG" = "xyes")
### END LDAP SPECIFIC OPTIONS
### BEGIN ASSUAN SPECIFIC OPTIONS
AC_SUBST(CFLAGS_ASSUAN)
AC_SUBST(LIBASSUAN)
LIBASSUAN="-lassuan"
AC_ARG_WITH(assuan,
[ --with-assuan=PATH use Assuan libraries in PATH],
[
if test -d "$withval/lib"; then
if test -n "${need_dash_r}"; then
LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
else
LDFLAGS="-L${withval}/lib ${LDFLAGS}"
fi
else
if test -n "${need_dash_r}"; then
LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
else
LDFLAGS="-L${withval} ${LDFLAGS}"
fi
fi
if test -d "$withval/include"; then
CFLAGS_ASSUAN="-I${withval}/include ${CFLAGS_ASSUAN}"
else
CFLAGS_ASSUAN="-I${withval} ${CFLAGS_ASSUAN}"
fi
]
)
AC_CHECK_LIB(assuan, assuan_pipe_connect, , AC_MSG_ERROR([*** Assuan libraries not found - please install first]))
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CFLAGS_ASSUAN $CPPFLAGS"
AC_CHECK_HEADER(assuan.h, , AC_MSG_ERROR([*** Assuan headers not found - please install first]))
CPPFLAGS="$saved_CPPFLAGS"
### END ASSUAN SPECIFIC OPTIONS
PLUGINDIR="/usr/lib/mozilla/plugins"
AC_ARG_WITH(plugin-dir,
[ --with-plugin-dir=PATH install plugin to PATH [[/usr/lib/mozilla/plugins]]],
[
PLUGINDIR="$withval"
]
)
AC_SUBST(PLUGINDIR)
# Check for pin entry-program used by OpenSC-Signer
PIN_ENTRY="/usr/local/bin/gpinentry"
AC_ARG_WITH(pin-entry,
[ --with-pin-entry=FILE Run FILE as pin entry for OpenSC-Signer],
[
if test ! -z "$withval" -a "x$withval" != "xno" ; then
PIN_ENTRY="$withval"
fi
]
)
AC_DEFINE_UNQUOTED(PIN_ENTRY, "$PIN_ENTRY", [Pin entry program for OpenSC-Signer])
if test "x$prefix" = xNONE; then
prefix=$ac_default_prefix
fi
@ -986,6 +1043,8 @@ src/scconf/Makefile
src/scldap/Makefile
src/scrandom/Makefile
src/sia/Makefile
src/signer/Makefile
src/signer/npinclude/Makefile
src/tests/Makefile
src/tools/Makefile
])

2
src/Makefile.am
View File

@ -3,4 +3,4 @@
MAINTAINERCLEANFILES = Makefile.in
# Order IS important
SUBDIRS = common scconf scldap scrandom libopensc pkcs15init tests tools openssh scam pam sia pkcs11
SUBDIRS = common scconf scldap scrandom libopensc pkcs15init tests tools openssh scam pam sia signer pkcs11

2
src/signer/Makefile.am
View File

@ -11,8 +11,10 @@ INCLUDES = @CFLAGS_OPENSC@ @CFLAGS_ASSUAN@
plugindir = $(PLUGINDIR)
if HAVE_SSL
if HAVE_ASSUAN
plugin_LTLIBRARIES = opensc-signer.la
endif
endif
opensc_signer_la_LDFLAGS = -module -avoid-version
opensc_signer_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBASSUAN@