From 421514ae817446bdb851476c98d1af640fe7ce1c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Oct 2002 13:20:17 +0200 Subject: - applied fix from 4.0 configure.in required to build shared libraries with static glibc installed configure.in: - Better fix for building shared libraries with a patched glibc (from 4.0 tree) - removed obsolete comment --- configure.in | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 7051db63e5c..002932c9835 100644 --- a/configure.in +++ b/configure.in @@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc, # we need special flags, but we will have to add those later STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv" STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS" - OTHER_LIBC_LIB="-L$other_libc_lib" + OTHER_LIBC_LIB="-static -L$other_libc_lib" static_nss=1 else # this is a dirty hack. We if we detect static nss glibc in the special @@ -529,7 +529,6 @@ fi AC_ARG_WITH(server-suffix, [ --with-server-suffix Append value to the version string.], - # I heard that 'cut' isn't portable. Isn't there a better way? [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ], [ MYSQL_SERVER_SUFFIX= ] ) @@ -2122,10 +2121,7 @@ then AC_DEFINE(THREAD_SAFE_CLIENT) fi -if test "$static_nss" = "1" -then - CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS" -fi +CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS" AC_SUBST(CLIENT_LIBS) AC_SUBST(sql_client_dirs) @@ -2275,11 +2271,8 @@ fi # I know to add the static NSS magic if we have static NSS libraries with # glibc - Sasha -if test "$static_nss" = "1" -then - LDFLAGS="$LDFLAGS -static $OTHER_LIBC_LIB" - LIBS="$LIBS $STATIC_NSS_FLAGS" -fi +LDFLAGS="$LDFLAGS $OTHER_LIBC_LIB" +LIBS="$LIBS $STATIC_NSS_FLAGS" AC_SUBST(sql_server_dirs) AC_SUBST(thread_dirs) -- cgit v1.2.1 From ac471d1daf3c81b8365af990c3ca2552dab02214 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Oct 2002 15:14:47 +0000 Subject: libraries should be always prepended to $LIBS, never appended --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 002932c9835..ca445813328 100644 --- a/configure.in +++ b/configure.in @@ -735,7 +735,7 @@ AC_ARG_WITH(libwrap, _libs=${LIBS} AC_CHECK_HEADER(tcpd.h, - LIBS="$LIBS -lwrap" + LIBS="-lwrap $LIBS" AC_MSG_CHECKING(for TCP wrappers library -lwrap) AC_TRY_LINK([#include int allow_severity = 0; @@ -1231,7 +1231,7 @@ fi AC_MSG_CHECKING("named thread libs:") if test "$with_named_thread" != "no" then - LIBS="$with_named_thread $LIBS $with_named_thread" + LIBS="$with_named_thread $LIBS" with_posix_threads="yes" with_mit_threads="no" AC_MSG_RESULT("$with_named_thread") @@ -1250,7 +1250,7 @@ else then AC_MSG_CHECKING("for pthread_create in -lpthread"); ac_save_LIBS="$LIBS" - LIBS="$LIBS -lpthread" + LIBS="-lpthread $LIBS" AC_TRY_LINK( [#include ], [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ], @@ -1258,7 +1258,7 @@ else AC_MSG_RESULT("$with_posix_threads") if test "$with_posix_threads" = "no" then - LIBS=" $ac_save_LIBS -lpthreads" + LIBS=" -lpthreads $ac_save_LIBS" AC_MSG_CHECKING("for pthread_create in -lpthreads"); AC_TRY_LINK( [#include ], -- cgit v1.2.1 From e484a91efe357872c91c0e2a3231b8539a83c16e Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Oct 2002 16:26:28 +0200 Subject: - Tagged ChangeSet 1.1224 as "mysql-3.23.53" - bumped up version number to 3.23.54 in configure.in - replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified scripts/make_binary_distribution.sh and Build-tools/mysql-copyright* accordingly. BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8: Delete: Docs/LICENSE Build-tools/mysql-copyright-2: - replaced LICENSE with MySQLEULA.txt Build-tools/mysql-copyright: - use "tar" instead of "gtar" - replaced LICENSE with MySQLEULA.txt configure.in: - Bumped up version number to 3.23.54 now that 3.23.53 has been tagged scripts/make_binary_distribution.sh: - replaced LICENSE with MySQLEULA.txt --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index ca445813328..c22a208e6d0 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.53) +AM_INIT_AUTOMAKE(mysql, 3.23.54) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 -- cgit v1.2.1 From caad1f04f32d0b56ff5c1babab467d78022826df Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Oct 2002 21:03:41 +0000 Subject: -lpthread should be appended to LIBS --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c22a208e6d0..0fc85479db5 100644 --- a/configure.in +++ b/configure.in @@ -1231,7 +1231,7 @@ fi AC_MSG_CHECKING("named thread libs:") if test "$with_named_thread" != "no" then - LIBS="$with_named_thread $LIBS" + LIBS="$with_named_thread $LIBS $with_named_thread" with_posix_threads="yes" with_mit_threads="no" AC_MSG_RESULT("$with_named_thread") @@ -1250,7 +1250,7 @@ else then AC_MSG_CHECKING("for pthread_create in -lpthread"); ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" + LIBS="$LIBS -lpthread" AC_TRY_LINK( [#include ], [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ], @@ -1258,7 +1258,7 @@ else AC_MSG_RESULT("$with_posix_threads") if test "$with_posix_threads" = "no" then - LIBS=" -lpthreads $ac_save_LIBS" + LIBS=" $ac_save_LIBS -lpthreads" AC_MSG_CHECKING("for pthread_create in -lpthreads"); AC_TRY_LINK( [#include ], -- cgit v1.2.1