diff options
| author | unknown <svoj@april.(none)> | 2006-01-18 00:02:25 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-01-18 00:02:25 +0400 |
| commit | 16d16b95824a5bdf9876f6aa6d88e313c4496707 (patch) | |
| tree | 9703ece9608b944166023ba90137992e61a04780 /configure.in | |
| parent | 07eca7f96272f9440528e6640e4e2a89233e5beb (diff) | |
| parent | 91b4e6b54424d858b5521cf3299726aef94d6632 (diff) | |
| download | mariadb-git-16d16b95824a5bdf9876f6aa6d88e313c4496707.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
configure.in:
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 b3daaa5731d..24d6900a5f9 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,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=14:0:0 +SHARED_LIB_MAJOR_VERSION=14 +SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=4 @@ -68,6 +69,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) AC_SUBST(AVAILABLE_LANGUAGES_ERRORS) @@ -431,6 +433,13 @@ then fi fi +# 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 wariation of Linux |