* scheme.h and kernel.h no longer include config.h

* Hence included config.h in all C files.
  * Added site.h which will replace config.h for installed headers.


git-svn-id: svn://svn.zoy.org/elk/trunk@103 55e467fa-43c5-0310-a8a2-de718669efc6

include/Makefile.am

@@ -1,4 +1,5 @@
 NULL = 
+
 pkginclude_HEADERS = \
 	compat.h \
 	cstring.h \
@@ -15,3 +16,7 @@ pkginclude_HEADERS = \
 	stkmem.h \
 	type.h \
 	$(NULL)
+
+nodist_pkginclude_HEADERS = site.h
+EXTRA_DIST = site.h.in
+

include/kernel.h

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "config.h"
 #include "funcproto.h"
 #include "param.h"
 #include "object.h"

include/scheme.h

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "config.h"
 #include "funcproto.h"
 #include "param.h"
 #include "object.h"

include/site.h.in

@@ -0,0 +1,33 @@
+/* site.h.in: Site-local settings.
+ *
+ * $Id$
+ *
+ * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
+ * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ *
+ * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
+ * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
+ * by Oliver Laumann for TELES Telematic Services, Berlin, in a joint project
+ * between TELES and Nixdorf Microprocessor Engineering, Berlin).
+ *
+ * Oliver Laumann, TELES GmbH, Nixdorf Computer AG and Sam Hocevar, as co-
+ * owners or individual owners of copyright in this software, grant to any
+ * person or company a worldwide, royalty free, license to
+ *
+ *    i) copy this software,
+ *   ii) prepare derivative works based on this software,
+ *  iii) distribute copies of this software or derivative works,
+ *   iv) perform this software, or
+ *    v) display this software,
+ *
+ * provided that this notice is not removed and that neither Oliver Laumann
+ * nor Teles nor Nixdorf are deemed to have made any representations as to
+ * the suitability of this software for any purpose nor are held responsible
+ * for any defects of this software.
+ *
+ * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* The C99 integers header */
+#include <@STDINT_HEADER@>
+

lib/misc/bitstring.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 

lib/misc/debug.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "scheme.h"
 
 static Object P_Debug (Object on) {

lib/misc/elk-eval.c

@@ -42,6 +42,8 @@
  * arguments.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include "scheme.h"

lib/misc/gdbm.c

@@ -93,11 +93,14 @@
  */
 
 
-#include "scheme.h"
+#include "config.h"
+
 #include <gdbm.h>
 #include <errno.h>
 #include <string.h>
 
+#include "scheme.h"
+
 extern gdbm_error gdbm_errno;
 extern int errno;
 static char *gdbm_error_message = "";

lib/misc/hack.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "scheme.h"
 
 static Object P_Hack_Procedure_Environment (Object p, Object e) {

lib/misc/monitor.c

@@ -50,11 +50,12 @@
  * hacking by editing mon.o with emacs.
  */
 
-
-#include "scheme.h"
+#include "config.h"
 
 #include <sys/types.h>
 
+#include "scheme.h"
+
 #define MONSTART 2
 
 static int monitoring;

lib/misc/record.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "scheme.h"
 
 #define RTD(x)     ((struct S_Rtd *)POINTER(x))

lib/misc/regexp.c

@@ -32,7 +32,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "scheme.h"
+#include "config.h"
 
 #include <string.h>
 
@@ -41,6 +41,8 @@
 #include <sys/types.h>
 #include <regex.h>
 
+#include "scheme.h"
+
 #define REGEXP(x)   ((struct S_Regexp *)POINTER(x))
 #define MATCH(x)    ((struct S_Match *)POINTER(x))
 

lib/misc/struct.c

@@ -30,6 +30,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "scheme.h"
 
 #define STRUCT(x)  ((struct S_Struct *)POINTER(x))

lib/unix/unix.h

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "scheme.h"
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -42,6 +42,8 @@
 #  include <unistd.h>
 #endif
 
+#include "scheme.h"
+
 extern int errno;
 extern char *index();
 

lib/xlib/xlib.h

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

src/autoload.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 Object V_Autoload_Notifyp;

src/bignum.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <math.h>
 #include <ctype.h>
 #include <string.h>

src/bool.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 extern int Generic_Equal (Object, Object);
 
 Object P_Booleanp (Object x) {

src/char.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 
 #include "kernel.h"

src/cont.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 extern void Switch_Environment (Object);
 
 void Jump_Cont (struct S_Control *, Object);

src/cstring.c

@@ -36,10 +36,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 static char *heapstr[NUMSTRBUFS];
 static int heaplen[NUMSTRBUFS];
 static int nextstr;

src/debug.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 Object P_Backtrace_List (int argc, Object *argv) {

src/dump.c

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #ifdef CAN_DUMP
 
@@ -37,6 +37,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "kernel.h"
+
 #ifndef O_BINARY
 #  define O_BINARY 0
 #endif

src/env.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 void Set_Name (Object, Object);

src/error.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>

src/exception.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <stdlib.h>
 
+#include "kernel.h"
+
 #ifdef HAVE_ATTRIBUTE_NORETURN
 extern void Reset () __attribute__ ((__noreturn__));
 #else

src/feature.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 static Object Features;
 
 void Init_Features () {

src/heap.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 int GC_In_Progress;

src/io.c

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -42,6 +42,8 @@
 #  include <unistd.h>
 #endif
 
+#include "kernel.h"
+
 extern void Flush_Output (Object);
 
 extern int errno;

src/libelk.c

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <errno.h>
 #include <limits.h>
@@ -51,6 +51,8 @@
 #  endif
 #endif
 
+#include "kernel.h"
+
 extern void Call_Initializers (SYMTAB *, char *, int);
 extern void Load_Source (Object);
 extern void Call_Finalizers ();

src/list.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 extern unsigned int Stack_Size ();

src/load.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 Object V_Load_Path, V_Load_Noisilyp, V_Load_Libraries;

src/main.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <scheme.h>
 
 int main(int ac, char **av) {

src/malloc.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <stdlib.h>
 
+#include "kernel.h"
+
 char *Safe_Malloc (unsigned int size) {
     char *ret;
 

src/math.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <math.h>
 #include <errno.h>
 #include <limits.h>

src/onfork.c

@@ -37,6 +37,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 static FUNCT *Onfork_Funcs;

src/prim.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 extern void Memoize_Frame (Object);

src/print.c

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 #include <errno.h>
@@ -43,6 +43,8 @@
 #endif
 #endif
 
+#include "kernel.h"
+
 extern void Print_Bignum (Object, Object);
 
 extern int errno;

src/proc.c

@@ -29,6 +29,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 #ifdef USE_ALLOCA

src/promise.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 Object P_Promisep (Object x) {

src/read.c

@@ -28,7 +28,7 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -46,6 +46,8 @@
 #  include FIONREAD_H
 #endif
 
+#include "kernel.h"
+
 extern void Flush_Output (Object);
 
 extern char *index();

src/special.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 extern void Do_Wind (Object);

src/stab.c

@@ -28,11 +28,13 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
 
+#include "kernel.h"
+
 void Free_Symbols (SYMTAB *);
 
 #if defined(CAN_LOAD_OBJ) || defined (INIT_OBJECTS)

src/stkmem.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "kernel.h"
 
 #ifndef USE_ALLOCA

src/string.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 

src/symbol.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 

src/terminate.c

@@ -28,6 +28,8 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
 

src/type.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 #define TYPE_GROW    10
 
 TYPEDESCR *Types;

src/vector.c

@@ -28,10 +28,12 @@
  * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
  */
 
-#include "kernel.h"
+#include "config.h"
 
 #include <string.h>
 
+#include "kernel.h"
+
 extern int Get_Index (Object, Object);
 
 Object General_Make_Vector (int len, Object fill, int konst) {