aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac29
1 files changed, 1 insertions, 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,
273 ], 273 ],
274 [ 274 [
275 AC_MSG_RESULT([--with-glade not specified]) 275 AC_MSG_RESULT([--with-glade not specified])
276 if test "x$check_for_2" != "xfalse" 276 PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
277 then
278 # For gtk2 we need old glade
279 PKG_CHECK_MODULES([GLADE], [gladeui-1.0 >= 3.6.0], glade=1,
280 [
281 PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
282 ]
283 )
284 else
285 PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
286 fi
287 ] 277 ]
288) 278)
289 279
@@ -293,22 +283,6 @@ then
293 backup_LIBS="$LIBS" 283 backup_LIBS="$LIBS"
294 backup_CFLAGS="$CFLAGS" 284 backup_CFLAGS="$CFLAGS"
295 backup_CPPFLAGS="$CPPFLAGS" 285 backup_CPPFLAGS="$CPPFLAGS"
296 if test "x$check_for_2" != "xfalse"
297 then
298 GLADE_LIBS="-L${lookin}/lib"
299 GLADE_CFLAGS="-I${lookin}/include/libgladeui-1.0"
300 GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-1.0"
301 LIBS="$GLADE_LIBS $backup_LIBS"
302 CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
303 CPPFLAGS="$GLADE_CPPFLAGS $backup_CPPFLAGS"
304 AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h gdk/gdk.h gdk/gdkpixbuf.h gladeui/glade.h],
305 AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
306 [glade=1]
307 )
308 )
309 fi
310 if test "x$glade" == "x0"
311 then
312 GLADE_LIBS="-L${lookin}/lib" 286 GLADE_LIBS="-L${lookin}/lib"
313 GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0" 287 GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0"
314 GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-2.0" 288 GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-2.0"
@@ -319,7 +293,6 @@ then
319 AC_CHECK_LIB([gladeui-2], [glade_xml_node_new], 293 AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
320 glade=2) 294 glade=2)
321 ) 295 )
322 fi
323 if test ! "x$glade" == "x0" 296 if test ! "x$glade" == "x0"
324 then 297 then
325 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH" 298 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"