diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-02-05 11:06:29 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-02-05 11:06:29 +0200 |
| commit | fd03e915ea8278a3f4f604e815302f05dbf042e7 (patch) | |
| tree | 388a5c39bbaaa03a0899af811382b027e9edda81 /configure.in | |
| parent | 4f40b7be9abe32bf7216541bcab68261fb4ea7ac (diff) | |
| parent | fb84189349c1e3af2df8ae03e3030611b715652a (diff) | |
| download | mariadb-git-fd03e915ea8278a3f4f604e815302f05dbf042e7.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 372417973dc..bdaa1f5166e 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,8 @@ AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. -SHARED_LIB_VERSION=15:0:0 +SHARED_LIB_MAJOR_VERSION=15 +SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 @@ -60,6 +61,7 @@ AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION], AC_SUBST(DOT_FRM_VERSION) AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION], [Version of .frm files]) +AC_SUBST(SHARED_LIB_MAJOR_VERSION) AC_SUBST(SHARED_LIB_VERSION) AC_SUBST(AVAILABLE_LANGUAGES) @@ -339,6 +341,13 @@ fi MYSQL_PROG_AR +# libmysqlclient versioning when linked with GNU ld. +if $LD --version 2>/dev/null|grep -q GNU; then + LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver" + AC_CONFIG_FILES(libmysql/libmysql.ver) +fi +AC_SUBST(LD_VERSION_SCRIPT) + # Avoid bug in fcntl on some versions of linux AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os") # Any variation of Linux |