[pkg-opensc-commit] [libp11] 27/86: Fixed missing -lp11 when building the engine
Eric Dorland
eric at moszumanska.debian.org
Sun Jul 24 21:40:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository libp11.
commit e95b7a53ba8019930f821d2b6d031b6784c64f8f
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date: Thu Jan 28 16:13:30 2016 +0100
Fixed missing -lp11 when building the engine
---
configure.ac | 4 +---
src/Makefile.am | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index a31c139..24ca99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,8 +237,8 @@ libp11 has been configured with the following options:
Version: ${PACKAGE_VERSION}
libp11 directory: $(eval eval eval echo "${libdir}")
Engine directory: ${enginesdir}
-API doc support: ${enable_api_doc}
Default PKCS11 module: ${pkcs11_module}
+API doc support: ${enable_api_doc}
Host: ${host}
Compiler: ${CC}
@@ -247,8 +247,6 @@ Compiler flags: ${CFLAGS}
Linker flags: ${LDFLAGS}
Libraries: ${LIBS}
-LIBP11_CFLAGS: ${LIBP11_CFLAGS}
-LIBP11_LIBS: ${LIBP11_LIBS}
OPENSSL_CFLAGS: ${OPENSSL_CFLAGS}
OPENSSL_LIBS: ${OPENSSL_LIBS}
diff --git a/src/Makefile.am b/src/Makefile.am
index 006860f..3f9dbb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,9 +30,8 @@ libpkcs11_la_SOURCES += pkcs11.rc
else
dist_noinst_DATA += pkcs11.rc
endif
-libpkcs11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_EXTRA_CFLAGS) $(OPENSSL_CFLAGS) \
- $(LIBP11_CFLAGS)
-libpkcs11_la_LIBADD = $(OPENSSL_LIBS) $(LIBP11_LIBS)
+libpkcs11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_EXTRA_CFLAGS) $(OPENSSL_CFLAGS)
+libpkcs11_la_LIBADD = libp11.la $(OPENSSL_LIBS)
libpkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
-module -shared -avoid-version \
-export-symbols "$(srcdir)/pkcs11.exports" \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git
More information about the pkg-opensc-commit
mailing list