Filter all `Modules' files through C preprocessor, so that they can

reference BIRD configuration.

By the way: Do you know GCC by default does `#define unix 1'?

diff --git a/configure.in b/configure.in
index 977b928193224e70cc40d262094b5643b356ba32..9f5baeb8840612a25281ed6edcf95c77b51ff005 100644 (file)
--- 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 7bc9109e0c1b232b5942d2435af0d9aa0688f7d0..4196831b80452b0b026104d801eaea14ed4630f4 100755 (executable)
--- 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`