Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1

into  bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint

ndb/config/common.mk.am

@@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
 mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
 
 INCLUDES = $(INCLUDES_LOC)
-LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
+LDADD = $(LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc
 DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
 NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 

ndb/config/type_ndbapitools.mk.am

@@ -3,7 +3,7 @@ LDADD += \
          $(top_builddir)/ndb/src/libndbclient.la \
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
 
 INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
 	-I$(top_srcdir)/ndb/include \

ndb/src/common/portlib/Makefile.am

-noinst_HEADERS = gcc.cpp
+noinst_LIBRARIES = libmygcc.a
+libmygcc_a_SOURCES = gcc.cpp
 
 noinst_LTLIBRARIES = libportlib.la
 

ndb/src/kernel/Makefile.am

@@ -53,7 +53,8 @@ LDADD +=  \
               $(top_builddir)/ndb/src/common/util/libgeneral.la  \
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
+
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%