diff options
| author | mtaylor@qualinost.(none) <> | 2007-01-19 16:58:03 -0800 |
|---|---|---|
| committer | mtaylor@qualinost.(none) <> | 2007-01-19 16:58:03 -0800 |
| commit | 9e24d548b6103ab8b7d4ff56e887460815731ddd (patch) | |
| tree | 5f0fa83edf5cef471e4dd29d81351ca3e453e6a7 | |
| parent | 14c3bfa9082cf3c65247802cc4c2736fc786c772 (diff) | |
| parent | dab88cfaa30d85e184b7ef46b6fcf3d607c6c40e (diff) | |
| download | mariadb-git-9e24d548b6103ab8b7d4ff56e887460815731ddd.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | storage/ndb/src/Makefile.am | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 0becfe00bd5..6bf896b6e8a 100644 --- a/configure.in +++ b/configure.in @@ -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]) diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am index 066ce429ce9..627347daf02 100644 --- a/storage/ndb/src/Makefile.am +++ b/storage/ndb/src/Makefile.am @@ -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 \ |