diff options
| author | mtaylor@qualinost.(none) <> | 2007-01-19 16:54:01 -0800 |
|---|---|---|
| committer | mtaylor@qualinost.(none) <> | 2007-01-19 16:54:01 -0800 |
| commit | dab88cfaa30d85e184b7ef46b6fcf3d607c6c40e (patch) | |
| tree | 2f6831555c8c9a7cbcd82fdd55f490c009257512 | |
| parent | 8e6f3ab33b68044385e5a83e130e7875e2b33d50 (diff) | |
| download | mariadb-git-dab88cfaa30d85e184b7ef46b6fcf3d607c6c40e.tar.gz | |
Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb.
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 9 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | ndb/src/Makefile.am | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 8e953544df9..a4963a5e20e 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -145,6 +145,14 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ ndbcluster_system_libs="" ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la" MYSQL_CHECK_NDB_OPTIONS + + # 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)/ndb/src/libndb.ver" + AC_CONFIG_FILES(ndb/src/libndb.ver) + fi + AC_SUBST(NDB_LD_VERSION_SCRIPT) + ;; * ) AC_MSG_RESULT([Not using NDB Cluster]) @@ -156,6 +164,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ AC_SUBST(ndbcluster_libs) AC_SUBST(ndbcluster_system_libs) AC_SUBST(ndb_mgmclient_libs) + ]) dnl --------------------------------------------------------------------------- diff --git a/configure.in b/configure.in index f5cb21ac58f..48587e5b501 100644 --- a/configure.in +++ b/configure.in @@ -388,13 +388,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)/ndb/src/libndb.ver" - AC_CONFIG_FILES(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/ndb/src/Makefile.am b/ndb/src/Makefile.am index a0166eec113..3df7ccd8469 100644 --- a/ndb/src/Makefile.am +++ b/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 \ |