X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=62c9ec73fb32222dcb8d1e6b90d5023bc06459e7;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=fa8e1e76abf9da93acc325bc3cf89da2275f42f7;hpb=0de9685d30dacb4d04a096d0b86ab856ed3587e3;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index fa8e1e76..62c9ec73 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.0-alpha2a-ex-plus], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.0-alpha6], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([kernel/openbox.c]) @@ -67,14 +67,14 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0], AC_SUBST(GTK_LIBS) use_gtk="yes" - PKG_CHECK_MODULES(GLADE, [libglade-2.0], + PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0], [ - AC_SUBST(GLADE_CFLAGS) - AC_SUBST(GLADE_LIBS) - use_glade="yes" + AC_SUBST(GDK_PIXBUF_CFLAGS) + AC_SUBST(GDK_PIXBUF_LIBS) + use_gdk_pixbuf="yes" ], [ - use_glade="no" + use_gdk_pixbuf="no" AC_MSG_WARN([disabling build of the configuration tool]) ] ) @@ -84,8 +84,8 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0], AC_MSG_WARN([disabling build of the configuration tool]) ] ) -#AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"]) -AM_CONDITIONAL(OBCONF, [false]) +AM_CONDITIONAL(OBCONF, + [test "$use_gtk" = "yes" && test "$use_gdk_pixbuf" = "yes"]) # Check for session management X11_SM