diff options
| author | unknown <konstantin@mysql.com> | 2005-02-05 01:21:16 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-02-05 01:21:16 +0300 |
| commit | fe83a1938d51c2fe780631911282902aeae1c0a9 (patch) | |
| tree | 24ce2a2e56f50a77ba3664ff0b5fec28c4292aad /scripts | |
| parent | 2f91118458995b9fe780aa7a5a664765572cdc30 (diff) | |
| download | mariadb-git-fe83a1938d51c2fe780631911282902aeae1c0a9.tar.gz | |
A fix for Bug#6273 "building fails on link": we should not use
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
acinclude.m4:
Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS -
this is a special version of ZLIB_LIBS to use in mysql_config
configure.in:
Remove NON_THREADED_CLIENT_LIBS which weren't really
NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead.
AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now
needed inside mysql_config.sh
scripts/Makefile.am:
Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed
substitution list.
scripts/mysql_config.sh:
We can't use CLIENT_LIBS as in case when we use the bundled zlib
it has a reference to $(top_builddir)/zlib.
libs and libs_r now need to be specified explicitly.
zlib/Makefile.am:
Install libz.la in case it's used by MySQL: this way we guarantee
that paths printed by mysql_config are valid in all cases.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 71b70fc0e4a..d5337df35b1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -140,6 +140,9 @@ SUFFIXES = .sh -e 's!@''IS_LINUX''@!@IS_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ + -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ + -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ + -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -e "s!@MAKE@!$(MAKE)!" \ $< > $@-t @CHMOD@ +x $@-t diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 90418de3d1d..a5c8af5ecb2 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -82,13 +82,14 @@ version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' port='@MYSQL_TCP_PORT@' ldflags='@LDFLAGS@' -client_libs='@CLIENT_LIBS@' # Create options -libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs" +libs="$ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" +libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@" libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` -libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @ZLIB_LIBS@ @openssl_libs@" + +libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@" libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` cflags="-I$pkgincludedir @CFLAGS@ " #note: end space! include="-I$pkgincludedir" |