[GNUnet-SVN] r34099 - gnunet-gtk

[gnunet]

Author: LRN
Date: 2014-08-01 15:08:32 +0200 (Fri, 01 Aug 2014)
New Revision: 34099

Modified:
   gnunet-gtk/configure.ac
Log:
Remove the last remaining pieces of gtk+-2.x support

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2014-08-01 12:38:42 UTC (rev 34098)
+++ gnunet-gtk/configure.ac     2014-08-01 13:08:32 UTC (rev 34099)
@@ -273,17 +273,7 @@
    ],
    [
      AC_MSG_RESULT([--with-glade not specified])
-     if test "x$check_for_2" != "xfalse"
-     then
-       # For gtk2 we need old glade
-       PKG_CHECK_MODULES([GLADE], [gladeui-1.0 >= 3.6.0], glade=1,
-         [
-         PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
-         ]
-       )
-     else
-       PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
-     fi
+     PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
    ]
 )
 
@@ -293,23 +283,7 @@
   backup_LIBS="$LIBS"
   backup_CFLAGS="$CFLAGS"
   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]
-      )
-    )
-  fi
-  if test "x$glade" == "x0"
-  then
-    GLADE_LIBS="-L${lookin}/lib"
     GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0"
     GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-2.0"
     LIBS="$GLADE_LIBS $backup_LIBS"
@@ -319,7 +293,6 @@
       AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
         glade=2)
     )
-  fi
   if test ! "x$glade" == "x0"
   then
     EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"