A few random fontconfig build fixes

diff --git a/config/config-subst b/config/config-subst
index c3436e7b064c2d9a231e1e8d1bd6e0c559a0e1bf..5907e03286ab94ac2ddd40f5e1acab305158dbfc 100644 (file)
--- 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 2bb59f6b20804549a0fc992cdf4861e1ace76b59..4968aa76cb9f3a7c03b5599aca980f7a8bef9e7d 100644 (file)
--- 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 1b9ef2a94c173672f1cd5d5a121844ec42310825..5f1fe36f70e049137b12874f8f479e7352ed3cd2 100644 (file)
--- 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
  */