X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=8152ae63e1a8faa2bd0288abb52480d1ebf93edf;hb=52b83a9dbb2b7823d5f78781f5948dfd8d77d50b;hp=b7d371bb878b62687be12c616db1ebc88807c731;hpb=cf0823dcf3d1ee8e61be0dfc842b1be3a34b3aee;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index b7d371bb..8152ae63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,41 +91,99 @@ AC_CHECK_LIB([X11], [XOpenDisplay],
 )
 
 
-dnl Check for Xft2
-AC_MSG_CHECKING([for Xft version 2])
-XFT2=""
-if pkg-config xft; then
-  AC_MSG_RESULT([yes])
-  XFT2="yes"
-  LIBS="$LIBS `pkg-config --libs xft`"
-  CXXFLAGS="`pkg-config --cflags xft` $CXXFLAGS"
-else
+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_CHECK_LIB([Xft], [XftFontOpenXlfd],
-  AC_MSG_CHECKING([for X11/Xft/Xft.h])
+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])
-      dnl This is for Xft version 1
-      test "$XFT2" = "yes" || LIBS="$LIBS -lXft"
     ],
     [ 
       AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Openbox requires the Xft font library.
-See http://www.fontconfig.org/
+      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],