summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-18 02:53:21 +0300
committerunknown <monty@donna.mysql.fi>2001-04-18 02:53:21 +0300
commit583160afe2a741c70f65f71b6b9cc47516e8b595 (patch)
treee6bcb6e78efce750d0d73893bab34d46e63d19c7 /libmysql
parentc8f1969e2e2e93b8aaee2998134bb53df92b7d94 (diff)
downloadmariadb-git-583160afe2a741c70f65f71b6b9cc47516e8b595.tar.gz
Don't force conf_to_src to be static an all systems
Removed unpredictable test from rpl000001.test Docs/manual.texi: Added some information about table locks libmysql/Makefile.shared: Don't force conf_to_src to be static an all systems mysql-test/r/rpl000001.result: Removed unpredictable test mysql-test/t/rpl000001.test: Removed unpredictable test scripts/mysql_zap.sh: Added --help strings/ctype-ujis.c: Removed warnings
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.shared8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index c6f2032fd44..cd19868ec33 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -83,9 +83,9 @@ ctype_extra_sources.c: conf_to_src
$(srcdir)/ctype_extra_sources.c
conf_to_src_SOURCES = conf_to_src.c
conf_to_src_LDADD=
-#for --with-other-libc to ensure static linking
-#note -all-static rather than -static
-#this is needed for libtool to work right
-conf_to_src_LDFLAGS=-all-static
+#force static linking of conf_to_src - essential when linking against
+#custom installation of libc
+conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
+
# Don't update the files from bitkeeper
%::SCCS/s.%