diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-01-19 14:30:41 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-01-19 14:30:41 -0800 |
| commit | 22ed311f3ad4482928e484bd6ce18463bb06b87b (patch) | |
| tree | aad25799c8bef8c39606bab020f5e3c57b734a4b | |
| parent | 115fbd6b3c2f8cbe3556a637d947b9e5d9cc8a2d (diff) | |
| parent | 74eac22e4e1d437191be8b9fc536071382330f2e (diff) | |
| download | mariadb-git-22ed311f3ad4482928e484bd6ce18463bb06b87b.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
mysys/string.c:
Auto merged
storage/ndb/src/Makefile.am:
Auto merged
| -rw-r--r-- | .bzrignore | 3 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | storage/ndb/src/Makefile.am | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 46d0f952445..ef92cfffbd3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1644,6 +1644,7 @@ ndb/src/kernel/error/liberror.dsp ndb/src/kernel/ndbd ndb/src/kernel/ndbd.dsp ndb/src/kernel/vm/libkernel.dsp +ndb/src/libndb.ver ndb/src/libndbclient.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/libndbmgmclient.dsp @@ -2638,6 +2639,7 @@ storage/ndb/src/kernel/error/liberror.dsp storage/ndb/src/kernel/ndbd storage/ndb/src/kernel/ndbd.dsp storage/ndb/src/kernel/vm/libkernel.dsp +storage/ndb/src/libndb.ver storage/ndb/src/libndbclient.dsp storage/ndb/src/mgmapi/libmgmapi.dsp storage/ndb/src/mgmclient/libndbmgmclient.dsp @@ -2934,4 +2936,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -storage/ndb/src/libndb.ver diff --git a/configure.in b/configure.in index 0becfe00bd5..fcdf8003bce 100644 --- a/configure.in +++ b/configure.in @@ -360,8 +360,8 @@ 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) + 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) diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am index 627347daf02..066ce429ce9 100644 --- a/storage/ndb/src/Makefile.am +++ b/storage/ndb/src/Makefile.am @@ -23,6 +23,8 @@ 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 \ |