[GNUnet-SVN] r15452 - gnunet-setup

[gnunet]

Author: grothoff
Date: 2011-06-07 12:49:53 +0200 (Tue, 07 Jun 2011)
New Revision: 15452

Modified:
   gnunet-setup/configure.ac
Log:
fixing build issues

Modified: gnunet-setup/configure.ac
===================================================================
--- gnunet-setup/configure.ac   2011-06-07 10:31:06 UTC (rev 15451)
+++ gnunet-setup/configure.ac   2011-06-07 10:49:53 UTC (rev 15452)
@@ -20,8 +20,8 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet-setup],[0.9.0pre2],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-setup], [0.9.0pre2])
+AC_INIT([gnunet-setup],[0.9.0pre3],address@hidden)
+AM_INIT_AUTOMAKE([gnunet-setup], [0.9.0pre3])
 AM_CONFIG_HEADER(gnunet_setup_config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])
@@ -124,13 +124,15 @@
 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
+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-setup 
requires GTK]))
 
-AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h])
 
 
-
 # test for Glade
 glade=0
 AC_MSG_CHECKING(for Glade core)
@@ -142,16 +144,16 @@
         ;;
       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))
         ;;
@@ -159,11 +161,16 @@
    ],
    [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-setup requires Glade3 (library and headers)])
+fi
+
 # test for GNUnet core
 gnunet=0
 AC_MSG_CHECKING(for GNUnet core)