[pkg-opensc-commit] [pkcs11-helper] 159/253: Fix libtool versioning issues

[Eric Dorland]

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

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

commit 627507c5395691f38af150206a2278371a5d6d9e
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Sat Mar 15 11:20:25 2008 +0000

    Fix libtool versioning issues
---
 configure.ac    | 22 +++++++++++-----------
 lib/Makefile.am |  9 ++-------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index a286c1d..6260324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,14 +67,10 @@ AC_SUBST([PKCS11H_VERSION_MAJOR])
 AC_SUBST([PKCS11H_VERSION_MINOR])
 AC_SUBST([PKCS11H_VERSION_FIX])
 
-LIBPKCS11_HELPER_LT_CURRENT="${PKCS11H_VERSION_MAJOR}"
+LIBPKCS11_HELPER_LT_CURRENT="1"
+LIBPKCS11_HELPER_LT_OLDEST="1"
 LIBPKCS11_HELPER_LT_REVISION="0"
-LIBPKCS11_HELPER_LT_AGE="0"
-LIBPKCS11_HELPER_LT_MAJOR="$((${LIBPKCS11_HELPER_LT_CURRENT}-${LIBPKCS11_HELPER_LT_AGE}))"
-AC_SUBST([LIBPKCS11_HELPER_LT_CURRENT])
-AC_SUBST([LIBPKCS11_HELPER_LT_REVISION])
-AC_SUBST([LIBPKCS11_HELPER_LT_AGE])
-AC_SUBST([LIBPKCS11_HELPER_LT_MAJOR])
+LIBPKCS11_HELPER_LT_AGE="$((${LIBPKCS11_HELPER_LT_CURRENT}-${LIBPKCS11_HELPER_LT_OLDEST}))"
 
 AC_CANONICAL_HOST
 
@@ -88,11 +84,9 @@ AC_ARG_WITH(
 test -z "${WIN32}" && WIN32="no"
 test -z "${CYGWIN}" && CYGWIN="no"
 case "${host}" in
-	*-mingw32*)
-		WIN32="yes"
-	;;
-	*-winnt*)
+ 	*-mingw32*|*-winnt*)
 		WIN32="yes"
+		WIN_LIBPREFIX="lib"
 	;;
 	*-cygwin*)
 		AC_MSG_CHECKING([cygwin mode to use])
@@ -103,6 +97,7 @@ case "${host}" in
 			WIN32="yes"
 		else
 			AC_MSG_RESULT([Using cygwin])
+			WIN_LIBPREFIX="cyg"
 			AC_DEFINE([PKCS11H_USE_CYGWIN], [1], [Define if you are on Cygwin])
 		fi
 	;;
@@ -425,6 +420,11 @@ fi
 pkgconfigdir="\$(libdir)/pkgconfig"
 AC_SUBST([apidocdir])
 AC_SUBST([pkgconfigdir])
+AC_SUBST([LIBPKCS11_HELPER_LT_CURRENT])
+AC_SUBST([LIBPKCS11_HELPER_LT_REVISION])
+AC_SUBST([LIBPKCS11_HELPER_LT_AGE])
+AC_SUBST([LIBPKCS11_HELPER_LT_OLDEST])
+AC_SUBST([WIN_LIBPREFIX])
 AC_SUBST([PKCS11H_FEATURES])
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
 AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fa0cd24..9194ab3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -123,13 +123,8 @@ endif
 
 if WIN32
 mylibdir=$(libdir)
-if CYGWIN
-mylib_DATA=.libs/cygpkcs11-helper- at LIBPKCS11_HELPER_LT_MAJOR@.dll.def
-.libs/cygpkcs11-helper- at LIBPKCS11_HELPER_LT_MAJOR@.dll.def:	libpkcs11-helper.la
-else
-mylib_DATA=.libs/libpkcs11-helper- at LIBPKCS11_HELPER_LT_MAJOR@.dll.def
-.libs/libpkcs11-helper- at LIBPKCS11_HELPER_LT_MAJOR@.dll.def:	libpkcs11-helper.la
-endif
+mylib_DATA=.libs/@WIN_LIBPREFIX at pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST at .dll.def
+.libs/@WIN_LIBPREFIX at pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST at .dll.def:	libpkcs11-helper.la
 endif
 
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

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