=== modified file 'configure.ac'
--- a/configure.ac	2008-04-20 01:00:44 +0000
+++ b/configure.ac	2008-04-22 21:58:36 +0000
@@ -91,7 +91,7 @@
 
 SWIG_DIR="\${top_srcdir}/interface"
 
-SWIG="$SWIG \${DEFS} -DDOXYGEN_SHOULD_SKIP_INTERNAL=1 -I\$(top_srcdir)/mgmpp  "
+SWIG="$SWIG \${DEFS} -DDOXYGEN_SHOULD_SKIP_INTERNAL=1 \${HAVE_CGE63} -I\$(top_srcdir)/mgmpp  "
 GENERATED="# This file is autogenerated!" 
 AC_SUBST(GENERATED)
 

=== modified file 'interface/mgmapi/mgmenums.i'
--- a/interface/mgmapi/mgmenums.i	2008-04-20 18:59:48 +0000
+++ b/interface/mgmapi/mgmenums.i	2008-04-22 21:58:36 +0000
@@ -306,7 +306,9 @@
   /** NDB_MGM_EVENT_CATEGORY_STATISTIC */
   NDB_LE_MemoryUsage = 50,
   /** NDB_MGM_EVENT_CATEGORY_STATISTIC */
+#if defined(CGE63)
   NDB_LE_ThreadConfigLoop = 68,
+#endif
 
   /** NDB_MGM_EVENT_CATEGORY_ERROR */
   NDB_LE_TransporterError = 42,

=== modified file 'm4/with_mysql.m4'
--- a/m4/with_mysql.m4	2008-04-11 01:35:06 +0000
+++ b/m4/with_mysql.m4	2008-04-22 21:58:36 +0000
@@ -52,21 +52,23 @@
     AC_LANG(C++)
 
   AS_IF([test "x$MYSQL_CONFIG" = "xISDIR"],[
-    IBASE="-I$with_mysql"
-    MYSQL_CONFIG="$with_mysql/scripts/mysql_config"
+    IBASE="-I${with_mysql}"
+    MYSQL_CONFIG="${with_mysql}/scripts/mysql_config"
     ADDIFLAGS="$IBASE/include "
     ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/ndbapi "
     ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/mgmapi "
     ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include "
+    ADDCFLAGS="-ggdb3 -fPIC"
+    LDFLAGS="-L${with_mysql}/storage/ndb/src/.libs -L${with_mysql}/libmysql_r/.libs/ -L${with_mysql}/mysys/.libs -L${with_mysql}/mysys -L${with_mysql}/strings/.libs -L${with_mysql}/strings "
   ],[
     IBASE=`$MYSQL_CONFIG --include`
     ADDIFLAGS=""
-    ])
-
     # add regular MySQL C flags
     ADDCFLAGS=`$MYSQL_CONFIG --cflags` 
     # add NdbAPI specific C flags
-    LDFLAGS="$LDFLAGS -L/usr/lib/mysql -lndbclient -lmysys -lmystrings -ldbug "`$MYSQL_CONFIG --libs_r | sed 's/-lmysqlclient_r//'`
+    LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r`
+    ])
+
 
     ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb"
     ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/ndbapi"
@@ -81,20 +83,25 @@
     MYSQL_INCLUDES="$IBASE $ADDIFLAGS"   
 
     
-    dnl AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[
-    dnl   AC_CHECK_LIB([ndbhelper],[decimal_bin_size],,[
-    dnl     AC_CHECK_LIB([mystrings],[decimal_bin_size])
-    dnl     AC_CHECK_LIB([mysys],[my_sync])
-    dnl   ])
-    dnl   AC_CHECK_LIB([ndbclient],[ndb_init],,[AC_MSG_ERROR([Can't link against libndbclient])])
-    dnl ])
+    AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[AC_MSG_ERROR([Can't link against libmysqlclient_r])])
+    AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[
+      AC_CHECK_LIB([mystrings],[decimal_bin_size],,[
+        AC_MSG_ERROR([Can't link against libndbclient])])])
      
     AC_MSG_CHECKING(for NdbApi headers)
      AC_TRY_LINK([#include <NdbApi.hpp>], [int attr=NdbTransaction::Commit; ],
                         [ndbapi_found="yes"])
     AS_IF([test "$ndbapi_found" = "yes"], 
        [AC_MSG_RESULT(found)],
-       [AC_MSG_ERROR([Couldn't find NdbApi.h!])])
+       [AC_MSG_ERROR([Couldn't find NdbApi.hpp!])])
+    AC_MSG_CHECKING(for NDB_LE_ThreadConfigLoop)
+      AC_TRY_LINK([#include <mgmapi.h>], [int attr=NDB_LE_ThreadConfigLoop; ],
+                        [have_cge63="yes"])
+      AS_IF([test "$have_cge63" = "yes"],
+        [AC_MSG_RESULT(found)
+         HAVE_CGE63="-DCGE63"
+         AC_SUBST(HAVE_CGE63)],
+        [AC_MSG_RESULT(missing)])
 
     LDFLAGS="$LDFLAGS $LIBS"