Rev 201: Make configure use config.h so that our command line isn't quite so whack. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbj...

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 201
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Tue 2007-10-23 21:03:28 -0700
message:
  Make configure use config.h so that our command line isn't quite so whack.
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-10-24 03:53:19 +0000
+++ b/acinclude.m4	2007-10-24 04:03:28 +0000
@@ -197,9 +197,9 @@
     MYSQL_MAJOR_VERSION=`$MYSQL_CONFIG --version | sed -e 's/\.//g' -e 's/-//g' -e
's/[A-Za-z]//g' | cut -c1-2`
 
     case "$MYSQL_MAJOR_VERSION" in 
-      50) AC_DEFINE(MYSQL_50)
+      50) AC_DEFINE(MYSQL_50, [1], [mysql5.0])
 	;;
-      51) AC_DEFINE(MYSQL_51)
+      51) AC_DEFINE(MYSQL_51, [1], [mysql5.1])
         ;;
       *) echo "Unsupported version of MySQL Detected!"
         ;;

=== modified file 'configure.in'
--- a/configure.in	2007-10-24 03:27:43 +0000
+++ b/configure.in	2007-10-24 04:03:28 +0000
@@ -1,5 +1,6 @@
 AC_INIT(ndb, 0.5.0)
 AM_INIT_AUTOMAKE(ndb, 0.5.0)
+AM_CONFIG_HEADER(config.h)
 
 AC_ARG_WITH(debug,
     [  --with-debug         Build a debugging version],

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-10-24 03:27:43 +0000
+++ b/java/Makefile.am	2007-10-24 04:03:28 +0000
@@ -23,7 +23,7 @@
 SUFFIXES = .cxx .i
 
 .i.cxx:
-	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) -o $@ $<
+	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
 
 ndbj.jar: libndbj.la libmgmj.la
 	$(ANT) build-jar

=== modified file 'java/ndbj.i'
--- a/java/ndbj.i	2007-10-23 05:12:33 +0000
+++ b/java/ndbj.i	2007-10-24 04:03:28 +0000
@@ -37,6 +37,8 @@
 %include "various.i"
 %include "enums.swg"
 
+%include "config.h"
+
 %{
 #include <stdio.h>