X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.in;h=3da2fe682aedfd07e72c816616983bb823d64422;hb=72a2e98738d87b89620bafd15141690aa4be8fab;hp=fdd0708d6dcddb44b3f425e5db44436327d201ab;hpb=5ba3ee6ec29cf3b54a1e3cc3233a37c0c7fdedee;p=chaz%2Fopenbox

diff --git a/configure.in b/configure.in
index fdd0708d..3da2fe68 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,2.0.0,no-define)
+AM_INIT_AUTOMAKE(openbox,2.2.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -35,7 +35,7 @@ dnl Check for X headers and libraries
 AC_PATH_X
 AC_PATH_XTRA
 
-test x$no_x = "xyes" && AC_MSG_ERROR([Openbox requires the X Window System libraries and headers.])
+test "$no_x" = "yes" && AC_MSG_ERROR([Openbox requires the X Window System libraries and headers.])
 
 test x$x_includes = "x" && x_includes="/usr/include"
 test x$x_libraries = "x" && x_libraries="/usr/lib"
@@ -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 "$GCC" = "yes"; 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",
@@ -60,7 +83,7 @@ AC_ARG_ENABLE(
   shape, [  --enable-shape          enable support of the XShape extension [default=yes]])
 
 : ${enableval="yes"}
-if test x$enableval = "xyes"; then
+if test "$enableval" = "yes"; then
   AC_MSG_RESULT([yes])
   AC_CHECK_LIB(Xext, XShapeCombineShape,
 	AC_MSG_CHECKING([for X11/extensions/shape.h])
@@ -77,56 +100,78 @@ if test x$enableval = "xyes"; then
 else
   AC_MSG_RESULT([no])
 fi
-if test x$SHAPE = "xyes"; then
+if test "$SHAPE" = "yes"; then
   LIBS="$LIBS -lXext"
   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]],
-  if test x$enableval = "xyes"; then
+  xinerama, [  --enable-xinerama       enable support of the Xinerama extension [default=no]],
+  if test "$enableval" = "yes"; 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",
-        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$XFT = "xyes"; then
-  AC_DEFINE(XFT,1,Enable support of the Xft extension)
+if test "$XINERAMA" = "yes"; then
+  AC_DEFINE(XINERAMA,1,Enable support of the Xinerama extension)
 fi
 
-dnl Check for the Slit
-SLIT=""
-AC_MSG_CHECKING([whether to include the Slit])
+dnl Check for Xft extension support and proper library files.
+XFT=""
+XFT_UTF8=""
+AC_MSG_CHECKING([whether to build support for the Xft extension])
 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,
+  xft, [  --enable-xft            enable support of the Xft extension [default=yes]])
+: ${enableval="yes"}
+if test "$enableval" = "yes"; then
   AC_MSG_RESULT([yes])
-  SLIT="yes"
-)
-if test x$SLIT = "xyes"; then
-  AC_DEFINE(SLIT,1,Enable the Slit)
+
+  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"
+
+      dnl Check for utf8 support in the Xft library
+      AC_CHECK_LIB(Xft, XftDrawStringUtf8,
+        XFT_UTF8="yes",
+      ),
+
+      AC_MSG_RESULT([no])
+    )
+  )
+
+else
+  AC_MSG_RESULT([no])
+fi
+if test "$XFT" = "yes"; then
+  AC_DEFINE(XFT,1,[Enable support of the Xft extension])
+  if test "$XFT_UTF8" = "yes"; then
+    AC_DEFINE(XFT_UTF8,1,[Support for Utf8 text in the Xft extension])
+  fi
 fi
 
 dnl Check for ordered 8bpp dithering
@@ -135,7 +180,7 @@ AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
 AC_ARG_ENABLE(ordered-pseudo,
 [  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
                           dithering [default=no]],
-  if test x$enableval = "xyes"; then
+  if test "$enableval" = "yes"; then
     AC_MSG_RESULT([yes])
     ORDEREDPSEUDO="yes" 
   else
@@ -143,36 +188,22 @@ AC_ARG_ENABLE(ordered-pseudo,
   fi,
   AC_MSG_RESULT([no])
 )
-if test x$ORDEREDPSEUDO = "xyes"; then
+if test "$ORDEREDPSEUDO" = "yes"; 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])
 AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
-  if test x$enableval = "xyes"; then
+  if test "$enableval" = "yes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG -Wall -W"
+    if test "$GCC" = "yes"; then
+       DEBUG="-DDEBUG -fno-inline -g"
+    else
+       DEBUG="-DDEBUG"
+    fi
   else
     AC_MSG_RESULT([no])
     DEBUG="-DNDEBUG"
@@ -187,7 +218,7 @@ NLS=""
 AC_MSG_CHECKING([whether to include NLS support])
 AC_ARG_ENABLE(nls,
   [  --enable-nls            include natural language support [default=yes]],
-  if test x$enableval = "xyes"; then
+  if test "$enableval" = "yes"; then
     AC_MSG_RESULT([yes])
     NLS="yes"
   else
@@ -204,7 +235,7 @@ if test x$gencat_cmd = "x"; then
   NLS=""
 fi
 
-if test x$NLS = "xyes"; then
+if test "$NLS" = "yes"; then
   AC_DEFINE(NLS,1,Include natural language support)
   AC_SUBST(NLS)
 fi
@@ -215,7 +246,7 @@ AC_MSG_CHECKING([whether to use the timed pixmap cache])
 AC_ARG_ENABLE(
   timed-cache,
 [  --enable-timed-cache    use timed pixmap cache [default=yes]],
-  if test x$enableval = "xyes"; then
+  if test "$enableval" = "yes"; then
     AC_MSG_RESULT([yes])
     TIMEDCACHE="yes"
   else
@@ -224,10 +255,29 @@ AC_ARG_ENABLE(
   AC_MSG_RESULT([yes])
   TIMEDCACHE="yes"
 )
-if test x$TIMEDCACHE = "xyes"; then
+if test "$TIMEDCACHE" = "yes"; then
   AC_DEFINE(TIMEDCACHE,1,Use timed pixmap cache)
 fi
 
+dnl Check for bitmapped buttons
+BITMAPBUTTONS=""
+AC_MSG_CHECKING([whether to include bitmappable buttons])
+AC_ARG_ENABLE(
+  bitmap-buttons,
+[  --enable-bitmap-buttons include bitmappable buttons [default=yes]],
+  if test x$enableval = "xyes"; then
+    AC_MSG_RESULT([yes])
+    BITMAPBUTTONS="yes"
+  else
+    AC_MSG_RESULT([no])
+  fi,
+  AC_MSG_RESULT([yes])
+  BITMAPBUTTONS="yes"
+)
+if test x$BITMAPBUTTONS = "xyes"; then
+  AC_DEFINE(BITMAPBUTTONS,1,Include bitmappable buttons)
+fi
+
 dnl Determine the return type of signal handlers
 AC_TYPE_SIGNAL
 
@@ -249,6 +299,7 @@ AM_CONFIG_HEADER(config.h)
 AC_OUTPUT(Makefile
 src/Makefile
 util/Makefile
+util/epist/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
@@ -256,15 +307,22 @@ 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
 nls/hu_HU/Makefile
 nls/it_IT/Makefile
 nls/ja_JP/Makefile
+nls/ko_KR/Makefile
+nls/lv_LV/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