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

diff --git a/configure.ac b/configure.ac
index b7f7f10c..8152ae63 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,101 @@ AC_CHECK_LIB([X11], [XOpenDisplay],
   AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
 )
 
+
+dnl Check for Xft >= 2
+XFT_MIN_MAJOR=2
+XFT_MIN_MINOR=0
+XFT_MIN_REVISION=0
+XFT_MIN=$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION
+AC_MSG_CHECKING([for Xft version >= $XFT_MIN])
+if ! pkg-config --atleast-version $XFT_MIN xft; then
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library.
+See http://www.fontconfig.org/
+])
+fi
+
+AC_MSG_RESULT([yes])
+
+dnl Store these
+OLDLIBS=$LIBS
+OLDCPPFLAGS=$CPPFLAGS
+
+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"
+
+AC_CHECK_LIB([Xft], [XftFontOpenName],
+  AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN])
+  AC_TRY_COMPILE(
+    [
+      #include <X11/Xlib.h>
+      #include <X11/Xft/Xft.h>
+    ],
+    [
+      #if !defined(XFT_MAJOR)
+      # error Xft.h is too old
+      #endif
+      #if XFT_MAJOR < $XFT_MIN_MAJOR
+      # error Xft.h is too old
+      #endif
+      #if XFT_MAJOR == $XFT_MIN_MAJOR
+      # if XFT_MINOR < $XFT_MIN_MINOR
+      #  error Xft.h is too old
+      # endif
+      #endif
+      #if XFT_MAJOR == $XFT_MIN_MAJOR
+      # if XFT_MAJOR == $XFT_MIN_MINOR
+      #  if XFT_REVISION < $XFT_MIN_REVISION
+      #   error Xft.h is too old
+      #  endif
+      # endif
+      #endif
+      
+      int i = XFT_MAJOR;
+      XftFont foo;
+    ],
+    [
+      AC_MSG_RESULT([yes])
+    ],
+    [
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library.
+See http://www.fontconfig.org/
+])
+    ]
+  )
+
+  AC_MSG_CHECKING([if we can compile with Xft])
+  AC_TRY_LINK(
+    [
+      #include <X11/Xlib.h>
+      #include <X11/Xft/Xft.h>
+    ],
+    [
+      int i = XFT_MAJOR;
+      XftFont foo
+    ],
+    [
+      AC_MSG_RESULT([yes])
+    ],
+    [ 
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Unable to compile with the Xft library.
+])
+    ]
+  )
+)
+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 +200,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 +261,8 @@ AC_ARG_ENABLE([xinerama],
   AC_MSG_RESULT([no])
 )
 
+
+
 AC_CONFIG_FILES([Makefile
 		m4/Makefile 
 		po/Makefile.in
@@ -175,6 +272,7 @@ AC_CONFIG_FILES([Makefile
 		util/Makefile
 		util/epist/Makefile
 		doc/Makefile
+		doc/doxygen/Makefile
 		data/Makefile
 		data/styles/Makefile
 		version.h