X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=388a99047bbe1493d865b8a957379a59b7eae48b;hb=83705e52c469444de38bb676c097d175e66928a7;hp=d462ddc0f67d6df356921482bcfc456f06a901b4;hpb=2abbf01125731caf99490eca58db6debce717947;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index d462ddc0..388a9904 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.0-alpha1], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.0-alpha5], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([kernel/openbox.c]) @@ -26,7 +26,7 @@ LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL ALL_LINGUAS="" -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT_VERSION(0.12.1) AM_GNU_GETTEXT([external]) AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h) @@ -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,7 +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, + [test "$use_gtk" = "yes" && test "$use_gdk_pixbuf" = "yes"]) # Check for session management X11_SM @@ -107,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\"])