From ea731dfadf8aedaf6b0a5549a45e8946dc2dae9a Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 28 Mar 2005 11:42:05 +0000
Subject: [PATCH] STEPMAKE_FONTCONFIG: add.

---
 config.make.in      |  2 +-
 configure.in        |  1 +
 stepmake/aclocal.m4 | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/config.make.in b/config.make.in
index 357f05d076..c6604aa68c 100644
--- 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 94b6c22203..69d77cbc50 100644
--- 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 0bc586ba1b..f35171e6f2 100644
--- 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
+])
-- 
2.39.5