Include "config.h" instead of "autoconf.h" in all Modules lists to make defines

in the static portion of configuration includes available as well.

diff --git a/sysdep/config.h b/sysdep/config.h
index 6d8d1722535576d51543ce527137aa6f80b3a439..6b2f94abe2078dbbe4cd93b34b692c1db68b7b8d 100644 (file)
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -12,6 +12,8 @@
 /* Include OS configuration file as chosen in autoconf.h */
 #include SYSCONF_INCLUDE
 
+#ifndef MACROS_ONLY
+
 /* Types */
 typedef signed INTEGER_8 s8;
 typedef unsigned INTEGER_8 u8;
@@ -22,6 +24,8 @@ typedef unsigned INTEGER_32 u32;
 typedef u8 byte;
 typedef u16 word;
 
+#endif
+
 /*
  * Required alignment for multi-byte accesses. We currently don't
  * test these values in configure script, because several CPU's

diff --git a/tools/mergedirs b/tools/mergedirs
index 4196831b80452b0b026104d801eaea14ed4630f4..e50d02ba8499cfbda895aa186891ff08c577844a 100755 (executable)
--- a/tools/mergedirs
+++ b/tools/mergedirs
@@ -20,8 +20,8 @@ shift
 
 echo "Merging system-dependent modules ($@)"
 MODULES=`for a in $@ ; do
-               cat sysdep/autoconf.h $SRCDIR/$a/Modules |
-               $cpp -U unix - |
+               cat sysdep/config.h $SRCDIR/$a/Modules |
+               $cpp -U unix -D MACROS_ONLY - |
                sed "/^[ ]*\$/d;/^#/d;s@\\(.*\\)@\\1 $a/\\1@"
                done |
        sort +0 -1 -u |