diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:15:13 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:15:13 +0200 |
| commit | 762c1fe917eb2be88a1504b83819563966c59294 (patch) | |
| tree | 752f6d09aa79cad978614d06d7b7d5e0b0fbafb5 | |
| parent | b3da513091f0a09e7e045bb9e35ecde1b06f3ed5 (diff) | |
| parent | e65fdda8b1a188442cf5547dba18c69a0cecf1b5 (diff) | |
| download | mariadb-git-762c1fe917eb2be88a1504b83819563966c59294.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
configure.in:
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 989aa978690..444a2d957b6 100644 --- a/configure.in +++ b/configure.in @@ -1736,6 +1736,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 9be3bf93746..fae35222128 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -43,7 +43,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_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 item_uniq.h \ |