X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=6b5537e62d1e32be21453d8078e18cfd6be0188d;hb=fb3848450e649a05c0bed84a02bc9ab4e563b5d9;hp=b7f7f10cffbc731d407fabf3f7b6b6da901c83e4;hpb=6b905206e2a2f624c8d414e08311a9d5a493b3e5;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index b7f7f10c..6b5537e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([src/main.cc])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([openbox], [2.90.0])
+AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
 AC_PREREQ([2.50])
 
@@ -90,6 +90,57 @@ AC_CHECK_LIB([X11], [XOpenDisplay],
   AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
 )
 
+
+dnl Check for Xft2
+AC_MSG_CHECKING([for Xft version 2])
+dnl Store these
+OLDLIBS=$LIBS
+OLDCPPFLAGS=$CPPFLAGS
+XFT2=""
+XFT_CFLAGS=""
+XFT_LIBS=""
+if pkg-config xft; then
+  AC_MSG_RESULT([yes])
+  XFT_CFLAGS="`pkg-config --cflags xft`"
+  XFT_LIBS="`pkg-config --libs xft`"
+
+  dnl Set these for checking with the tests below. They'll be restored after
+  LIBS="$LIBS $XFT_LIBS"
+  CPPFLAGS="$XFT_CFLAGS $CPPFLAGS"
+else
+  dnl This is for Xft version 1
+  XFT_LIBS="-lXft"
+  AC_MSG_RESULT([no])
+fi
+
+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])
+    ],
+    [ 
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Openbox requires the Xft font library.
+See http://www.fontconfig.org/
+])
+    ]
+  )
+)
+dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's
+LIBS=$OLDLIBS
+CPPFLAGS=$OLDCPPFLAGS
+
+AC_SUBST([XFT_CFLAGS])
+AC_SUBST([XFT_LIBS])
+
 dnl Check for XShape extension support
 AC_CHECK_LIB([Xext], [XShapeCombineShape],
   AC_MSG_CHECKING([for X11/extensions/shape.h])
@@ -105,7 +156,7 @@ AC_CHECK_LIB([Xext], [XShapeCombineShape],
     [
       AC_MSG_RESULT([yes])
       SHAPE="yes"
-      AC_DEFINE([HAVE_SHAPE], [1], [Found the XShape extension])
+      AC_DEFINE([SHAPE], [1], [Found the XShape extension])
       LIBS="$LIBS -lXext"
     ],
     [ 
@@ -166,6 +217,8 @@ AC_ARG_ENABLE([xinerama],
   AC_MSG_RESULT([no])
 )
 
+
+
 AC_CONFIG_FILES([Makefile
 		m4/Makefile 
 		po/Makefile.in
@@ -175,6 +228,7 @@ AC_CONFIG_FILES([Makefile
 		util/Makefile
 		util/epist/Makefile
 		doc/Makefile
+		doc/doxygen/Makefile
 		data/Makefile
 		data/styles/Makefile
 		version.h