[libgda] Compilation corrections

[Vivien Malerba <vivien src gnome org>]

commit e61c82d0cfa3b5a36dbec7a96b220a2836d66875
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Sep 28 17:44:23 2014 +0200

    Compilation corrections

 configure.ac                         |    4 ++++
 tools/browser/query-exec/Makefile.am |    2 ++
 tools/common/Makefile.am             |    6 ++----
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8ef6969..e7c10b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,10 @@ then
                have_ui=no])
 fi
 AM_CONDITIONAL(HAVE_UI, test x"$have_ui" = "xyes")
+if test "x$GTK_CFLAGS" != "x"
+then
+       GTK_CFLAGS="$GTK_CFLAGS -DHAVE_GTK_CLASSES"
+fi
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
diff --git a/tools/browser/query-exec/Makefile.am b/tools/browser/query-exec/Makefile.am
index 212cb9d..36c0d22 100644
--- a/tools/browser/query-exec/Makefile.am
+++ b/tools/browser/query-exec/Makefile.am
@@ -3,6 +3,8 @@ noinst_LTLIBRARIES = libperspective.la
 AM_CPPFLAGS = \
        -I$(top_srcdir)/tools \
        -I$(top_srcdir)/tools/browser \
+       -I$(top_srcdir)/tools/common \
+       -I$(top_srcdir)/tools/base \
        -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/libgda \
diff --git a/tools/common/Makefile.am b/tools/common/Makefile.am
index 1f5e97c..d3c6452 100644
--- a/tools/common/Makefile.am
+++ b/tools/common/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/tools \
        -I$(top_srcdir)/tools/base \
         $(COREDEPS_CFLAGS) \
-        $(COREDEPS_WFLAGS) \
-       $(GTK_CFLAGS)
+        $(COREDEPS_WFLAGS)
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
        $(GLIB_GENMARSHAL) $< --header --prefix=_marshal > $@
@@ -57,8 +56,7 @@ noinst_LTLIBRARIES += libcommonui.la
 
 libcommonui_la_CFLAGS = \
        $(AM_CPPFLAGS) \
-        $(GTK_CFLAGS) \
-       -DHAVE_GTK_CLASSES
+        $(GTK_CFLAGS)
 
 libcommonui_la_SOURCES = \
        $(nonuisources)