diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-01-19 16:54:01 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-01-19 16:54:01 -0800 |
| commit | 5eeee409e79e3ac50d1941eb7f167c244ce2fc90 (patch) | |
| tree | 2f6831555c8c9a7cbcd82fdd55f490c009257512 /config/ac-macros | |
| parent | 74eac22e4e1d437191be8b9fc536071382330f2e (diff) | |
| download | mariadb-git-5eeee409e79e3ac50d1941eb7f167c244ce2fc90.tar.gz | |
Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb.
config/ac-macros/ha_ndbcluster.m4:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.
Diffstat (limited to 'config/ac-macros')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 9 |
1 files changed, 9 insertions, 0 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 --------------------------------------------------------------------------- |