X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=62c9ec73fb32222dcb8d1e6b90d5023bc06459e7;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=2d67c60c47ae1b14ea1bca37fbe3c078a3f3b6c2;hpb=5be0a82a353b67160142134de1cc51fa31d72759;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 2d67c60c..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 @@ -108,11 +108,5 @@ AC_CONFIG_FILES([ ]) AC_OUTPUT -AC_MSG_RESULT -if test "$DEBUG" = "yes"; then - AC_MSG_RESULT([Creating a DEBUG build.]) -else - AC_MSG_RESULT([Creating a RELEASE build.]) -fi AC_MSG_RESULT AC_MSG_RESULT([configure complete, now type \"make\"])