Fixed missing -lp11 when building the engine

bphinz · Jan 28, 2016 · e95b7a5 · e95b7a5
1 parent eee8873
commit e95b7a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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" \