From 2059f79793f0ed9a89a29f400f6e02b5b7c49f59 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Tue, 2 Aug 2016 08:37:33 +0200 Subject: [PATCH] install opensc.pc This allows applications to detect opensc version, as well as link against opensc's pkcs11 library if needed. --- configure.ac | 2 +- src/pkcs11/Makefile.am | 6 +++++- .../libopensc.pc.in => pkcs11/opensc-pkcs11.pc.in} | 8 +++----- 3 files changed, 9 insertions(+), 7 deletions(-) rename src/{libopensc/libopensc.pc.in => pkcs11/opensc-pkcs11.pc.in} (50%) diff --git a/configure.ac b/configure.ac index 1ae54545..75cf0310 100644 --- a/configure.ac +++ b/configure.ac @@ -795,11 +795,11 @@ AC_CONFIG_FILES([ src/Makefile src/common/Makefile src/libopensc/Makefile - src/libopensc/libopensc.pc src/libsm/Makefile src/pkcs11/Makefile src/pkcs11/versioninfo-pkcs11.rc src/pkcs11/versioninfo-pkcs11-spy.rc + src/pkcs11/opensc-pkcs11.pc src/pkcs15init/Makefile src/scconf/Makefile src/tests/Makefile diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index 448cab1b..6eeadc90 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/win32/ltrc.inc MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-pkcs11.rc $(srcdir)/versioninfo-pkcs11-spy.rc -EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in +EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in opensc-pkcs11.pc.in lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la @@ -19,6 +19,10 @@ OPENSC_PKCS11_LIBS = \ $(top_builddir)/src/common/libcompat.la \ $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = opensc-pkcs11.pc +DISTCLEANFILES = $(pkgconfig_DATA) + opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \ diff --git a/src/libopensc/libopensc.pc.in b/src/pkcs11/opensc-pkcs11.pc.in similarity index 50% rename from src/libopensc/libopensc.pc.in rename to src/pkcs11/opensc-pkcs11.pc.in index 1f550f34..49cf735b 100644 --- a/src/libopensc/libopensc.pc.in +++ b/src/pkcs11/opensc-pkcs11.pc.in @@ -3,9 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libopensc -Description: libopensc +Name: OpenSC smartcard framework +Description: OpenSC PKCS#11 module Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf -Cflags: -I${includedir} - +Libs: -L${libdir} -lopensc-pkcs11