1 files changed, 16 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 4897be1c..56ea2f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,10 +149,12 @@ if test $without_gtk != true
 then
  AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
 else
- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)
+ AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?)
 fi
-
-AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h])
+CFLAGS="$CFLAGS $GTK_CFLAGS"
+CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+LIBS="$LIBS $GTK_LIBS"
+AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h],,AC_MSG_ERROR([gnunet-gtk requires GTK]))
 
 
 
@@ -167,16 +169,16 @@ AC_ARG_WITH(glade,
         ;;
       yes)
         LDFLAGS="-L/usr/lib $LDFLAGS"
-        CPPFLAGS="-I/usr/include/libgladeui-1.0 $CPPFLAGS"
+        CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
         AC_CHECK_HEADERS(gladeui/glade.h,
-          AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+          AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
             glade=1))
         ;;
       *)
         LDFLAGS="-L$with_glade/lib $LDFLAGS"
-        CPPFLAGS="-I$with_glade/include/libgladeui-1.0 $CPPFLAGS"
+        CPPFLAGS="-I$with_glade/include/libgladeui-2.0 $CPPFLAGS"
         AC_CHECK_HEADERS(gladeui/glade.h,
-          AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+          AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
             EXT_LIB_PATH="-L$with_glade/lib $EXT_LIB_PATH"
             glade=1))
         ;;
@@ -184,11 +186,16 @@ AC_ARG_WITH(glade,
    ],
    [AC_MSG_RESULT([--with-glade not specified])
     LDFLAGS="-L/usr/glade/lib $LDFLAGS"
-    CPPFLAGS="-I/usr/include/libgladeui-1.0 $CPPFLAGS"
+    CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
     AC_CHECK_HEADERS(gladeui/glade.h,
-     AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+     AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
       glade=1))])
 
+if test "$glade" != 1
+then
+ AC_MSG_ERROR([gnunet-gtk requires Glade3 (library and headers)])
+fi
+
 # test for GNUnet core
 gnunet=0
 AC_MSG_CHECKING(for GNUnet core)