Commit a90ad3b1 authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


storage/ndb/src/Makefile.am:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Will add the new code by hand.
configure.in:
  Moving this code to ha_ndbcluster.
parents 7d305e27 5eeee409

configure.in

+0 −7
Original line number Diff line number Diff line
@@ -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])

storage/ndb/src/Makefile.am

+0 −2
Original line number Diff line number Diff line
@@ -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   \