# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/02 11:34:20+02:00 smurf@smurf.noris.de 
#   add versioning
# 
# libmysql/libmysqlclient.vers
#   2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +5 -0
# 
# libmysql_r/Makefile.am
#   2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +8 -2
#   add versioning
# 
# libmysql/libmysqlclient.vers
#   2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +0 -0
#   BitKeeper file /daten/src/mysql/mysql41/libmysql/libmysqlclient.vers
# 
# libmysql/Makefile.am
#   2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +9 -2
#   add versioning
# 
# debian/changelog
#   2004/10/02 11:34:15+02:00 smurf@smurf.noris.de +6 -0
#   add versioning
# 
# configure.ac
#   2004/10/02 11:34:15+02:00 smurf@smurf.noris.de +21 -0
#   add versioning
# 
diff -Nru a/configure.ac b/configure.ac
--- a/configure.ac	2004-10-02 11:51:06 +02:00
+++ b/configure.ac	2004-10-02 11:51:06 +02:00
@@ -382,6 +382,27 @@
 
 export CC CXX CFLAGS LD LDFLAGS AR
 
+
+dnl This is after AC_PROG_LIBTOOL so that the LD variable
+dnl has been set.
+
+AC_MSG_CHECKING([whether we have GNU ld or compatible])
+
+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")
+
+
 ndb_cxxflags_fix=
 if test "$GXX" = "yes"
 then
diff -Nru a/debian/changelog b/debian/changelog
--- a/debian/changelog	2004-10-02 11:51:06 +02:00
+++ b/debian/changelog	2004-10-02 11:51:06 +02:00
@@ -1,3 +1,9 @@
+mysql-dfsg (4.1.5+bk20040930-2) unstable; urgency=low
+
+  * Add versioning to the client libraries.
+
+ -- Matthias Urlichs <smurf@debian.org>  Sat,  2 Oct 2004 11:32:28 +0200
+
 mysql-dfsg (4.1.5+bk20040930-1) unstable; urgency=low
 
   * Merged Upstream
diff -Nru a/libmysql/Makefile.am b/libmysql/Makefile.am
--- a/libmysql/Makefile.am	2004-10-02 11:51:06 +02:00
+++ b/libmysql/Makefile.am	2004-10-02 11:51:06 +02:00
@@ -27,10 +27,17 @@
 
 include $(srcdir)/Makefile.shared
 
+if HAVE_LD_VERSION_SCRIPT
+  libmysql_version_script_cmd = -Wl,--version-script=$(srcdir)/libmysqlclient.vers
+else
+  libmysql_version_script_cmd =
+endif
+
 libmysqlclient_la_SOURCES = $(target_sources)
 libmysqlclient_la_LIBADD = $(target_libadd)
-libmysqlclient_la_LDFLAGS = $(target_ldflags)
-EXTRA_DIST = Makefile.shared
+libmysqlclient_la_LDFLAGS = $(target_ldflags) $(libmysql_version_script_cmd)
+
+EXTRA_DIST = Makefile.shared libmysqlclient.vers
 noinst_HEADERS = client_settings.h
 
 # This is called from the toplevel makefile
diff -Nru a/libmysql/libmysqlclient.vers b/libmysql/libmysqlclient.vers
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/libmysql/libmysqlclient.vers	2004-10-02 11:51:06 +02:00
@@ -0,0 +1,5 @@
+MYSQL_14: {
+	global: mysql_*;
+	local: *;
+}
+
diff -Nru a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
--- a/libmysql_r/Makefile.am	2004-10-02 11:51:06 +02:00
+++ b/libmysql_r/Makefile.am	2004-10-02 11:51:06 +02:00
@@ -32,14 +32,20 @@
 
 libmysql_dir = $(top_srcdir)/libmysql
 
+if HAVE_LD_VERSION_SCRIPT
+  libmysql_version_script_cmd = -Wl,--version-script=$(srcdir)/libmysqlclient.vers
+else
+  libmysql_version_script_cmd =
+endif
+
 libmysqlclient_r_la_SOURCES = $(target_sources)
 libmysqlclient_r_la_LIBADD = $(target_libadd)
-libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
+libmysqlclient_r_la_LDFLAGS = $(target_ldflags) $(libmysql_version_script_cmd)
 
 # This is called from the toplevel makefile
 link_sources:
 	set -x; \
-	for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
+	for f in `cd $(libmysql_dir) && echo *.[ch] *.vers`; do \
 	  rm -f $(srcdir)/$$f; \
 	  @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \
 	done