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

diff --git a/configure.ac b/configure.ac
index 23c8ca40..21fc5219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,10 +49,25 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-PKG_CHECK_MODULES(XFT, xft)
+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)
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+  ],
+  [
+    no_such_luck=yes
+  ]
+)
+
 # Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
@@ -62,6 +75,8 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
+GL_OPTION
+
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  themes/Makefile
@@ -73,8 +88,6 @@ AC_CONFIG_FILES([Makefile
 		 plugins/mouse/Makefile
 		 plugins/keyboard/Makefile
 		 plugins/menu/Makefile])
-		 tools/Makefile
-		 tools/slit/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT