[GNUnet-SVN] r32302 - gnunet-gtk

[gnunet]

Author: LRN
Date: 2014-02-11 13:15:35 +0100 (Tue, 11 Feb 2014)
New Revision: 32302

Modified:
   gnunet-gtk/configure.ac
Log:
Fix GTK check

Start with the assumption that GTK is not available, mark it as available
when it is found.
Don't check for GTK+-2.x when GTK+-3.x is already available.
Indent glade-checking code

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2014-02-11 12:15:32 UTC (rev 32301)
+++ gnunet-gtk/configure.ac     2014-02-11 12:15:35 UTC (rev 32302)
@@ -246,7 +246,7 @@
    ],
    [AC_MSG_RESULT([--with-gtk-version not specified])])
 
-without_gtk=false
+without_gtk=true
 if test "x$check_for_3" != "xfalse"
 then
   AM_PATH_GTK_3_0([$check_for_3],without_gtk=false,)
@@ -258,7 +258,7 @@
   fi
 fi
 
-if test "x$without_gtk" == "xfalse" -a "x$check_for_2" != "xfalse"
+if test "x$without_gtk" == "xtrue" -a "x$check_for_2" != "xfalse"
 then
   AM_PATH_GTK_2_0([$check_for_2],without_gtk=false,)
   # test for libunique
@@ -324,17 +324,17 @@
   backup_CPPFLAGS="$CPPFLAGS"
   if test "x$check_for_2" != "xfalse"
   then
-  GLADE_LIBS="-L${lookin}/lib"
-  GLADE_CFLAGS="-I${lookin}/include/libgladeui-1.0"
-  GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-1.0"
-  LIBS="$GLADE_LIBS $backup_LIBS"
-  CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
-  CPPFLAGS="$GLADE_CPPFLAGS $backup_CPPFLAGS"
-  AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h gdk/gdk.h gdk/gdkpixbuf.h  
gladeui/glade.h],
-    AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
-      [glade=1]
+    GLADE_LIBS="-L${lookin}/lib"
+    GLADE_CFLAGS="-I${lookin}/include/libgladeui-1.0"
+    GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-1.0"
+    LIBS="$GLADE_LIBS $backup_LIBS"
+    CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
+    CPPFLAGS="$GLADE_CPPFLAGS $backup_CPPFLAGS"
+    AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h gdk/gdk.h gdk/gdkpixbuf.h  
gladeui/glade.h],
+      AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+        [glade=1]
+      )
     )
-  )
   fi
   if test "x$glade" == "x0"
   then