* configure.ac: Set TOPLEVEL_CONFIGURE_ARGUMENTS early, when
"$@" is still intact with both Autoconf 2.59 and 2.62. * configure: Regenerate.
This commit is contained in:
Ralf Wildenhues
parent
675492f021
commit
5b553f7e9f
3 changed files with 66 additions and 59 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure.ac: Set TOPLEVEL_CONFIGURE_ARGUMENTS early, when
|
||||
"$@" is still intact with both Autoconf 2.59 and 2.62.
|
||||
* configure: Regenerate.
|
||||
|
||||
2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* Makefile.tpl: Fix comment errors.
|
||||
|
|
|
|||
60
configure
vendored
60
configure
vendored
|
|
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
|||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="move-if-change"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1479,6 +1479,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
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.
|
||||
# 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
|
||||
if test "$silent" = yes; then
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
|
||||
fi
|
||||
# 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'`
|
||||
|
||||
|
||||
# Find the build, host, and target systems.
|
||||
ac_aux_dir=
|
||||
|
|
@ -1794,34 +1822,6 @@ esac
|
|||
|
||||
config_shell=${CONFIG_SHELL-/bin/sh}
|
||||
|
||||
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.
|
||||
# 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
|
||||
if test "$silent" = yes; then
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
|
||||
fi
|
||||
# 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
|
||||
|
||||
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
|
||||
|
|
@ -12896,6 +12896,7 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||
s,@ECHO_N@,$ECHO_N,;t t
|
||||
s,@ECHO_T@,$ECHO_T,;t t
|
||||
s,@LIBS@,$LIBS,;t t
|
||||
s,@TOPLEVEL_CONFIGURE_ARGUMENTS@,$TOPLEVEL_CONFIGURE_ARGUMENTS,;t t
|
||||
s,@build@,$build,;t t
|
||||
s,@build_cpu@,$build_cpu,;t t
|
||||
s,@build_vendor@,$build_vendor,;t t
|
||||
|
|
@ -12916,7 +12917,6 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
|||
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
||||
s,@LN@,$LN,;t t
|
||||
s,@LN_S@,$LN_S,;t t
|
||||
s,@TOPLEVEL_CONFIGURE_ARGUMENTS@,$TOPLEVEL_CONFIGURE_ARGUMENTS,;t t
|
||||
s,@build_libsubdir@,$build_libsubdir,;t t
|
||||
s,@build_subdir@,$build_subdir,;t t
|
||||
s,@host_subdir@,$host_subdir,;t t
|
||||
|
|
|
|||
59
configure.ac
59
configure.ac
|
|
@ -1,5 +1,6 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
# 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||
# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
|
||||
|
|
@ -25,6 +26,34 @@ m4_include(config/proginstall.m4)
|
|||
AC_INIT(move-if-change)
|
||||
AC_PREREQ(2.59)
|
||||
|
||||
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.
|
||||
# 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
|
||||
if test "$silent" = yes; then
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
|
||||
fi
|
||||
# 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)
|
||||
|
||||
# Find the build, host, and target systems.
|
||||
ACX_NONCANONICAL_BUILD
|
||||
ACX_NONCANONICAL_HOST
|
||||
|
|
@ -84,34 +113,6 @@ esac
|
|||
|
||||
config_shell=${CONFIG_SHELL-/bin/sh}
|
||||
|
||||
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.
|
||||
# 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
|
||||
if test "$silent" = yes; then
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
|
||||
fi
|
||||
# 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
|
||||
|
||||
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
|
||||
|
|
|
|||
Loading…
Reference in a new issue