sync with bb-cvs

[chaz/openbox] / configure.in

diff --git a/configure.in b/configure.in
index 962e67e376e61eecf14f11efbde3c3214ec7c0d5..4aef1c11298cd14d574b86089d49dc51397db71f 100644 (file)
--- 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,2.0.0,no-define)
+AM_INIT_AUTOMAKE(openbox,2.1.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -82,32 +82,61 @@ if test x$SHAPE = "xyes"; then
   AC_DEFINE(SHAPE,1,Enable support of the XShape extension)
 fi
 
-dnl Check for Xft extension support and proper library files.
-XFT=""
-AC_MSG_CHECKING([whether to build support for the Xft extension])
+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(
-  xft, [  --enable-xft            enable support of the Xft extension [default=no]],
+  xinerama, [  --enable-xinerama       enable support of the Xinerama extension [default=no]],
   if test x$enableval = "xyes"; then
        AC_MSG_RESULT([yes])
 
-       AC_CHECK_LIB(Xft, XftFontOpenXlfd,
-         AC_MSG_CHECKING([for X11/Xft/Xft.h])
+       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+         AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
          AC_TRY_LINK(
 #include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-, XftFont foo,
-        AC_MSG_RESULT([yes])
-           XFT="yes"
-               LIBS="$LIBS -lXft",
-        AC_MSG_RESULT([no])
+#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])
+AC_ARG_ENABLE(
+  xft, [  --enable-xft            enable support of the Xft extension [default=yes]])
+: ${enableval="yes"}
+if test x$enableval = "xyes"; then
+  AC_MSG_RESULT([yes])
+
+  AC_CHECK_LIB(Xft, XftFontOpenXlfd,
+    AC_MSG_CHECKING([for X11/Xft/Xft.h])
+    AC_TRY_LINK(
+#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
+, XftFont foo,
+      AC_MSG_RESULT([yes])
+      XFT="yes"
+      LIBS="$LIBS -lXft",
+      AC_MSG_RESULT([no])
+    )
+  )
+
+else
+  AC_MSG_RESULT([no])
+fi
 if test x$XFT = "xyes"; then
   AC_DEFINE(XFT,1,Enable support of the Xft extension)
 fi
@@ -222,6 +251,7 @@ nls/Makefile
 nls/C/Makefile
 nls/da_DK/Makefile
 nls/de_DE/Makefile
+nls/es_AR/Makefile
 nls/es_ES/Makefile
 nls/et_EE/Makefile
 nls/fr_FR/Makefile
@@ -230,6 +260,7 @@ nls/it_IT/Makefile
 nls/ja_JP/Makefile
 nls/ko_KR/Makefile
 nls/no_NO/Makefile
+nls/pl_PL/Makefile
 nls/nl_NL/Makefile
 nls/pt_BR/Makefile
 nls/ro_RO/Makefile