Vladimir Prus <vladimir@codesourcery.com Joseph Myers <joseph@codesourcery.com>
2007-02-17 Mark Mitchell <mark@codesourcery.com> Nathan Sidwell <nathan@codesourcery.com> Vladimir Prus <vladimir@codesourcery.com Joseph Myers <joseph@codesourcery.com> * configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix quoting. * configure: Regenerate. Co-Authored-By: Nathan Sidwell <nathan@codesourcery.com> From-SVN: r122073
This commit is contained in:
parent
51db94a08e
commit
beeaf21625
3 changed files with 46 additions and 18 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-02-17 Mark Mitchell <mark@codesourcery.com>
|
||||
Nathan Sidwell <nathan@codesourcery.com>
|
||||
Vladimir Prus <vladimir@codesourcery.com
|
||||
Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix quoting.
|
||||
* configure: Regenerate.
|
||||
|
||||
2007-02-14 Gerald Pfeifer <gerald@pfeifer.com>
|
||||
|
||||
* ltconfig (freebsd*): Default to elf.
|
||||
|
|
26
configure
vendored
26
configure
vendored
|
@ -1615,14 +1615,24 @@ progname=$0
|
|||
# if PWD already has a value, it is probably wrong.
|
||||
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
|
||||
|
||||
# Export original configure arguments for use by sub-configures. These
|
||||
# will be expanded by make, so quote '$'.
|
||||
tmp="$progname $@"
|
||||
sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out
|
||||
$tmp
|
||||
EOF_SED
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out`
|
||||
rm -f conftestsed.out
|
||||
# Export original configure arguments for use by sub-configures.
|
||||
# Quote arguments with shell meta charatcers.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=
|
||||
set -- "$progname" "$@"
|
||||
for ac_arg; do
|
||||
case "$ac_arg" in
|
||||
*" "*|*" "*|*\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?*)
|
||||
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
|
||||
# if the argument is of the form -foo=baz, quote the baz part only
|
||||
ac_arg=`echo "'$ac_arg'" | sed "s/^'\([-a-zA-Z0-9]*=\)/\\1'/"` ;;
|
||||
*) ;;
|
||||
esac
|
||||
# Add the quoted argument to the list.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg"
|
||||
done
|
||||
# Remove the initial space we just introduced and, as these will be
|
||||
# expanded by make, quote '$'.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
|
||||
|
||||
|
||||
moveifchange=${srcdir}/move-if-change
|
||||
|
|
30
configure.ac
30
configure.ac
|
@ -1,5 +1,5 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
# 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
@ -85,14 +85,24 @@ progname=$0
|
|||
# if PWD already has a value, it is probably wrong.
|
||||
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
|
||||
|
||||
# Export original configure arguments for use by sub-configures. These
|
||||
# will be expanded by make, so quote '$'.
|
||||
tmp="$progname $@"
|
||||
sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out
|
||||
$tmp
|
||||
EOF_SED
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out`
|
||||
rm -f conftestsed.out
|
||||
# Export original configure arguments for use by sub-configures.
|
||||
# Quote arguments with shell meta charatcers.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=
|
||||
set -- "$progname" "$@"
|
||||
for ac_arg; do
|
||||
case "$ac_arg" in
|
||||
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
|
||||
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
|
||||
# if the argument is of the form -foo=baz, quote the baz part only
|
||||
ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"` ;;
|
||||
*) ;;
|
||||
esac
|
||||
# Add the quoted argument to the list.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg"
|
||||
done
|
||||
# Remove the initial space we just introduced and, as these will be
|
||||
# expanded by make, quote '$'.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
|
||||
AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS)
|
||||
|
||||
moveifchange=${srcdir}/move-if-change
|
||||
|
|
Loading…
Add table
Reference in a new issue