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

    found when building in the modular tree

18 files changed, 54 insertions, 0 deletions

diff --git a/src/Speedo/bics-unicode.c b/src/Speedo/bics-unicode.c
index d1733cb..7355082 100644
--- a/src/Speedo/bics-unicode.c
+++ b/src/Speedo/bics-unicode.c
@@ -24,6 +24,9 @@ THE SOFTWARE.
 
 /* These data are very dodgy. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "bics-unicode.h"
 
 static short table_160[]=
diff --git a/src/Speedo/do_char.c b/src/Speedo/do_char.c
index c45bb5f..410d633 100644
--- a/src/Speedo/do_char.c
+++ b/src/Speedo/do_char.c
@@ -30,6 +30,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  *                                                                           *
  ****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo    */
 
 #define   DEBUG   0
diff --git a/src/Speedo/do_trns.c b/src/Speedo/do_trns.c
index 2e397e8..2e0f1db 100644
--- a/src/Speedo/do_trns.c
+++ b/src/Speedo/do_trns.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  ****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo    */
 
 #define   DEBUG      0
diff --git a/src/Speedo/out_bl2d.c b/src/Speedo/out_bl2d.c
index 61995e1..6c38cb3 100644
--- a/src/Speedo/out_bl2d.c
+++ b/src/Speedo/out_bl2d.c
@@ -29,6 +29,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  ****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"              /* General definitions for speedo */
 
 #define   CLOCKWISE  1
diff --git a/src/Speedo/out_blk.c b/src/Speedo/out_blk.c
index 3ecefcc..a5b669b 100644
--- a/src/Speedo/out_blk.c
+++ b/src/Speedo/out_blk.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  *****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo   */
 
 #define   DEBUG      0
diff --git a/src/Speedo/out_outl.c b/src/Speedo/out_outl.c
index bebc684..0139010 100644
--- a/src/Speedo/out_outl.c
+++ b/src/Speedo/out_outl.c
@@ -30,6 +30,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  ****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo     */
 
 
diff --git a/src/Speedo/out_scrn.c b/src/Speedo/out_scrn.c
index 8e1b48f..0ea3b19 100644
--- a/src/Speedo/out_scrn.c
+++ b/src/Speedo/out_scrn.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  *****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo   */
 
 #define   DEBUG      0
diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c
index a6f02f0..1712410 100644
--- a/src/Speedo/out_util.c
+++ b/src/Speedo/out_util.c
@@ -24,6 +24,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 /* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define	DEBUG	0
 
 /*************************** O U T _ U T I L . C *****************************
diff --git a/src/Speedo/reset.c b/src/Speedo/reset.c
index 982d644..4cb9f7d 100644
--- a/src/Speedo/reset.c
+++ b/src/Speedo/reset.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  *                                                                           *
  ****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo     */
 #include "keys.h"                /* Font decryption keys */
 
diff --git a/src/Speedo/set_spcs.c b/src/Speedo/set_spcs.c
index df45943..b69b13f 100644
--- a/src/Speedo/set_spcs.c
+++ b/src/Speedo/set_spcs.c
@@ -29,6 +29,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  * This module implements all sp_set_specs() functionality.                  *
  *                                                                           *
  ****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define SET_SPCS
 #include "spdo_prv.h"               /* General definitions for Speedo    */
 #include "keys.h"
diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c
index 18cdb46..3b8f603 100644
--- a/src/Speedo/set_trns.c
+++ b/src/Speedo/set_trns.c
@@ -34,6 +34,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
  ****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "spdo_prv.h"               /* General definitions for Speedo   */
 
 #define   DEBUG      0
diff --git a/src/Speedo/spencode.c b/src/Speedo/spencode.c
index b06798c..96a1350 100644
--- a/src/Speedo/spencode.c
+++ b/src/Speedo/spencode.c
@@ -49,6 +49,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.6 2001/01/17 19:43:18 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	"spint.h"
 
 /* No longer needed with new encoding code */
diff --git a/src/Speedo/sperr.c b/src/Speedo/sperr.c
index 82ed532..36ce511 100644
--- a/src/Speedo/sperr.c
+++ b/src/Speedo/sperr.c
@@ -54,6 +54,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.6 2001/12/14 19:56:41 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	"spint.h"
 
 #ifndef FONTMODULE
diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c
index c3bd9b4..c58c0e4 100644
--- a/src/Speedo/spfile.c
+++ b/src/Speedo/spfile.c
@@ -51,6 +51,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontenc.h>
 #ifndef FONTMODULE
diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 14d47b7..c209d5a 100644
--- a/src/Speedo/spfont.c
+++ b/src/Speedo/spfont.c
@@ -55,6 +55,9 @@ from The Open Group.
  * Speedo font loading
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	<X11/fonts/FSproto.h>
 #include	"spint.h"
 #include	<X11/fonts/fontutil.h>
diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c
index 840f0e1..da4d5c5 100644
--- a/src/Speedo/spfuncs.c
+++ b/src/Speedo/spfuncs.c
@@ -51,6 +51,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.7 2001/08/27 19:49:51 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef FONTMODULE
 #include <X11/Xos.h>
 #endif
diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c
index dbf47b9..3577f55 100644
--- a/src/Speedo/spglyph.c
+++ b/src/Speedo/spglyph.c
@@ -51,6 +51,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	<X11/X.h>	/* for bit order #defines */
 #include	"spint.h"
 #include	<X11/fonts/fontutil.h>
diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c
index 054b46e..d7a1edd 100644
--- a/src/Speedo/spinfo.c
+++ b/src/Speedo/spinfo.c
@@ -51,6 +51,9 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontutil.h>
 #include "spint.h"