diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | tools/mergedirs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 977b9281..9f5baeb8 100644 --- a/configure.in +++ b/configure.in @@ -114,7 +114,7 @@ else fi AC_CONFIG_HEADER(sysdep/autoconf.h) -AC_OUTPUT_COMMANDS(,[$srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]) +AC_OUTPUT_COMMANDS(,[CPP="$CPP" $srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]) AC_OUTPUT($makefiles) cat >&AC_FD_MSG <<EOF diff --git a/tools/mergedirs b/tools/mergedirs index 7bc9109e..4196831b 100755 --- a/tools/mergedirs +++ b/tools/mergedirs @@ -4,6 +4,7 @@ if [ -z "$4" ] ; then echo "Usage: mergedirs <src-dir> <src-dir-rel> <obj-dir> <list-of-dirs>" exit 1 fi +cpp=${CPP:-gcc -E} SRCDIR=$1 shift SRCREL=$1 @@ -19,7 +20,9 @@ shift echo "Merging system-dependent modules ($@)" MODULES=`for a in $@ ; do - sed <$SRCDIR/$a/Modules "s@\\(.*\\)@\\1 $a/\\1@" + cat sysdep/autoconf.h $SRCDIR/$a/Modules | + $cpp -U unix - | + sed "/^[ ]*\$/d;/^#/d;s@\\(.*\\)@\\1 $a/\\1@" done | sort +0 -1 -u | cut -d ' ' -f 2` |