STEPMAKE_FONTCONFIG: add.

diff --git a/config.make.in b/config.make.in
index 357f05d0764b568435c01ff9096f59b57ccb5c37..c6604aa68cd61c2316f5965451c728e39acaf6aa 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -10,7 +10,7 @@ package-depth = @package_depth@
 USER_CFLAGS = @CPPFLAGS@ @CFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
 
 PACKAGE = @PACKAGE@
 package = @package@

diff --git a/configure.in b/configure.in
index 94b6c22203a529e7f70ec991d21dbc1c19c6a92d..69d77cbc508757cf711d9f41db720b9ff9e5244d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,7 @@ fi
 
 STEPMAKE_FREETYPE2
 STEPMAKE_PANGO_FT2
+STEPMAKE_FONTCONFIG
 
 ## TTFTOOL stuff
 AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 0bc586ba1baf9399568eab5d00e2632747e3c804..f35171e6f2f1984055dff6a4f3c5eb7b0dd3bda4 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1163,3 +1163,21 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [
        LIBS="$save_LIBS"
 fi
 ])
+
+AC_DEFUN(STEPMAKE_FONTCONFIG, [
+    PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, have_fontconfig=true, true)
+    if $have_fontconfig ; then
+       AC_DEFINE(HAVE_FONTCONFIG)
+       FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
+       FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
+       CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS"
+       LIBS="$FONTCONFIG_LIBS $LIBS"
+       AC_SUBST(FONTCONFIG_CFLAGS)
+       AC_SUBST(FONTCONFIG_LIBS)
+       CPPFLAGS="$save_CPPFLAGS"
+       LIBS="$save_LIBS"
+fi
+])