Include config.h in every source file to make sure necessary options are

    found when building in the modular tree

16 files changed, 50 insertions, 2 deletions

diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c
index 2039fe7..ae27de8 100644
--- a/src/fontfile/bitsource.c
+++ b/src/fontfile/bitsource.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 
 BitmapSourcesRec	FontFileBitmapSources;
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index a6b20e7..43c6a13 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -34,6 +34,9 @@ from The Open Group.
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/fonts/fontmisc.h>
 #include <X11/fonts/bufio.h>
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index ca552a1..a4c5468 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -50,6 +50,9 @@ in this Software without prior written authorization from The Open Group.
  * decompress - cat a compressed file
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fontmisc.h>
 #include <X11/fonts/bufio.h>
 
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index 0091571..7f20cab 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/X.h>
 #include    <X11/Xproto.h>
 
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 67b1f96..5004922 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -37,6 +37,9 @@ in this Software without prior written authorization from The Open Group.
  * Read fonts.dir and fonts.alias files
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
index 2c2f7ea..9a70a17 100644
--- a/src/fontfile/ffcheck.c
+++ b/src/fontfile/ffcheck.c
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/bitmap.h>
 #ifdef LOADABLEFONTS
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index 61151d5..a3f9464 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilio.h>
 #include <X11/Xos.h>
 #ifndef O_BINARY
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index 7feafe7..d076f16 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilio.h>
 #include <X11/Xos.h>
 
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index c20cda6..29fe06b 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.3 2004/11/15 15:06:55 ago Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
 /* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 
 /*
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/fonts/fntfilst.h>
 #include    <X11/keysym.h>
 
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index f88ffcb..b54079a 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -28,6 +28,9 @@ THE SOFTWARE.
    *not* provide source compatibility, as many of the data structures
    now have different names. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fontenc.h>
 #include <X11/fonts/fontencc.h>
 
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 33586a4..73804f8 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.3 2004/11/15 15:06:56 ago Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
 /* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 
 /*
@@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/fonts/fntfilst.h>
 #ifdef WIN32
 #include <ctype.h>
diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c
index f9c6323..8e9de51 100644
--- a/src/fontfile/fontscale.c
+++ b/src/fontfile/fontscale.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/fonts/fntfilst.h>
 #ifdef _XOPEN_SOURCE
 #include <math.h>
diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c
index 9669a8b..8c9c317 100644
--- a/src/fontfile/gunzip.c
+++ b/src/fontfile/gunzip.c
@@ -4,6 +4,9 @@
    intended for inclusion in X11 public releases. */
 /* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fontmisc.h>
 #include <X11/fonts/bufio.h>
 #include <zlib.h>
diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
index f91052d..0b6c19c 100644
--- a/src/fontfile/printerfont.c
+++ b/src/fontfile/printerfont.c
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/fonts/fntfilst.h>
 
 /*
diff --git a/src/fontfile/register.c b/src/fontfile/register.c
index eaacdc1..dd4a04b 100644
--- a/src/fontfile/register.c
+++ b/src/fontfile/register.c
@@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group.
  * end up dragging in code from all the renderers, which is not small.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fontmisc.h>
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/bitmap.h>
diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c
index 4186724..f110ba8 100644
--- a/src/fontfile/renderers.c
+++ b/src/fontfile/renderers.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 extern void ErrorF(const char *f, ...);