From f4d8ef3efb8167d18fc05670217c8b8ae249b58d Mon Sep 17 00:00:00 2001
From: LRN <lrn1986@gmail.com>
Date: Fri, 1 Aug 2014 13:08:32 +0000
Subject: Remove the last remaining pieces of gtk+-2.x support

---
 configure.ac | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8a5daec..c65f5d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,17 +273,7 @@ AC_ARG_WITH(glade,
    ],
    [
      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,22 +283,6 @@ then
   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"
@@ -319,7 +293,6 @@ then
       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"
-- 
cgit v1.2.3