From: Keith Packard <keithp@neko.keithp.com>
Date: Mon, 28 Aug 2006 16:43:12 +0000 (-0700)
Subject: Regenerate x86 line in fcarch.tmpl.h to match change in cache data.
X-Git-Tag: 2.3.96~44
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7db39f729859827b246da242a26ddba13cb8c4b1;p=fontconfig.git

Regenerate x86 line in fcarch.tmpl.h to match change in cache data.

Also remove spurious printf of directory names.
---

diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am
index 60cd764..8db30bb 100644
--- a/fc-arch/Makefile.am
+++ b/fc-arch/Makefile.am
@@ -43,7 +43,7 @@ noinst_MANS=fc-arch.man
 
 EXTRA_DIST=$(TMPL)
 
-$(TARG):fc-arch${EXEEXT} $(STMPL)
+$(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
 	rm -f $(TARG)
 	./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG)
 
diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h
index fe95e51..d8ecdb1 100644
--- a/fc-arch/fcarch.tmpl.h
+++ b/fc-arch/fcarch.tmpl.h
@@ -29,4 +29,4 @@
 @@@ use something reasonable and don't include any spaces
 @@@
 @@@ name    endian   char     char*    int      Pattern  EltPtr   Elt *    Elt      ObjPtr   VLPtr    Value    Binding  VL *     CharSet  Leaf**   Char16 * Char16   Leaf     Char32   Cache    PageSize
-x86	    78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000030_00001000
+x86	    78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000
diff --git a/src/fcdir.c b/src/fcdir.c
index 86d391b..0136867 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -143,7 +143,6 @@ FcDirScanConfig (FcFontSet	*set,
 
     canon_dir = FcStrCanonFilename (dir);
     if (!canon_dir) canon_dir = (FcChar8 *) dir;
-    printf ("dir %s canon %s\n", dir, canon_dir);
     
     if (config && !FcConfigAcceptFilename (config, canon_dir)) {
 	ret = FcTrue;