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

in the static portion of configuration includes available as well.
This commit is contained in:
Martin Mares 1999-03-01 20:15:14 +00:00
parent 1b769b08c1
commit ea3582a6f6
2 changed files with 6 additions and 2 deletions

View file

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

View file

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