diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 39 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 35 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 174114cef33..38332de3a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-09 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * configure.in (gxx_include_dir): Fix typo. + * configure: Regenerated. + 2003-03-06 Andrew Cagney <cagney@redhat.com> * texinfo/texinfo.tex: Import version 2003-02-03.16. diff --git a/configure b/configure index 7cf1f55446b..2e14fb6df05 100755 --- a/configure +++ b/configure @@ -2496,7 +2496,7 @@ if test x${gxx_include_dir} = x; then gxx_include_dir='${libsubdir}/include/c++' else . ${srcdir}/config.if - gxx_include_dir='${prefix}/include/${libstdcxx_incdir}' + gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} fi else gxx_include_dir=${gxx_include_dir} @@ -3977,15 +3977,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/configure.in b/configure.in index eb473b8a5c1..9229c15fc41 100644 --- a/configure.in +++ b/configure.in @@ -1835,7 +1835,7 @@ if test x${gxx_include_dir} = x; then gxx_include_dir='${libsubdir}/include/c++' else . ${srcdir}/config.if - gxx_include_dir='${prefix}/include/${libstdcxx_incdir}' + gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} fi else gxx_include_dir=${gxx_include_dir} |