X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.in;h=c8584ee2af6c7f3d359928ed7031b7d19ce14ae0;hb=28594da6de001f1d8b6b975286032302db3a6491;hp=3eabecdee27831c5ee186392b1a1c805a63f58af;hpb=b03eccf8324ce95799dbc4d17f0e910b3ca49b50;p=chaz%2Fopenbox

diff --git a/configure.in b/configure.in
index 3eabecde..c8584ee2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Openbox
 dnl Initialize autoconf and automake
 AC_INIT(src/blackbox.cc)
-AM_INIT_AUTOMAKE(openbox,1.90.0,no-define)
+AM_INIT_AUTOMAKE(openbox,2.0.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -82,6 +82,36 @@ if test x$SHAPE = "xyes"; then
   AC_DEFINE(SHAPE,1,Enable support of the XShape extension)
 fi
 
+dnl Check for Xinerama extension support and proper library files.
+XINERAMA=""
+AC_MSG_CHECKING([whether to build support for the Xinerama extension])
+AC_ARG_ENABLE(
+  xinerama, [  --enable-xinerama       enable support of the Xinerama extension [default=no]],
+  if test x$enableval = "xyes"; then
+	AC_MSG_RESULT([yes])
+
+	AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+	  AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
+	  AC_TRY_LINK(
+#include <X11/Xlib.h>
+#include <X11/extensions/Xinerama.h>
+, XineramaScreenInfo foo,
+		AC_MSG_RESULT([yes])
+		XINERAMA="yes"
+		LIBS="$LIBS -lXinerama",
+		AC_MSG_RESULT([no])
+	  )
+	)
+
+  else
+	AC_MSG_RESULT([no])
+  fi,
+  AC_MSG_RESULT([no])
+)
+if test x$XINERAMA = "xyes"; then
+  AC_DEFINE(XINERAMA,1,Enable support of the Xinerama extension)
+fi
+
 dnl Check for Xft extension support and proper library files.
 XFT=""
 AC_MSG_CHECKING([whether to build support for the Xft extension])
@@ -112,24 +142,6 @@ if test x$XFT = "xyes"; then
   AC_DEFINE(XFT,1,Enable support of the Xft extension)
 fi
 
-dnl Check for the Slit
-SLIT=""
-AC_MSG_CHECKING([whether to include the Slit])
-AC_ARG_ENABLE(
-  slit, [  --enable-slit           include code for the Slit [default=yes]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    SLIT="yes"
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([yes])
-  SLIT="yes"
-)
-if test x$SLIT = "xyes"; then
-  AC_DEFINE(SLIT,1,Enable the Slit)
-fi
-
 dnl Check for ordered 8bpp dithering
 ORDEREDPSEUDO=""
 AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
@@ -148,24 +160,6 @@ if test x$ORDEREDPSEUDO = "xyes"; then
   AC_DEFINE(ORDEREDPSEUDO,1,Enable pseudocolor ordered dithering)
 fi
 
-dnl Check for event clobbering
-CLOBBER=""
-AC_MSG_CHECKING([whether to intercept mouse events to clients])
-AC_ARG_ENABLE(clobber,
-[  --enable-clobber        intercept mouse events to clients when num lock 
-			  or scroll lock are on [default=yes]],
-  if test x$enableval = "xno"; then
-    AC_MSG_RESULT([no])
-    CLOBBER="no"
-  else
-    AC_MSG_RESULT([yes]) 
-  fi,
-  AC_MSG_RESULT([yes])
-)
-if test x$CLOBBER = "xno"; then
-  AC_DEFINE(NOCLOBBER,1,Disable grabbing of mouse events when num/scoll lock is pressed)
-fi
-
 dnl Check whether to include debugging code
 DEBUG=""
 AC_MSG_CHECKING([whether to include verbose debugging code])
@@ -265,8 +259,10 @@ nls/hu_HU/Makefile
 nls/it_IT/Makefile
 nls/ja_JP/Makefile
 nls/ko_KR/Makefile
+nls/no_NO/Makefile
 nls/nl_NL/Makefile
 nls/pt_BR/Makefile
+nls/ro_RO/Makefile
 nls/ru_RU/Makefile
 nls/sl_SI/Makefile
 nls/sv_SE/Makefile