X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=c7545137b275d0ebabeedc0f420a8f9360002713;hb=e5bb095ded1f423bc7422a30288b873e0e614a2c;hp=23c8ca40987bf841f70dca20c37ca0b4c03082cc;hpb=a8a4a2cca30602b66b7a7f68bb9f3fffd34e92c9;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 23c8ca40..c7545137 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])
@@ -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])
@@ -51,9 +49,49 @@ 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)
+PKG_CHECK_MODULES(FC, [fontconfig])
+AC_SUBST(FC_CFLAGS)
+AC_SUBST(FC_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)
+    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 X11 extensions
 X11_EXT_XKB
@@ -62,19 +100,23 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
+GL_DEVEL
+
 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/slit/Makefile])
+		 tools/obconf/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT