X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=e7bc737016a66852bfbaea74b55c9f50c5586b7c;hb=0901ddf8911cfaf0f0f3d3c4010809071be42855;hp=811de5de5f989a61929310e8fd7c28dfd3d867b1;hpb=f54e8c9ba0a0b4e78a1038a3d3a9644288c6cb4c;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 811de5de..e7bc7370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.50])
+AC_PREREQ([2.54])
 AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([kernel/openbox.c])
@@ -53,6 +53,10 @@ PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
 
+PKG_CHECK_MODULES(XML, [libxml-2.0])
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
+
 PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   [
     AC_DEFINE(USE_LIBSN)
@@ -64,6 +68,34 @@ PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   ]
 )
 
+PKG_CHECK_MODULES(GTK, [gtk+-2.0],
+  [
+    AC_SUBST(GTK_CFLAGS)
+    AC_SUBST(GTK_LIBS)
+    use_gtk="yes"
+
+    PKG_CHECK_MODULES(GLADE, [libglade-2.0],
+      [
+        AC_SUBST(GLADE_CFLAGS)
+        AC_SUBST(GLADE_LIBS)
+        use_glade="yes"
+      ],
+      [
+        use_glade="no"
+        AC_MSG_WARN([disabling build of the configuration tool])
+      ]
+    )
+  ],
+  [
+    use_gtk="no"
+    AC_MSG_WARN([disabling build of the configuration tool])
+  ]
+)
+AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"])
+
+# Check for session management
+X11_SM
+
 # Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
@@ -71,19 +103,21 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-GL_OPTION
-
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  themes/Makefile
 		 data/Makefile
                  render/Makefile
+		 parser/Makefile
                  kernel/Makefile
 		 plugins/Makefile
+		 plugins/resistance/Makefile
 		 plugins/placement/Makefile
 		 plugins/mouse/Makefile
 		 plugins/keyboard/Makefile
-		 plugins/menu/Makefile])
+		 plugins/menu/Makefile
+		 tools/Makefile
+		 tools/obconf/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT