add explicit option to enable/disable the ns plugin. patch by Alon Bar-Lev.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3228 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
c1130f7f93
commit
8875fe0296
16
configure.in
16
configure.in
|
@ -318,6 +318,21 @@ AC_ARG_WITH(plugin-dir,
|
|||
]
|
||||
)
|
||||
AC_SUBST(PLUGINDIR)
|
||||
AC_ARG_ENABLE(nsplugin,
|
||||
AC_HELP_STRING([--disable-nsplugin], [disable nsplugin (signer). [[default=no]]]),
|
||||
[ENABLE_NSPLUGIN="${enableval}"],
|
||||
[ENABLE_NSPLUGIN="yes"])
|
||||
|
||||
if test "x${ASSUAN_MSG}" != "xyes" -o "x${OPENSSL_MSG}" != "xyes"; then
|
||||
ENABLE_NSPLUGIN="no"
|
||||
fi
|
||||
if test "x${ENABLE_NSPLUGIN}" == "xyes"; then
|
||||
AM_CONDITIONAL(ENABLE_NSPLUGIN, true)
|
||||
NSPLUGIN_MSG=yes
|
||||
else
|
||||
AM_CONDITIONAL(ENABLE_NSPLUGIN, false)
|
||||
NSPLUGIN_MSG=no
|
||||
fi
|
||||
|
||||
# Check for PIN entry program used by OpenSC Signer
|
||||
PIN_ENTRY="/usr/local/bin/gpinentry"
|
||||
|
@ -412,5 +427,6 @@ echo "OpenSSL support: ${OPENSSL_MSG}"
|
|||
echo "PC/SC support: ${PCSC_MSG}"
|
||||
echo "OpenCT support: ${OPENCT_MSG}"
|
||||
echo "Assuan support: ${ASSUAN_MSG}"
|
||||
echo "NSPlugin support: ${NSPLUGIN_MSG}"
|
||||
echo ""
|
||||
|
||||
|
|
|
@ -10,11 +10,9 @@ EXTRA_DIST = testprog.c
|
|||
|
||||
INCLUDES = -I$(srcdir)/npinclude $(CPPFLAGS) $(OPENSSL_CFLAGS) $(LIBASSUAN_CFLAGS)
|
||||
|
||||
if HAVE_OPENSSL
|
||||
if HAVE_ASSUAN
|
||||
if ENABLE_NSPLUGIN
|
||||
lib_LTLIBRARIES = opensc-signer.la
|
||||
endif
|
||||
endif
|
||||
|
||||
opensc_signer_la_LDFLAGS = -module -avoid-version
|
||||
opensc_signer_la_LIBADD = @LIBOPENSC@ $(OPENSSL_LIBS) $(LIBASSUAN_LIBS)
|
||||
|
@ -25,8 +23,6 @@ noinst_HEADERS = \
|
|||
opensc-crypto.h opensc-support.h signer.h
|
||||
|
||||
install-exec-local: install-libLTLIBRARIES
|
||||
if HAVE_OPENSSL
|
||||
if HAVE_ASSUAN
|
||||
if ENABLE_NSPLUGIN
|
||||
-$(LN_S) -f $(libdir)/opensc-signer.so $(DESTDIR)$(plugindir)/
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue