[anjuta] Updated dependencies to fixed checking twice for libgda

[Johannes Schmid <jhs src gnome org>]

commit 4c0835e1bc25575f2913cb10ec46a5e7f5f6c043
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Jul 26 10:50:45 2012 +0200

    Updated dependencies to fixed checking twice for libgda

 configure.ac                                      |   33 +++++++--------------
 plugins/symbol-db/Makefile.am                     |    4 +--
 plugins/symbol-db/benchmark/libgda/Makefile.am    |    4 +-
 plugins/symbol-db/benchmark/symbol-db/Makefile.am |    4 +-
 4 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4b5730d..70f1b5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,26 +31,25 @@ BUGZILLA_VERSION=bugzilla_version
 AC_SUBST(BUGZILLA_VERSION)
 
 dnl Anjuta core
-GLIB_REQUIRED=2.28.0
-GLIB_NEW_REQUIRED=2.29.2
-GTK_REQUIRED=3.0.0
+GLIB_REQUIRED=2.32.0
+GTK_REQUIRED=3.4.0
 GTHREAD_REQUIRED=2.22.0
 GDK_PIXBUF_REQUIRED=2.0.0
 GDA4_REQUIRED=4.2.0
-GDA5_REQUIRED=4.99.0
+GDA5_REQUIRED=5.0.0
 VTE_REQUIRED=0.27.6
 LIBXML_REQUIRED=2.4.23
-GDL_REQUIRED=2.91.4
+GDL_REQUIRED=3.5.4
 LIBWNCK_REQUIRED=2.12
 
 dnl GtkSourceView
-GTKSOURCEVIEW_REQUIRED=2.91.8
+GTKSOURCEVIEW_REQUIRED=3.0.0
 
 dnl Devhelp
-LIBDEVHELP_REQUIRED=3.0.0
+LIBDEVHELP_REQUIRED=3.4.2
 
 dnl Glade
-GLADEUI_REQUIRED=3.11.0
+GLADEUI_REQUIRED=3.12.0
 
 dnl Introspection
 GI_REQUIRED=0.9.5
@@ -84,6 +83,10 @@ fi
 AC_LANG([C])
 AC_LANG([C++])
 AC_PROG_CXX
+if test "x$ac_ct_CXX" = "x"
+then
+  AC_MSG_ERROR([C++ Compiler required to compile Anjuta])
+fi
 AM_PROG_CC_C_O
 
 GNOME_COMPILE_WARNINGS([maximum])
@@ -167,15 +170,6 @@ PKG_CHECK_MODULES([GDA],
 PKG_CHECK_MODULES([VTE],
    [vte-2.90 >= $VTE_REQUIRED])
 
-dnl Check for better module
-
-PKG_CHECK_MODULES([GLIB_NEW],
-   [glib-2.0 >= $GLIB_NEW_REQUIRED],
-   HAVE_GLIB_2_29_2=1,
-   HAVE_GLIB_2_29_2=0)
-AC_SUBST(HAVE_GLIB_2_29_2)
-AC_DEFINE_UNQUOTED([GLIB_2_29_2], $HAVE_GLIB_2_29_2, [Define to 1 if glib is version 2.29.2 or greater])
-
 dnl Check for autogen
 dnl -----------------
 AC_PATH_PROG(AUTOGEN_PATH, autogen,no)
@@ -312,11 +306,6 @@ fi
 
 AM_CONDITIONAL(HAVE_PYTHON, [test x$have_python = xyes])
 
-PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
-     [libgda-5.0 >= $GDA5_REQUIRED],,
-     [PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
-         [libgda-4.0 >= $GDA4_REQUIRED])])
-
 dnl Disable packagekit support
 dnl -----------------------------------
 AC_ARG_ENABLE(packagekit,
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
index 377dd47..9e99e91 100644
--- a/plugins/symbol-db/Makefile.am
+++ b/plugins/symbol-db/Makefile.am
@@ -39,7 +39,6 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(GDA_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
-	$(PLUGIN_SYMBOL_DB_CFLAGS) \
 	-DSYMBOL_DB_SHM=\"$(SYMBOL_DB_SHM)\" \
 	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
@@ -85,8 +84,7 @@ libanjuta_symbol_db_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 # Plugin dependencies
 libanjuta_symbol_db_la_LIBADD = \
 	$(GDA_LIBS) \
-	$(LIBANJUTA_LIBS) \
-	$(PLUGIN_SYMBOL_DB_LIBS)
+	$(LIBANJUTA_LIBS)
 
 BUILT_SOURCES=symbol-db-marshal.c symbol-db-marshal.h
 
diff --git a/plugins/symbol-db/benchmark/libgda/Makefile.am b/plugins/symbol-db/benchmark/libgda/Makefile.am
index 06aa15b..2a011e2 100644
--- a/plugins/symbol-db/benchmark/libgda/Makefile.am
+++ b/plugins/symbol-db/benchmark/libgda/Makefile.am
@@ -3,7 +3,7 @@ noinst_PROGRAMS = \
 
 
 AM_CPPFLAGS =  $(LIBANJUTA_CFLAGS) \
-	$(PLUGIN_SYMBOL_DB_CFLAGS) \
+	$(GDA_CFLAGS) \
 	-DDEBUG
 
 benchmark_libgda_SOURCES = \
@@ -13,7 +13,7 @@ benchmark_libgda_SOURCES = \
 benchmark_libgda_LDFLAGS = \
 	$(LIBANJUTA_LIBS) \
 	$(ANJUTA_LIBS) \
-	$(PLUGIN_SYMBOL_DB_LIBS)
+	$(GDA_LIBS)
 
 benchmark_libgda_LDADD = ../../libanjuta-symbol-db.la
 
diff --git a/plugins/symbol-db/benchmark/symbol-db/Makefile.am b/plugins/symbol-db/benchmark/symbol-db/Makefile.am
index 910cff6..c49665a 100644
--- a/plugins/symbol-db/benchmark/symbol-db/Makefile.am
+++ b/plugins/symbol-db/benchmark/symbol-db/Makefile.am
@@ -3,7 +3,7 @@ noinst_PROGRAMS = \
 
 
 AM_CPPFLAGS =  $(LIBANJUTA_CFLAGS) \
-	$(PLUGIN_SYMBOL_DB_CFLAGS) \
+	$(GDA_CFLAGS) \
 	-DDEBUG
 
 benchmark_SOURCES = \
@@ -13,7 +13,7 @@ benchmark_SOURCES = \
 benchmark_LDFLAGS = \
 	$(LIBANJUTA_LIBS) \
 	$(ANJUTA_LIBS) \
-	$(PLUGIN_SYMBOL_DB_LIBS)
+	$(GDA_LIBS)
 
 benchmark_LDADD = ../../libanjuta-symbol-db.la