gnomemm r1732 - in libgdamm/trunk: . tools/extra_defs_gen

[jhs svn gnome org]

Author: jhs
Date: Wed Oct  8 10:42:21 2008
New Revision: 1732
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1732&view=rev

Log:
2008-10-08  Johannes Schmid  <jschmid openismus com>

        * configure.in:
        * tools/extra_defs_gen/generate_defs_gda.cc:
        Fix build when libgda-bdb-4.0 is not installed



Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/configure.in
   libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc

Modified: libgdamm/trunk/configure.in
==============================================================================
--- libgdamm/trunk/configure.in	(original)
+++ libgdamm/trunk/configure.in	Wed Oct  8 10:42:21 2008
@@ -112,10 +112,21 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-PKG_CHECK_MODULES(LIBGDAMM, glibmm-2.4 >= 2.12.8 libgda-4.0 >= 3.99.3)
+LIBGDA_REQUIRED=3.99.5
+PKG_CHECK_MODULES(LIBGDAMM, glibmm-2.4 >= 2.12.8 libgda-4.0 >= $LIBGDA_REQUIRED)
 AC_SUBST(LIBGDAMM_CFLAGS)
 AC_SUBST(LIBGDAMM_LIBS)
 
+PKG_CHECK_MODULES(LIBGDAMM_BDB, libgda-bdb-4.0 >= $LIBGDA_REQUIRED,
+                [have_bdb="yes"],
+                [have_bdb="no"])
+
+if test x$have_bdb = xyes; then
+  LIBGDAMM_CFLAGS="$LIBGDAMM_CFLAGS -DHAVE_BDB"
+fi
+
+AM_CONDITIONAL(HAVE_BDB, [test x$have_bdb = xyes])
+
 GLIBMM_PREFIX=`pkg-config --variable=prefix glibmm-2.4`
 GMM_PROCDIR=$GLIBMM_PREFIX/lib/glibmm-2.4/proc
 AC_SUBST(GMM_PROCDIR)

Modified: libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc
==============================================================================
--- libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc	(original)
+++ libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc	Wed Oct  8 10:42:21 2008
@@ -22,7 +22,6 @@
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
-//#include <libgda/gda-server-recordset-model.h>
 
 int main (int argc, char *argv[])
 {
@@ -37,8 +36,10 @@
     << 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) 
-    << get_defs (GDA_TYPE_DATA_MODEL_BDB) 
+    << get_defs (GDA_TYPE_DATA_MODEL_ARRAY)
+#ifdef HAVE_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)