From 48db40f692a31c39a96961c8733bfeaad416a5c0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 23 May 2002 23:00:46 +0000
Subject: [PATCH] A few random fontconfig build fixes

---
 config/config-subst     | 12 +++++++-----
 fontconfig/fontconfig.h |  7 +++++--
 src/fcinit.c            |  8 +++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/config/config-subst b/config/config-subst
index c3436e7..5907e03 100644
--- a/config/config-subst
+++ b/config/config-subst
@@ -1,8 +1,10 @@
 #!/bin/sh
-exprs=""
+script=config-subst.$$
+trap "rm $script" 0
+rm -f $script
 for i in ${1+"$@"}; do
-	var="`echo $i | sed 's/=.*$//'`"
-	val="`echo $i | sed 's/^[^=]*=//'`"
-	exprs="$exprs -e s;@$var@;$val;"
+	var="`echo "$i" | sed 's/=.*$//'`"
+	val="`echo "$i" | sed 's/^[^=]*=//'`"
+	echo "s;@$var@;$val;" >> $script
 done
-sed $exprs
+sed -f $script
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 2bb59f6..4968aa7 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.8 2002/05/21 17:06:22 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.9 2002/05/22 04:37:07 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -37,7 +37,7 @@ typedef int		FcBool;
  */
 #define FC_MAJOR	1
 #define FC_MINOR	0
-#define FC_REVISION	0
+#define FC_REVISION	1
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -412,6 +412,9 @@ FcInitLoadConfigAndFonts (void);
 FcBool
 FcInit (void);
 
+int
+FcGetVersion (void);
+
 FcBool
 FcInitReinitialize (void);
 
diff --git a/src/fcinit.c b/src/fcinit.c
index 1b9ef2a..5f1fe36 100644
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcinit.c,v 1.4 2002/05/21 17:06:22 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcinit.c,v 1.5 2002/05/21 17:48:15 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -43,6 +43,12 @@ bail0:
     return 0;
 }
 
+int
+FcGetVersion (void)
+{
+    return FC_VERSION;
+}
+
 /*
  * Load the configuration files
  */
-- 
2.39.5