[pkg-opensc-commit] [engine-pkcs11] 24/43: Added "--with-pkcs11-module" configure option

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 0d0436e035f48dc049d7865c65f70953adc85966
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Sat Jan 16 15:06:26 2016 +0100

    Added "--with-pkcs11-module" configure option
---
 NEWS         |  9 ++++++---
 configure.ac | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index e1b8152..6e57817 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 NEWS for Engine PKCS#11 -- History of user visible changes
 
 New in 0.2.1; unreleased;
-* Fixed OpenSSL engines directory autoselection (Michał Trojnara).
-* Fixed PIN-less access to public keys (Mouse).
-* Require new libp11 0.3.1 for PKCS11_enumerate_public_keys().
+* Added "--with-pkcs11-module" configure option; addresses #36
+  (Michał Trojnara)
+* Fixed OpenSSL engines directory autoselection (Michał Trojnara)
+* Fixed PIN-less access to public keys (Mouse)
+* Require new libp11 0.3.1 for PKCS11_enumerate_public_keys()
+  (Michał Trojnara)
 
 New in 0.2.0; 2015-10-09; Nikos Mavrogiannopoulos
 * Added support for ECDSA when compiled with libp11 0.3.0
diff --git a/configure.ac b/configure.ac
index c0a3fc7..4253629 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,12 @@ AC_ARG_WITH(
 	fi]
 )
 
+AC_ARG_WITH(
+	[pkcs11-module],
+	[AS_HELP_STRING([--with-pkcs11-module], [default PKCS11 module])],
+	[pkcs11_module="${withval}"],
+	[pkcs11_module="`$PKG_CONFIG --variable=proxy_module --silence-errors p11-kit-1`"])
+
 dnl Checks for programs.
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -124,14 +130,6 @@ AC_CHECK_HEADERS([ \
 	locale.h getopt.h dlfcn.h utmp.h \
 ])
 
-PKG_CHECK_MODULES(
-	[P11KIT],
-	[p11-kit-1],
-	[proxy_module="`$PKG_CONFIG --variable=proxy_module p11-kit-1`"
-	 AC_DEFINE_UNQUOTED([DEFAULT_PKCS11_MODULE], "${proxy_module}", [p11-kit proxy])],
-	[]
-)
-
 PKG_CHECK_MODULES([LIBP11], [libp11 >= 0.3.1],, [AC_MSG_ERROR([libp11 >= 0.3.1 is required])])
 
 saved_LIBS=$LIBS
@@ -259,7 +257,12 @@ fi
 #done
 #LDFLAGS="${saved_LDFLAGS}"
 
-
+if test -n "${pkcs11_module}"; then
+	AC_DEFINE_UNQUOTED(
+		[DEFAULT_PKCS11_MODULE],
+		"${pkcs11_module}",
+		[PKCS11 module])
+fi
 AC_SUBST([enginesdir])
 AC_SUBST([ENGINE_LINK])
 AC_SUBST([ENGINE_PKCS11_VERSION_MAJOR])
@@ -303,6 +306,7 @@ Linker flags:            ${LDFLAGS}
 Libraries:               ${LIBS}
 
 enginesdir               ${enginesdir}
+DEFAULT_PKCS11_MODULE    ${pkcs11_module}
 
 LIBP11_CFLAGS:           ${LIBP11_CFLAGS}
 LIBP11_LIBS:             ${LIBP11_LIBS}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git