sync with the 2.0 branch

[chaz/openbox] / configure.in

diff --git a/configure.in b/configure.in
index f13ba2a941d45860feb444134f09e9851384ccee..190c1d695da54c5d4efc7724ded5c68e3ccd6b1b 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"
@@ -45,6 +45,29 @@ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS"
 LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
 
+AC_MSG_CHECKING(for GCC)
+if test x$GCC = "xyes"; then
+  AC_MSG_RESULT([yes])
+  CXXFLAGS="${CXXFLAGS} -Wall -W"
+else
+  AC_MSG_RESULT([no, trying other compilers])
+  AC_MSG_CHECKING(for MIPSpro)
+  mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
+  if test "x$mips_pro_ver" = "x"; then
+    AC_MSG_RESULT([no])
+  else
+    AC_MSG_RESULT([yes, version $mips_pro_ver.])
+    AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
+    lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
+    if test "x$lang_std_not_set" = "x"; then
+      AC_MSG_RESULT([not set, setting.])
+      CXXFLAGS="${CXXFLAGS} -LANG:std"
+    else
+      AC_MSG_RESULT([already set.])
+    fi
+  fi
+fi
+
 dnl Check for required functions in -lX11
 AC_CHECK_LIB(X11, XOpenDisplay,
   LIBS="$LIBS -lX11",
@@ -116,28 +139,27 @@ 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=no]],
-  if test x$enableval = "xyes"; then
-       AC_MSG_RESULT([yes])
+  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(
+  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])
-         )
+      AC_MSG_RESULT([yes])
+      XFT="yes"
+      LIBS="$LIBS -lXft",
+      AC_MSG_RESULT([no])
     )
+  )
 
-  else
-       AC_MSG_RESULT([no])
-  fi,
+else
   AC_MSG_RESULT([no])
-)
+fi
 if test x$XFT = "xyes"; then
   AC_DEFINE(XFT,1,Enable support of the Xft extension)
 fi
@@ -167,7 +189,11 @@ AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG -Wall -W -fno-inline"
+    if test x$GCC = "xyes"; then
+       DEBUG="-DDEBUG -fno-inline -g"
+    else
+       DEBUG="-DDEBUG"
+    fi
   else
     AC_MSG_RESULT([no])
     DEBUG="-DNDEBUG"
@@ -261,10 +287,12 @@ 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
 nls/ru_RU/Makefile
+nls/sk_SK/Makefile
 nls/sl_SI/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile