remove compiler warnings

[chaz/openbox] / configure.in

diff --git a/configure.in b/configure.in
index 4fe7beeb2b1d8e45b08beec86b960786c9742747..8434256a26f34a621902e3a720ebf6cf65f36783 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,8 +53,6 @@ AC_CHECK_LIB(X11, XOpenDisplay,
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
-Xext_lib=""
-
 dnl Check for XShape extension support and proper library files.
 SHAPE=""
 AC_MSG_CHECKING([whether to build support for the XShape extension])
@@ -65,16 +63,16 @@ AC_ARG_ENABLE(
 if test x$enableval = "xyes"; then
   AC_MSG_RESULT([yes])
   AC_CHECK_LIB(Xext, XShapeCombineShape,
-    AC_MSG_CHECKING([for X11/extensions/shape.h])
-    AC_TRY_LINK(
+       AC_MSG_CHECKING([for X11/extensions/shape.h])
+       AC_TRY_LINK(
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 , long foo = ShapeSet,
-      AC_MSG_RESULT([yes])
-      SHAPE="yes",
-      AC_MSG_RESULT([no])
-    )
+         AC_MSG_RESULT([yes])
+         SHAPE="yes",
+         AC_MSG_RESULT([no])
+       )
   )
 else
   AC_MSG_RESULT([no])
@@ -84,6 +82,34 @@ 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])
+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",
+      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])
@@ -179,6 +205,7 @@ fi
 
 if test x$NLS = "xyes"; then
   AC_DEFINE(NLS,1,Include natural language support)
+  AC_SUBST(NLS)
 fi
 
 dnl Check for new timed pixmap cache