[pkg-opensc-commit] [libp11] 58/86: Support shared module extensions other than .so

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libp11.

commit da3066dd1ae49760fb9e9a75d50301808844375a
Author: Michal Trojnara <Michal.Trojnara at mirt.net>
Date:   Tue Mar 1 12:54:35 2016 +0100

    Support shared module extensions other than .so
---
 configure.ac    |  1 +
 src/Makefile.am | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 24ca99e..8c49ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,6 +204,7 @@ AC_SUBST([LIBP11_LT_REVISION])
 AC_SUBST([LIBP11_LT_AGE])
 AC_SUBST([LIBP11_LT_OLDEST])
 AC_SUBST([WIN_LIBPREFIX])
+AC_SUBST([SHARED_EXT], $(eval echo "${shrext_cmds}"))
 
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
 AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c2bbbb..b76e9d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,8 @@ lib_LTLIBRARIES = libp11.la
 engines_LTLIBRARIES = pkcs11.la
 pkgconfig_DATA = libp11.pc
 
+SHARED_EXT=@SHARED_EXT@
+
 libp11_la_SOURCES = libpkcs11.c p11_attr.c p11_cert.c p11_err.c p11_key.c \
 	p11_load.c p11_misc.c p11_rsa.c p11_ec.c p11_slot.c p11_front.c \
 	atfork.c libp11.exports
@@ -31,14 +33,14 @@ dist_noinst_DATA += pkcs11.rc
 endif
 pkcs11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_EXTRA_CFLAGS) $(OPENSSL_CFLAGS)
 pkcs11_la_LIBADD = libp11.la $(OPENSSL_LIBS)
-pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -avoid-version \
-	-export-symbols "$(srcdir)/pkcs11.exports"
+pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT)
+	-avoid-version -export-symbols "$(srcdir)/pkcs11.exports"
 
 # OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
 all-local:
-	cd .libs && $(LN_S) -f pkcs11.so libpkcs11.so
+	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
 install-exec-hook:
-	cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11.so libpkcs11.so
+	cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
 
 if WIN32
 # def file required for MS users to build library

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