[libgdamm] Make libgda-bdb conditional compilation work

[Daniel Elstner <daniel src gnome org>]

commit f4d5ab7c8356a152f24e1de79cfd629960b5a968
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 16:53:22 2009 +0200

    Make libgda-bdb conditional compilation work
    
    * configure.ac (HAVE_LIBGDA_BDB): Rename preprocessor define from
    HAVE_BDB to a more recognizable name.
    * tools/extra_defs_gen/generate_defs_gda.cc: Include build/config.h
    configuration header for the HAVE_LIBGDA_BDB macro definition.
    (main): Change to the new macro name.

 ChangeLog                                 |   10 ++++
 configure.ac                              |    2 +-
 tools/extra_defs_gen/generate_defs_gda.cc |   71 ++++++++++++++---------------
 3 files changed, 46 insertions(+), 37 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2be85f2..8bafdad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-08-20  Daniel Elstner  <danielk openismus com>
 
+	Make libgda-bdb conditional compilation work
+
+	* configure.ac (HAVE_LIBGDA_BDB): Rename preprocessor define from
+	HAVE_BDB to a more recognizable name.
+	* tools/extra_defs_gen/generate_defs_gda.cc: Include build/config.h
+	configuration header for the HAVE_LIBGDA_BDB macro definition.
+	(main): Change to the new macro name.
+
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
 	Build examples non-recursively
 
 	* examples/Makefile.am: Rewrite based on non-recursive make, and
diff --git a/configure.ac b/configure.ac
index ead58b1..11d63d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ PKG_CHECK_MODULES([LIBGDAMM], [$LIBGDAMM_MODULES])
 
 PKG_CHECK_EXISTS([libgda-bdb-4.0], [libgdamm_have_bdb=yes], [libgdamm_have_bdb=no])
 AS_IF([test "x$libgdamm_have_bdb" = xyes],
-      [AC_DEFINE([HAVE_BDB], [1], [Define if the libgda-bdb plugin is available.])])
+      [AC_DEFINE([HAVE_LIBGDA_BDB], [1], [Define if the libgda-bdb plugin is available.])])
 
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
diff --git a/tools/extra_defs_gen/generate_defs_gda.cc b/tools/extra_defs_gen/generate_defs_gda.cc
index c3c5fb6..016ff76 100644
--- a/tools/extra_defs_gen/generate_defs_gda.cc
+++ b/tools/extra_defs_gen/generate_defs_gda.cc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* generate_defs_gda.h
  *
  * Copyright (C) 2001 The Free Software Foundation
@@ -19,44 +17,45 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "glibmm_generate_extra_defs/generate_extra_defs.h"
+#include <build/config.h>
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
-int main (int argc, char *argv[])
+int main(int, char**)
 {
-    gda_init();
+  gda_init();
 
-    std::cout 
-    << get_defs (GDA_TYPE_BATCH)
-    << get_defs (GDA_TYPE_COLUMN)
-    << get_defs (GDA_TYPE_CONFIG)
-    << get_defs (GDA_TYPE_CONNECTION) 
-    << get_defs (GDA_TYPE_CONNECTION_EVENT)
-    << get_defs (GDA_TYPE_DATA_ACCESS_WRAPPER)
-    << get_defs (GDA_TYPE_DATA_COMPARATOR)
-    << get_defs (GDA_TYPE_DATA_HANDLER) 
-    << get_defs (GDA_TYPE_DATA_MODEL_ARRAY)
-#ifdef HAVE_BDB
-    << get_defs (GDA_TYPE_DATA_MODEL_BDB)
+  std::cout 
+    << get_defs(GDA_TYPE_BATCH)
+    << get_defs(GDA_TYPE_COLUMN)
+    << get_defs(GDA_TYPE_CONFIG)
+    << get_defs(GDA_TYPE_CONNECTION) 
+    << get_defs(GDA_TYPE_CONNECTION_EVENT)
+    << get_defs(GDA_TYPE_DATA_ACCESS_WRAPPER)
+    << get_defs(GDA_TYPE_DATA_COMPARATOR)
+    << get_defs(GDA_TYPE_DATA_HANDLER) 
+    << get_defs(GDA_TYPE_DATA_MODEL_ARRAY)
+#ifdef HAVE_LIBGDA_BDB
+    << get_defs(GDA_TYPE_DATA_MODEL_BDB)
 #endif
-    << get_defs (GDA_TYPE_DATA_MODEL_DIR)
-    << get_defs (GDA_TYPE_DATA_MODEL) 
-    << get_defs (GDA_TYPE_DATA_MODEL_IMPORT)
-    << get_defs (GDA_TYPE_DATA_MODEL_ITER) 
-    << get_defs (GDA_TYPE_DATA_PROXY)
-    << get_defs (GDA_TYPE_DATA_SELECT)    
-    << get_defs (GDA_TYPE_HOLDER)
-    << get_defs (GDA_TYPE_META_STORE)
-    << get_defs (GDA_TYPE_META_STRUCT)
-    << get_defs (GDA_TYPE_ROW) 
-    << get_defs (GDA_TYPE_SERVER_OPERATION) 
-    << get_defs (GDA_TYPE_SERVER_PROVIDER)
-    << get_defs (GDA_TYPE_SET)
-    << get_defs (GDA_TYPE_STATEMENT)
-    << get_defs (GDA_TYPE_TRANSACTION_STATUS)
-    << get_defs (GDA_TYPE_XA_TRANSACTION)
-    << get_defs (GDA_TYPE_SQL_PARSER)
-    << std::endl;
-    return 0;
+    << get_defs(GDA_TYPE_DATA_MODEL_DIR)
+    << get_defs(GDA_TYPE_DATA_MODEL) 
+    << get_defs(GDA_TYPE_DATA_MODEL_IMPORT)
+    << get_defs(GDA_TYPE_DATA_MODEL_ITER) 
+    << get_defs(GDA_TYPE_DATA_PROXY)
+    << get_defs(GDA_TYPE_DATA_SELECT)    
+    << get_defs(GDA_TYPE_HOLDER)
+    << get_defs(GDA_TYPE_META_STORE)
+    << get_defs(GDA_TYPE_META_STRUCT)
+    << get_defs(GDA_TYPE_ROW) 
+    << get_defs(GDA_TYPE_SERVER_OPERATION) 
+    << get_defs(GDA_TYPE_SERVER_PROVIDER)
+    << get_defs(GDA_TYPE_SET)
+    << get_defs(GDA_TYPE_STATEMENT)
+    << get_defs(GDA_TYPE_TRANSACTION_STATUS)
+    << get_defs(GDA_TYPE_XA_TRANSACTION)
+    << get_defs(GDA_TYPE_SQL_PARSER);
+
+  return 0;
 }