sync with bb-cvs.

[chaz/openbox] / configure.in

diff --git a/configure.in b/configure.in
index 8434256a26f34a621902e3a720ebf6cf65f36783..962e67e376e61eecf14f11efbde3c3214ec7c0d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -86,46 +86,30 @@ 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]])
+  xft, [  --enable-xft            enable support of the Xft extension [default=no]],
+  if test x$enableval = "xyes"; then
+       AC_MSG_RESULT([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",
-      AC_MSG_RESULT([no])
+        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
-  LIBS="$LIBS -lXft"
-  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])
+       AC_MSG_RESULT([no])
   fi,
-  AC_MSG_RESULT([yes])
-  SLIT="yes"
+  AC_MSG_RESULT([no])
 )
-if test x$SLIT = "xyes"; then
-  AC_DEFINE(SLIT,1,Enable the Slit)
+if test x$XFT = "xyes"; then
+  AC_DEFINE(XFT,1,Enable support of the Xft extension)
 fi
 
 dnl Check for ordered 8bpp dithering
@@ -146,24 +130,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])
@@ -171,7 +137,7 @@ 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"
+    DEBUG="-DDEBUG -Wall -W -fno-inline"
   else
     AC_MSG_RESULT([no])
     DEBUG="-DNDEBUG"
@@ -248,6 +214,7 @@ AM_CONFIG_HEADER(config.h)
 AC_OUTPUT(Makefile
 src/Makefile
 util/Makefile
+util/epist/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
@@ -261,8 +228,11 @@ nls/fr_FR/Makefile
 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