Commit dc581590 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
parents aa780b88 5be1a577

configure.in

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ DOT_FRM_VERSION=6 
# See the libtool docs for information on how to do shared lib versions.

SHARED_LIB_MAJOR_VERSION=15

SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0

NDB_SHARED_LIB_MAJOR_VERSION=3

NDB_SHARED_LIB_VERSION=$NDB_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

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -58,6 +60,8 @@ 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(NDB_SHARED_LIB_MAJOR_VERSION)

AC_SUBST(NDB_SHARED_LIB_VERSION)

AC_SUBST(AVAILABLE_LANGUAGES)
@@ -354,6 +358,14 @@ if $LD --version 2>/dev/null|grep -q GNU; then 
fi

AC_SUBST(LD_VERSION_SCRIPT)



# libndbclient versioning when linked with GNU ld.

if $LD --version 2>/dev/null|grep -q GNU; then

  NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"

  AC_CONFIG_FILES(storage/ndb/src/libndb.ver)

fi

AC_SUBST(NDB_LD_VERSION_SCRIPT)





# Avoid bug in fcntl on some versions of linux

AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])

# Any variation of Linux

ndb/src/libndb.ver.in

0 → 100644
+2 −0
Original line number Diff line number Diff line 
libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };

storage/ndb/src/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ ndblib_LTLIBRARIES = libndbclient.la 


libndbclient_la_SOURCES =



libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@



libndbclient_la_LIBADD =  \

              ndbapi/libndbapi.la \

              common/transporter/libtransporter.la   \

storage/ndb/src/libndb.ver.in

0 → 100644
+2 −0
Original line number Diff line number Diff line 
libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };