#At file:///Users/jdd/bzr-repo/working/cluster-7.2-labs-memcached/ based on revid:bernhard.ocklin@stripped
4168 John David Duncan 2011-04-26
linking with -ldl: not on all platforms
modified:
storage/ndb/memcache/unit/Makefile.am
storage/ndb/ndb_configure.m4
=== modified file 'storage/ndb/memcache/unit/Makefile.am'
--- a/storage/ndb/memcache/unit/Makefile.am 2011-04-19 01:23:01 +0000
+++ b/storage/ndb/memcache/unit/Makefile.am 2011-04-27 04:28:04 +0000
@@ -81,7 +81,7 @@ run_unit_tests_LDFLAGS = \
-L$(top_srcdir)/storage/ndb/src/.libs \
-L$(top_srcdir)/mysys/.libs \
-L$(top_srcdir)/strings/.libs \
- -lndbclient -lmysys -lmystrings -ldl
+ -lndbclient -lmysys -lmystrings
# --------------- test_workqueue --------------------------
=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4 2011-04-09 07:36:24 +0000
+++ b/storage/ndb/ndb_configure.m4 2011-04-27 04:28:04 +0000
@@ -51,8 +51,6 @@ AC_SUBST(DOXYGEN)
AC_SUBST(PDFLATEX)
AC_SUBST(MAKEINDEX)
-AC_CHECK_HEADERS_ONCE([mach/mach_time.h])
-
dnl ---------------------------------------------------------------------------
dnl Check if ndbmtd should/can be built
dnl - skipped if with --without-ndbmtd specified
@@ -680,6 +678,13 @@ if test "x$ac_cv_mac_atomics" = xyes; th
[Darwin libkern OSAtomic functions.])
fi
+dnl -- For timingpoint on Mac
+AC_CHECK_HEADERS_ONCE([mach/mach_time.h])
+
+dnl -- For loading modules on Linux
+AC_SEARCH_LIBS(dlsym, dl)
+
+
])
AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
Attachment: [text/bzr-bundle] bzr/john.duncan@oracle.com-20110427042804-apy2tvm8fnw07m6t.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4168) | John David Duncan | 27 Apr |
