From: Marcus Brinkmann <mb@g10code.com>
Date: Mon, 23 Dec 2002 23:45:28 +0000 (+0000)
Subject: 2002-12-24  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-0-4-1~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bf2a7b4a2737eb7de9f788c7103d54c0928bab2;p=gpgme.git

2002-12-24  Marcus Brinkmann  <marcus@g10code.de>

	* configure.ac: New conditional HAVE_LD_VERSION_SCRIPT.
	Call AC_CANONICAL_HOST, use host instead target.

gpgme/
2002-12-24  Marcus Brinkmann  <marcus@g10code.de>

	* libgpgme.vers: New file.
	* Makefile.am (EXTRA_DIST): Add libgpgme.vers.
	(libgpgme_version_script_cmd): New variable.
	(libgpgme_la_LDFLAGS): Add libgpgme_version_script_cmd here.
	(libgpgme_la_DEPENDENCIES): New variable.
---

diff --git a/ChangeLog b/ChangeLog
index de40c10..cf0a230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-24  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: New conditional HAVE_LD_VERSION_SCRIPT.
+	Call AC_CANONICAL_HOST, use host instead target.
+
 2002-12-23  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac: Bump up to 0.4.1.
diff --git a/configure.ac b/configure.ac
index 67ce878..fec653d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,10 +81,24 @@ dnl Don't default to build static libs.
 dnl AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
+AC_CANONICAL_HOST
+# For now we hardcode the use of version scripts.  It would be better
+# to write a test for this or even implement this within libtool.
+have_ld_version_script=no
+case "${host}" in
+    *-*-linux*)
+	have_ld_version_script=yes
+        ;;
+    *-*-gnu*)
+	have_ld_version_script=yes
+        ;;
+esac
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
+
 GPG_DEFAULT=no
 GPGSM_DEFAULT=no
 component_system=None
-case "${target}" in
+case "${host}" in
     *-*-mingw32* | i?86-emx-os2 | i?86-*-os2*emx | i?86-*-msdosdjgpp* )
         # special stuff for Windoze NT
         # OS/2 with the EMX environment
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 80acafd..448252a 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-24  Marcus Brinkmann  <marcus@g10code.de>
+
+	* libgpgme.vers: New file.
+	* Makefile.am (EXTRA_DIST): Add libgpgme.vers.
+	(libgpgme_version_script_cmd): New variable.
+	(libgpgme_la_LDFLAGS): Add libgpgme_version_script_cmd here.
+	(libgpgme_la_DEPENDENCIES): New variable.
+
 2002-12-23  Marcus Brinkmann  <marcus@g10code.de>
 
 	* key.c (gpgme_key_get_string_attr): Don't accept GPGME_ATTR_IS_SECRET.
diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index 8c8440b..fa040b1 100644
--- a/gpgme/Makefile.am
+++ b/gpgme/Makefile.am
@@ -19,7 +19,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = gpgme-config.in gpgme.m4 mkerrors mkstatus
+EXTRA_DIST = gpgme-config.in gpgme.m4 mkerrors mkstatus libgpgme.vers
 BUILT_SOURCES = errors.c status-table.h
 MOSTLYCLEANFILES = errors.c status-table.h
 bin_SCRIPTS = gpgme-config
@@ -28,8 +28,15 @@ m4data_DATA = gpgme.m4
 include_HEADERS = gpgme.h
 lib_LTLIBRARIES = libgpgme.la
 
-libgpgme_la_LDFLAGS = -version-info \
+if HAVE_LD_VERSION_SCRIPT
+libgpgme_version_script_cmd = -Wl,--version-script=$(srcdir)/libgpgme.vers
+else
+libgpgme_version_script_cmd =
+endif
+
+libgpgme_la_LDFLAGS = $(libgpgme_version_script_cmd) -version-info \
       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
+
 if BUILD_ASSUAN
 AM_CPPFLAGS = -I$(top_srcdir)/assuan
 assuan_libobjs = ../assuan/libassuan.la
@@ -73,6 +80,10 @@ libgpgme_la_SOURCES =							\
 	engine.h engine-backend.h engine.c rungpg.c status-table.h	\
 	${gpgsm_components} sema.h io.h ${system_components}		\
 	debug.c debug.h gpgme.c version.c errors.c
+
+libgpgme_la_DEPENDENCIES = ${assuan_libobjs} @LTLIBOBJS@ \
+	$(srcdir)/libgcrypt.vers
+
 libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
 
 errors.c : gpgme.h