X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=a0c1cc64b67b2c1bda4ff67079e700bd11ed604b;hb=ada98dd585a8a677a6844597bacce0c5427de316;hp=31ecbc5d63c35f98dbfdbcf60d8d59607fa5269f;hpb=881fd226222c672bbc3d18ad6f60fa4ed9e55a32;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 31ecbc5d..a0c1cc64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,8 @@ LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
 
 ALL_LINGUAS=""
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])
 
 AC_LANG(C++)
 	
@@ -22,7 +23,8 @@ AC_LANG(C++)
 AC_MSG_CHECKING([for GCC])
 if test "$GCC" = "yes"; then
   AC_MSG_RESULT([yes])
-  CXXFLAGS="$CXXFLAGS -Wall -W"# -pedantic"
+  CXXFLAGS="$CXXFLAGS -Wall -W"
+# -pedantic"
 else
   AC_MSG_RESULT([no, trying other compilers])
   AC_MSG_CHECKING(for MIPSpro)
@@ -50,7 +52,7 @@ AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h
 AC_HEADER_TIME
 
 # Determine the return type of signal handlers
-AC_TYPE_SIGNAL
+# AC_TYPE_SIGNAL
 
 # Check whether to include debugging code
 DEBUG=""
@@ -75,7 +77,7 @@ CXXFLAGS="$CXXFLAGS $DEBUG"
 
 # Check for Python
 AC_ARG_WITH([python],
-	[  --with-python=path       Set location of Python executable],
+	[  --with-python=path      Set location of Python executable],
 	[PYTHON="$withval"],
 	[PYTHON=])
 
@@ -256,6 +258,38 @@ CXXFLAGS=$OLDCXXFLAGS
 AC_SUBST([XFT_CFLAGS])
 AC_SUBST([XFT_LIBS])
 
+# Check for XKB extension support
+AC_CHECK_LIB([X11], [XkbBell],
+  AC_MSG_CHECKING([for X11/XKBlib.h])
+  AC_TRY_LINK(
+    [
+      #include <X11/Xlib.h>
+      #include <X11/Xutil.h>
+      #include <X11/XKBlib.h>
+    ],
+    [
+      Display *d;
+      Window w;
+      XkbBell(d, w, 0, 0);
+    ],
+    [
+      AC_MSG_RESULT([yes])
+      XKB="yes"
+      AC_DEFINE([XKB], [1], [Found the XKB extension])
+    ],
+    [ 
+      AC_MSG_RESULT([no])
+      XKB="no"
+    ]
+  )
+)
+AC_MSG_CHECKING([for the XKB extension])
+if test "$XKB" = "yes"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
 # Check for XShape extension support
 AC_CHECK_LIB([Xext], [XShapeCombineShape],
   AC_MSG_CHECKING([for X11/extensions/shape.h])
@@ -332,10 +366,7 @@ AC_ARG_ENABLE([xinerama],
   AC_MSG_RESULT([no])
 )
 
-AC_CONFIG_FILES([Makefile
-		m4/Makefile 
-		po/Makefile.in
-		intl/Makefile
+AC_CONFIG_FILES([Makefile po/Makefile.in
 		otk/Makefile
 		src/Makefile
 		scripts/Makefile
@@ -344,6 +375,7 @@ AC_CONFIG_FILES([Makefile
 		doc/Makefile
 		doc/doxygen/Makefile
 		data/Makefile
+		data/buttons/Makefile
 		data/styles/Makefile
 		version.h
 		])