diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:18:45 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:18:45 +0200 |
| commit | c10d0ec4c01f4412ff4b902f0ba6e7b9e26f73d1 (patch) | |
| tree | c6f791cc06c0356f2a5ecf66f1a921c7a3bdb162 | |
| parent | 556a67cccc92bff6496e56d7b4ba2d6fc74f1365 (diff) | |
| parent | 762c1fe917eb2be88a1504b83819563966c59294 (diff) | |
| download | mariadb-git-c10d0ec4c01f4412ff4b902f0ba6e7b9e26f73d1.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | sql/Makefile.am | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 8f4b847bb25..d6e56151d22 100644 --- a/configure.in +++ b/configure.in @@ -1663,6 +1663,12 @@ AC_ARG_WITH(client-ldflags, [CLIENT_EXTRA_LDFLAGS=]) AC_SUBST(CLIENT_EXTRA_LDFLAGS) +AC_ARG_WITH(mysqld-libs, + [ --with-mysqld-libs Extra libraries to link with for mysqld], + [MYSQLD_EXTRA_LIBS=$withval], + [MYSQLD_EXTRA_LIBS=]) +AC_SUBST(MYSQLD_EXTRA_LIBS) + AC_ARG_WITH(lib-ccflags, [ --with-lib-ccflags Extra CC options for libraries], [LIB_EXTRA_CCFLAGS=$withval], diff --git a/sql/Makefile.am b/sql/Makefile.am index d280b22f493..fdf3f88c1f8 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -38,7 +38,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ - $(yassl_libs) $(openssl_libs) + $(yassl_libs) $(openssl_libs) \ + @MYSQLD_EXTRA_LIBS@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h \ |