X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=b697e8954bc693bc27b12c19787eeed6c97952ec;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=fa8e1e76abf9da93acc325bc3cf89da2275f42f7;hpb=0de9685d30dacb4d04a096d0b86ab856ed3587e3;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index fa8e1e76..b697e895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 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])
+AC_CONFIG_SRCDIR([openbox/openbox.c])
 
 AC_PREFIX_DEFAULT([/usr/local])
 test "$prefix" = "NONE" && prefix=$ac_default_prefix
@@ -38,10 +38,6 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 	
-PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-
 PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
@@ -67,14 +63,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 +80,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