add --enable-gl support, and put the flags/libs in the appropriate makefiles

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16f54e28c81b3f22d68ca95f5bcac7526ae73942..811de5de5f989a61929310e8fd7c28dfd3d867b1 100644 (file)
--- 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,21 @@ 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(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 +71,8 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
+GL_OPTION
+
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  themes/Makefile