From 2474073d6754db9eb7ca03df918cd6b9c9bbda03 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 3 Nov 2004 13:42:48 +0000
Subject: [PATCH] Replace ld version script with libtool -export-symbols-regex.

---
 configure.in      | 14 --------------
 lib/Makefile.am   | 12 +++---------
 lib/libtasn1.vers |  5 -----
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 lib/libtasn1.vers

diff --git a/configure.in b/configure.in
index 239ba2f..3c8e258 100644
--- a/configure.in
+++ b/configure.in
@@ -126,20 +126,6 @@ AC_MSG_RESULT([***
 ])
 AM_PROG_LIBTOOL
 
-GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
-if test "$GLD"; then
-have_ld_version_script=yes
-  AC_MSG_RESULT(yes)
-else
-have_ld_version_script=no
-  AC_MSG_RESULT(no)
-AC_MSG_WARN(***
-*** You may want to rerun configure using --with-gnu-ld to enable versioned symbols.
-)
-fi
-
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-
 LIBTASN1_LIBS="-L${libdir} -ltasn1 $LIBS"
 LIBTASN1_CFLAGS="-I${includedir}"
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 372ea2f..cb6c65f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,21 +12,15 @@ m4data_DATA = libtasn1.m4
 
 lib_LTLIBRARIES = libtasn1.la
 
-if HAVE_LD_VERSION_SCRIPT
-  libtasn1_version_script_cmd = -Wl,--version-script=$(srcdir)/libtasn1.vers
-else
-  libtasn1_version_script_cmd =
-endif
-
-
 # Separate so we can create the documentation
 COBJECTS = ASN1.y decoding.c gstr.c errors.c parser_aux.c \
            structure.c element.c coding.c
 
 libtasn1_la_SOURCES = $(COBJECTS) 
 
-libtasn1_la_LDFLAGS = -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	$(libtasn1_version_script_cmd)
+libtasn1_la_LDFLAGS = -no-undefined \
+	-export-symbols-regex '^(_asn1|asn1|libtasn1).*' \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 asn1-api.tex: $(COBJECTS)
 	@echo "% \\newpage" > asn1-api.tex
diff --git a/lib/libtasn1.vers b/lib/libtasn1.vers
deleted file mode 100644
index e4b8a46..0000000
--- a/lib/libtasn1.vers
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBTASN1_0_2
-{
-  global: _asn1*; asn1*; libtasn1*;
-  local: *;
-};
-- 
2.11.4.GIT