X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=c8174de39f0a1e488fb872379939380cbc9e4781;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=a9281dc36f399adf902e438af47570a91512817a;hpb=5d665673a29be21fe4ecad870d0a2d4f5c2f308d;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index a9281dc3..c8174de3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([kernel/openbox.c])
-AC_CONFIG_AUX_DIR([build])
 
 AC_PREFIX_DEFAULT([/usr/local])
 test "$prefix" = "NONE" && prefix=$ac_default_prefix
@@ -16,6 +16,8 @@ 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])
@@ -32,12 +34,9 @@ LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
-OB_NLS
-## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ##
-##ALL_LINGUAS=""
-##AM_GNU_GETTEXT_VERSION(0.11.5)
-##AM_GNU_GETTEXT([external])
-## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ##
+ALL_LINGUAS=""
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])
 
 AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
 AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
@@ -52,16 +51,35 @@ 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_SUBST(LIBSN_CFLAGS)
+AC_SUBST(LIBSN_LIBS)
+if test "$LIBSN_LIBS"; then
+   AC_DEFINE(USE_LIBSN)
+fi
+
 # Check for X11 extensions
 X11_EXT_XKB
+X11_EXT_XRANDR
+X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile build/Makefile.incl])
+AC_CONFIG_FILES([Makefile
+                 po/Makefile.in
+                 themes/Makefile
+		 data/Makefile
+                 render/Makefile
+                 kernel/Makefile
+		 plugins/Makefile
+		 plugins/placement/Makefile
+		 plugins/mouse/Makefile
+		 plugins/keyboard/Makefile
+		 plugins/menu/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT