adjust the themes with buttons to match how they are read now

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index c8174de39f0a1e488fb872379939380cbc9e4781..8f4a68ea28ff3e34b346cd5a1314ebc998aa5ebb 100644 (file)
--- 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])
@@ -16,8 +16,6 @@ OB_COMPILER_FLAGS
 AC_C_CONST
 AC_C_INLINE
 
-AC_PROG_MAKE_SET
-
 if test "$CVS" = "yes"; then
     AC_PATH_PROG([FLEX], [flex])
     test "$FLEX" || AC_MSG_ERROR([flex not found])
@@ -55,12 +53,48 @@ PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
 
-PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0])
-AC_SUBST(LIBSN_CFLAGS)
-AC_SUBST(LIBSN_LIBS)
-if test "$LIBSN_LIBS"; then
-   AC_DEFINE(USE_LIBSN)
-fi
+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)
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+  ],
+  [
+    no_such_luck=yes
+  ]
+)
+
+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
@@ -72,14 +106,21 @@ X11_EXT_XINERAMA
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  themes/Makefile
+                 themes/ebox_data/Makefile
+                 themes/fieron_data/Makefile
+                 themes/fieron2_data/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