Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/Users/mikron/mycluster

BitKeeper/etc/logging_ok

@@ -168,6 +168,7 @@ tom@basil-firewall.home.com
 tomas@mc05.(none)
 tomas@poseidon.(none)
 tomas@poseidon.bredbandsbolaget.se
+tomas@poseidon.ndb.mysql.com
 tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet

acinclude.m4

@@ -1397,7 +1397,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       AC_DEFINE(HAVE_NDBCLUSTER_DB)
       have_ndbcluster="yes"
       ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
-      ndbcluster_libs="\$(top_builddir)/ndb/src/libndbclient.la"
+      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
       ndbcluster_system_libs=""
       MYSQL_CHECK_NDB_OPTIONS
       ;;

configure.in

@@ -2919,8 +2919,16 @@ AC_SUBST(mgmapiincludedir)
   AC_SUBST(NDB_NDBAPICLIENT_INCLUDES)
   AC_SUBST(NDB_MGMAPICLIENT_INCLUDES)
 
-AM_CONDITIONAL(HAVE_NDB_SHM, test X"$have_ndb_shm" = Xyes)
-AM_CONDITIONAL(HAVE_NDB_SCI, test X"$have_ndb_sci" = Xyes)
+ndb_transporter_opt_objs=""
+if test X"$have_ndb_shm" = Xyes
+then
+  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SHM_Transporter.lo SHM_Transporter.unix.lo"
+fi
+if test X"$have_ndb_sci" = Xyes
+then
+  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SCI_Transporter.lo"
+fi
+AC_SUBST(ndb_transporter_opt_objs)
 
   #NDB_TYPE_COMMON="include \$(top_srcdir)/ndb/config/common.mk.am"
   #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapi.mk.am"
@@ -2937,7 +2945,7 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
-   ndb/Makefile ndb/include/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl
+   ndb/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl
    ndb/tools/Makefile dnl
    ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
    ndb/src/common/portlib/Makefile ndb/src/common/portlib/unix/Makefile dnl

ndb/Makefile.am

-## find * -name '*.hpp' -print | grep -v SCCS | grep -v odbc | sed 's/\.hpp/\.hpp \\/' > tmp.out
-## find * -name '*.h' -print | grep -v SCCS | grep -v odbc | sed 's/\.h/\.h \\/' >> tmp.out
-
-SUBDIRS = . include src test tools
+SUBDIRS = src test tools .
 
 ndbinclude_HEADERS = \
 include/ndb_types.h \
@@ -31,4 +28,17 @@ mgmapiinclude_HEADERS = \
 include/mgmapi/mgmapi.h \
 include/mgmapi/mgmapi_debug.h
 
-noinst_HEADERS =
+EXTRA_DIST = include
+
+dist-hook:
+	-rm -rf `find $(distdir) -type d -name SCCS`
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" != "."; then \
+	    files="`find $$subdir -name '*\.h'` `find $$subdir -name '*\.hpp'`"; \
+	    for f in $$files; do \
+	      if test -d "$(distdir)/`dirname $$f`" -a ! -e "$(distdir)/$$f"; then \
+	        cp $$f $(distdir)/$$f; \
+	      fi; \
+	    done; \
+	  fi; \
+	done

ndb/config/type_ndbapitest.mk.am

 
+AM_LDFLAGS = -rpath @ndblibdir@
 LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
          $(top_srcdir)/ndb/src/libndbclient.la
 

ndb/config/type_ndbapitools.mk.am

+
+LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
+         $(top_srcdir)/ndb/src/.libs/libndbclient.a
+
+INCLUDES += @NDB_NDBAPITEST_INCLUDES@

ndb/include/Makefile.am

-
-noinst_HEADERS =
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

ndb/src/Makefile.am

@@ -14,3 +14,5 @@ libndbclient_la_LIBADD =  \
               $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
               $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
               $(top_srcdir)/ndb/src/common/util/libgeneral.la 
+
+AM_LDFLAGS = -rpath @ndblibdir@

ndb/src/common/transporter/Makefile.am

 
 noinst_LTLIBRARIES = libtransporter.la
 
-#libtransporter_la_SOURCES = @NDB_TRANSPORTER_SOURCES@
-
 libtransporter_la_SOURCES = \
 	Transporter.cpp \
 	SendBuffer.cpp   \
@@ -10,20 +8,10 @@ libtransporter_la_SOURCES = \
 	TransporterRegistry.cpp \
         Packer.cpp
 
-#libtransporter_la_SOURCES = \
-#	Transporter.cpp \
-#	SendBuffer.cpp   \
-#	TCP_Transporter.cpp \
-#	TransporterRegistry.cpp \
-#        Packer.cpp
-#
-#if HAVE_NDB_SHM
-#  libtransporter_la_SOURCES += SHM_Transporter.cpp SHM_Transporter.unix.cpp
-#endif
-#
-#if HAVE_NDB_SCI
-#  libtransporter_la_SOURCES += SCI_Transporter.cpp
-#endif
+EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
+
+libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
+libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
 
 INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter
 

ndb/tools/Makefile.am

@@ -11,7 +11,7 @@ select_all_SOURCES = select_all.cpp
 select_count_SOURCES = select_count.cpp
 
 include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%