Introduce config/gxx-include-dir.m4.
This commit is contained in:
parent
fdc1bab19d
commit
e51613764b
|
@ -1,3 +1,9 @@
|
|||
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* configure.in: Include config/gxx-include-dir.m4. Use
|
||||
TL_AC_GXX_INCLUDE_DIR. Remove some now-redundant AC_SUBSTs.
|
||||
* configure: Regenerate.
|
||||
|
||||
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* config.if: Delete.
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* gxx-include-dir.m4: New file.
|
||||
|
||||
2004-12-02 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* gcc-version.m4: New file.
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
dnl Usage: TL_AC_GXX_INCLUDE_DIR
|
||||
dnl
|
||||
dnl Set $gxx_include_dir to the location of the installed C++ include
|
||||
dnl directory. The value depends on $gcc_version and the configuration
|
||||
dnl options --with-gxx-include-dir and --enable-version-specific-runtime-libs.
|
||||
dnl
|
||||
dnl If you change the default here, you'll need to change the gcc and
|
||||
dnl libstdc++-v3 subdirectories too.
|
||||
AC_DEFUN([TL_AC_GXX_INCLUDE_DIR],
|
||||
[
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes)
|
||||
AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
|
||||
;;
|
||||
no | "")
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
AC_SUBST(gxx_include_dir)
|
||||
AC_SUBST(libstdcxx_incdir)
|
||||
])
|
|
@ -3376,9 +3376,7 @@ fi
|
|||
target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
|
||||
|
||||
# provide a proper gxx_include_dir.
|
||||
# Note, if you change the default, make sure to fix both here and in
|
||||
# the gcc and libstdc++-v3 subdirectories.
|
||||
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
|
||||
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes)
|
||||
{ echo "configure: error: --with-gxx-include-dir=[dir] requires a directory" 1>&2; exit 1; }
|
||||
|
@ -3388,11 +3386,14 @@ case "${with_gxx_include_dir}" in
|
|||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
FLAGS_FOR_TARGET=
|
||||
case " $target_configdirs " in
|
||||
*" newlib "*)
|
||||
|
@ -3568,8 +3569,6 @@ done
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
# Build module lists & subconfigure args.
|
||||
|
||||
|
||||
|
@ -3596,7 +3595,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3600: checking for $ac_word" >&5
|
||||
echo "configure:3599: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3629,7 +3628,7 @@ if test -z "$ac_cv_prog_AR" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3633: checking for $ac_word" >&5
|
||||
echo "configure:3632: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3668,7 +3667,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3672: checking for $ac_word" >&5
|
||||
echo "configure:3671: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3701,7 +3700,7 @@ if test -z "$ac_cv_prog_AS" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3705: checking for $ac_word" >&5
|
||||
echo "configure:3704: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3740,7 +3739,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3744: checking for $ac_word" >&5
|
||||
echo "configure:3743: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3773,7 +3772,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3777: checking for $ac_word" >&5
|
||||
echo "configure:3776: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3812,7 +3811,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3816: checking for $ac_word" >&5
|
||||
echo "configure:3815: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3845,7 +3844,7 @@ if test -z "$ac_cv_prog_LD" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3849: checking for $ac_word" >&5
|
||||
echo "configure:3848: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3884,7 +3883,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3888: checking for $ac_word" >&5
|
||||
echo "configure:3887: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3917,7 +3916,7 @@ if test -z "$ac_cv_prog_NM" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3921: checking for $ac_word" >&5
|
||||
echo "configure:3920: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3956,7 +3955,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3960: checking for $ac_word" >&5
|
||||
echo "configure:3959: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3989,7 +3988,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3993: checking for $ac_word" >&5
|
||||
echo "configure:3992: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4028,7 +4027,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4032: checking for $ac_word" >&5
|
||||
echo "configure:4031: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4061,7 +4060,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4065: checking for $ac_word" >&5
|
||||
echo "configure:4064: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4100,7 +4099,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4104: checking for $ac_word" >&5
|
||||
echo "configure:4103: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4133,7 +4132,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# Extract the first word of "objcopy", so it can be a program name with args.
|
||||
set dummy objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4137: checking for $ac_word" >&5
|
||||
echo "configure:4136: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4172,7 +4171,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4176: checking for $ac_word" >&5
|
||||
echo "configure:4175: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4205,7 +4204,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4209: checking for $ac_word" >&5
|
||||
echo "configure:4208: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4251,7 +4250,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4255: checking for $ac_word" >&5
|
||||
echo "configure:4254: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4284,7 +4283,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4288: checking for $ac_word" >&5
|
||||
echo "configure:4287: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4323,7 +4322,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4327: checking for $ac_word" >&5
|
||||
echo "configure:4326: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4356,7 +4355,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4360: checking for $ac_word" >&5
|
||||
echo "configure:4359: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4395,7 +4394,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4399: checking for $ac_word" >&5
|
||||
echo "configure:4398: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4428,7 +4427,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4432: checking for $ac_word" >&5
|
||||
echo "configure:4431: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4467,7 +4466,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4471: checking for $ac_word" >&5
|
||||
echo "configure:4470: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4500,7 +4499,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4504: checking for $ac_word" >&5
|
||||
echo "configure:4503: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4539,7 +4538,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4543: checking for $ac_word" >&5
|
||||
echo "configure:4542: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4572,7 +4571,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4576: checking for $ac_word" >&5
|
||||
echo "configure:4575: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4611,7 +4610,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4615: checking for $ac_word" >&5
|
||||
echo "configure:4614: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4644,7 +4643,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4648: checking for $ac_word" >&5
|
||||
echo "configure:4647: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4683,7 +4682,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4687: checking for $ac_word" >&5
|
||||
echo "configure:4686: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4716,7 +4715,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4720: checking for $ac_word" >&5
|
||||
echo "configure:4719: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4801,7 +4800,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
|||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:4805: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4804: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
@ -4848,7 +4847,7 @@ esac
|
|||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:4852: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4851: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -5104,6 +5103,8 @@ s%@bootstrap_lean@%$bootstrap_lean%g
|
|||
s%@default_target@%$default_target%g
|
||||
/@serialization_dependencies@/r $serialization_dependencies
|
||||
s%@serialization_dependencies@%%g
|
||||
s%@gxx_include_dir@%$gxx_include_dir%g
|
||||
s%@libstdcxx_incdir@%$libstdcxx_incdir%g
|
||||
/@host_makefile_frag@/r $host_makefile_frag
|
||||
s%@host_makefile_frag@%%g
|
||||
/@target_makefile_frag@/r $target_makefile_frag
|
||||
|
@ -5119,8 +5120,6 @@ s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
|
|||
s%@tooldir@%$tooldir%g
|
||||
s%@build_tooldir@%$build_tooldir%g
|
||||
s%@GDB_TK@%$GDB_TK%g
|
||||
s%@gxx_include_dir@%$gxx_include_dir%g
|
||||
s%@libstdcxx_incdir@%$libstdcxx_incdir%g
|
||||
s%@build_configargs@%$build_configargs%g
|
||||
s%@build_configdirs@%$build_configdirs%g
|
||||
s%@host_configargs@%$host_configargs%g
|
||||
|
|
20
configure.in
20
configure.in
|
@ -20,6 +20,7 @@
|
|||
|
||||
sinclude(config/acx.m4)
|
||||
sinclude(config/gcc-version.m4)
|
||||
sinclude(config/gxx-include-dir.m4)
|
||||
|
||||
AC_INIT(move-if-change)
|
||||
AC_PREREQ(2.13)
|
||||
|
@ -1963,22 +1964,7 @@ fi
|
|||
target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
|
||||
|
||||
# provide a proper gxx_include_dir.
|
||||
# Note, if you change the default, make sure to fix both here and in
|
||||
# the gcc and libstdc++-v3 subdirectories.
|
||||
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes)
|
||||
AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
|
||||
;;
|
||||
no | "")
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
TL_AC_GXX_INCLUDE_DIR
|
||||
|
||||
FLAGS_FOR_TARGET=
|
||||
case " $target_configdirs " in
|
||||
|
@ -2154,8 +2140,6 @@ AC_SUBST(BUILD_PREFIX_1)
|
|||
AC_SUBST(tooldir)
|
||||
AC_SUBST(build_tooldir)
|
||||
AC_SUBST(GDB_TK)
|
||||
AC_SUBST(gxx_include_dir)
|
||||
AC_SUBST(libstdcxx_incdir)
|
||||
|
||||
# Build module lists & subconfigure args.
|
||||
AC_SUBST(build_configargs)
|
||||
|
|
Loading…
Reference in New Issue