mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
This commit is contained in:
commit
9e24d548b6
2 changed files with 0 additions and 9 deletions
|
@ -358,13 +358,6 @@ 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])
|
||||
|
|
|
@ -23,8 +23,6 @@ libndbclient_la_SOURCES =
|
|||
|
||||
libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@
|
||||
|
||||
BUILT_SOURCES = libndb.ver
|
||||
|
||||
libndbclient_la_LIBADD = \
|
||||
ndbapi/libndbapi.la \
|
||||
common/transporter/libtransporter.la \
|
||||
|
|
Loading…
Reference in a new issue