* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused
Make macro. * Makefile.in: Regenerate. * configure.in: Clean up gxx_include_dir logic. * configure: Regenerate.
This commit is contained in:
Nathanael Nerode
parent
0e2b01821a
commit
ac2edfb863
|
|
@ -1,3 +1,11 @@
|
|||
2003-03-12 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused
|
||||
Make macro.
|
||||
* Makefile.in: Regenerate.
|
||||
* configure.in: Clean up gxx_include_dir logic.
|
||||
* configure: Regenerate.
|
||||
|
||||
2003-03-09 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
|
||||
|
||||
* configure.in (gxx_include_dir): Fix typo.
|
||||
|
|
|
|||
79
Makefile.in
79
Makefile.in
|
|
@ -20,6 +20,10 @@
|
|||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
|
||||
# Don't pass command-line variables to submakes.
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
||||
# -------------------------------
|
||||
# Standard Autoconf-set variables
|
||||
# -------------------------------
|
||||
|
|
@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644
|
|||
# -------------------------------------------------
|
||||
|
||||
links=@configlinks@
|
||||
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
|
||||
# The file containing GCC's version number.
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gcc_version = @gcc_version@
|
||||
|
|
@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \
|
|||
clean-gdb \
|
||||
clean-expect \
|
||||
clean-guile \
|
||||
clean-tk \
|
||||
clean-tix
|
||||
clean-tk
|
||||
|
||||
# The target built for a native build.
|
||||
# This list only includes modules actually being configured and built.
|
||||
|
|
@ -5402,73 +5404,6 @@ install-tk: installdirs
|
|||
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
|
||||
|
||||
|
||||
.PHONY: configure-tix maybe-configure-tix
|
||||
maybe-configure-tix:
|
||||
configure-tix:
|
||||
@test ! -f tix/Makefile || exit 0; \
|
||||
[ -d tix ] || mkdir tix; \
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
CC="$(CC)"; export CC; \
|
||||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||
CXX="$(CXX)"; export CXX; \
|
||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
|
||||
AR="$(AR)"; export AR; \
|
||||
AS="$(AS)"; export AS; \
|
||||
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
||||
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
||||
LD="$(LD)"; export LD; \
|
||||
NM="$(NM)"; export NM; \
|
||||
RANLIB="$(RANLIB)"; export RANLIB; \
|
||||
WINDRES="$(WINDRES)"; export WINDRES; \
|
||||
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
||||
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
||||
fi; \
|
||||
echo Configuring in tix; \
|
||||
cd tix || exit 1; \
|
||||
case $(srcdir) in \
|
||||
\.) \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir=".";; \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
srcdiroption="--srcdir=$(srcdir)/tix"; \
|
||||
libsrcdir="$$s/tix";; \
|
||||
*) \
|
||||
srcdiroption="--srcdir=../$(srcdir)/tix"; \
|
||||
libsrcdir="$$s/tix";; \
|
||||
esac; \
|
||||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
|| exit 1
|
||||
|
||||
.PHONY: all-tix maybe-all-tix
|
||||
maybe-all-tix:
|
||||
all-tix: configure-tix
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
|
||||
|
||||
|
||||
.PHONY: check-tix
|
||||
check-tix:
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
|
||||
|
||||
|
||||
|
||||
.PHONY: install-tix maybe-install-tix
|
||||
maybe-install-tix:
|
||||
install-tix: installdirs
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
|
||||
|
||||
|
||||
.PHONY: configure-libtermcap maybe-configure-libtermcap
|
||||
maybe-configure-libtermcap:
|
||||
configure-libtermcap:
|
||||
|
|
@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger)
|
|||
AUTOCONF = autoconf
|
||||
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
#
|
||||
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
||||
# Tell GNU make 3.79 not to run the top level in parallel. This
|
||||
# prevents contention for $builddir/$target/config.cache, as well
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ in
|
|||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
|
||||
# Don't pass command-line variables to submakes.
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
||||
# -------------------------------
|
||||
# Standard Autoconf-set variables
|
||||
# -------------------------------
|
||||
|
|
@ -87,7 +91,6 @@ INSTALL_DATA = $(INSTALL) -m 644
|
|||
# -------------------------------------------------
|
||||
|
||||
links=@configlinks@
|
||||
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
|
||||
# The file containing GCC's version number.
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gcc_version = @gcc_version@
|
||||
|
|
@ -1450,10 +1453,6 @@ config.status: configure $(gcc_version_trigger)
|
|||
AUTOCONF = autoconf
|
||||
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
#
|
||||
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
||||
# Tell GNU make 3.79 not to run the top level in parallel. This
|
||||
# prevents contention for $builddir/$target/config.cache, as well
|
||||
|
|
|
|||
|
|
@ -2201,12 +2201,6 @@ EOF
|
|||
esac
|
||||
fi
|
||||
|
||||
# record if we want runtime library stuff installed in libsubdir.
|
||||
# Blank means no.
|
||||
if test -z "${enable_version_specific_runtime_libs}"; then
|
||||
enable_version_specific_runtime_libs=no
|
||||
fi
|
||||
|
||||
# Make sure that the compiler is able to generate an executable. If it
|
||||
# can't, we are probably in trouble. We don't care whether we can run the
|
||||
# executable--we might be using a cross compiler--we only care whether it
|
||||
|
|
@ -2477,30 +2471,19 @@ target_configargs="--cache-file=../config.cache --host=${target_alias} --build=$
|
|||
# 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.
|
||||
gxx_include_dir=
|
||||
if test -n "${with_gxx_include_dir}"; then
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes )
|
||||
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
no )
|
||||
;;
|
||||
* )
|
||||
gxx_include_dir=${with_gxx_include_dir}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test x${gxx_include_dir} = x; then
|
||||
if test x${enable_version_specific_runtime_libs} = xyes; then
|
||||
gxx_include_dir='${libsubdir}/include/c++'
|
||||
else
|
||||
. ${srcdir}/config.if
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir}
|
||||
fi
|
||||
else
|
||||
gxx_include_dir=${gxx_include_dir}
|
||||
fi
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes)
|
||||
{ echo "configure: error: --with-gxx-include-dir=[dir] requires a directory" 1>&2; exit 1; }
|
||||
;;
|
||||
no | "")
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
. ${srcdir}/config.if
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
|
||||
FLAGS_FOR_TARGET=
|
||||
case " $target_configdirs " in
|
||||
|
|
@ -2658,7 +2641,6 @@ ospace_frag=${srcdir}/${ospace_frag}
|
|||
|
||||
|
||||
|
||||
|
||||
# Build module lists & subconfigure args.
|
||||
|
||||
|
||||
|
|
@ -2701,7 +2683,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:2705: checking for $ac_word" >&5
|
||||
echo "configure:2687: 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
|
||||
|
|
@ -2734,7 +2716,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:2738: checking for $ac_word" >&5
|
||||
echo "configure:2720: 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
|
||||
|
|
@ -2773,7 +2755,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:2777: checking for $ac_word" >&5
|
||||
echo "configure:2759: 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
|
||||
|
|
@ -2806,7 +2788,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:2810: checking for $ac_word" >&5
|
||||
echo "configure:2792: 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
|
||||
|
|
@ -2845,7 +2827,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:2849: checking for $ac_word" >&5
|
||||
echo "configure:2831: 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
|
||||
|
|
@ -2878,7 +2860,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:2882: checking for $ac_word" >&5
|
||||
echo "configure:2864: 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
|
||||
|
|
@ -2917,7 +2899,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:2921: checking for $ac_word" >&5
|
||||
echo "configure:2903: 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
|
||||
|
|
@ -2950,7 +2932,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:2954: checking for $ac_word" >&5
|
||||
echo "configure:2936: 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
|
||||
|
|
@ -2989,7 +2971,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:2993: checking for $ac_word" >&5
|
||||
echo "configure:2975: 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
|
||||
|
|
@ -3022,7 +3004,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:3026: checking for $ac_word" >&5
|
||||
echo "configure:3008: 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
|
||||
|
|
@ -3061,7 +3043,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:3065: checking for $ac_word" >&5
|
||||
echo "configure:3047: 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
|
||||
|
|
@ -3094,7 +3076,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:3098: checking for $ac_word" >&5
|
||||
echo "configure:3080: 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
|
||||
|
|
@ -3133,7 +3115,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:3137: checking for $ac_word" >&5
|
||||
echo "configure:3119: 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
|
||||
|
|
@ -3166,7 +3148,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:3170: checking for $ac_word" >&5
|
||||
echo "configure:3152: 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
|
||||
|
|
@ -3205,7 +3187,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:3209: checking for $ac_word" >&5
|
||||
echo "configure:3191: 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
|
||||
|
|
@ -3238,7 +3220,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:3242: checking for $ac_word" >&5
|
||||
echo "configure:3224: 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
|
||||
|
|
@ -3277,7 +3259,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:3281: checking for $ac_word" >&5
|
||||
echo "configure:3263: 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
|
||||
|
|
@ -3310,7 +3292,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:3314: checking for $ac_word" >&5
|
||||
echo "configure:3296: 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
|
||||
|
|
@ -3358,7 +3340,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:3362: checking for $ac_word" >&5
|
||||
echo "configure:3344: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3391,7 +3373,7 @@ if test -z "$ac_cv_prog_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:3395: checking for $ac_word" >&5
|
||||
echo "configure:3377: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3430,7 +3412,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:3434: checking for $ac_word" >&5
|
||||
echo "configure:3416: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3463,7 +3445,7 @@ if test -z "$ac_cv_prog_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:3467: checking for $ac_word" >&5
|
||||
echo "configure:3449: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3502,7 +3484,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:3506: checking for $ac_word" >&5
|
||||
echo "configure:3488: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3535,7 +3517,7 @@ if test -z "$ac_cv_prog_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:3539: checking for $ac_word" >&5
|
||||
echo "configure:3521: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3574,7 +3556,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:3578: checking for $ac_word" >&5
|
||||
echo "configure:3560: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3607,7 +3589,7 @@ if test -z "$ac_cv_prog_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:3611: checking for $ac_word" >&5
|
||||
echo "configure:3593: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3646,7 +3628,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:3650: checking for $ac_word" >&5
|
||||
echo "configure:3632: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3679,7 +3661,7 @@ if test -z "$ac_cv_prog_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:3683: checking for $ac_word" >&5
|
||||
echo "configure:3665: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3718,7 +3700,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:3722: checking for $ac_word" >&5
|
||||
echo "configure:3704: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3751,7 +3733,7 @@ if test -z "$ac_cv_prog_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:3755: checking for $ac_word" >&5
|
||||
echo "configure:3737: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3790,7 +3772,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:3794: checking for $ac_word" >&5
|
||||
echo "configure:3776: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3823,7 +3805,7 @@ if test -z "$ac_cv_prog_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:3827: checking for $ac_word" >&5
|
||||
echo "configure:3809: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3890,7 +3872,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:3894: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:3876: 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"
|
||||
|
|
@ -3977,34 +3959,15 @@ 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.
|
||||
#
|
||||
# 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
|
||||
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
|
||||
|
||||
|
||||
# Without the "./", some shells look in PATH for config.status.
|
||||
|
|
@ -4107,7 +4070,6 @@ s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
|
|||
s%@BUILD_PREFIX@%$BUILD_PREFIX%g
|
||||
s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
|
||||
s%@configlinks@%$configlinks%g
|
||||
s%@enable_version_specific_runtime_libs@%$enable_version_specific_runtime_libs%g
|
||||
s%@gcc_version_trigger@%$gcc_version_trigger%g
|
||||
s%@gcc_version@%$gcc_version%g
|
||||
s%@tooldir@%$tooldir%g
|
||||
|
|
|
|||
44
configure.in
44
configure.in
|
|
@ -1541,12 +1541,6 @@ EOF
|
|||
esac
|
||||
fi
|
||||
|
||||
# record if we want runtime library stuff installed in libsubdir.
|
||||
# Blank means no.
|
||||
if test -z "${enable_version_specific_runtime_libs}"; then
|
||||
enable_version_specific_runtime_libs=no
|
||||
fi
|
||||
|
||||
# Make sure that the compiler is able to generate an executable. If it
|
||||
# can't, we are probably in trouble. We don't care whether we can run the
|
||||
# executable--we might be using a cross compiler--we only care whether it
|
||||
|
|
@ -1816,30 +1810,19 @@ target_configargs="--cache-file=../config.cache --host=${target_alias} --build=$
|
|||
# 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.
|
||||
gxx_include_dir=
|
||||
if test -n "${with_gxx_include_dir}"; then
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes )
|
||||
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
no )
|
||||
;;
|
||||
* )
|
||||
gxx_include_dir=${with_gxx_include_dir}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test x${gxx_include_dir} = x; then
|
||||
if test x${enable_version_specific_runtime_libs} = xyes; then
|
||||
gxx_include_dir='${libsubdir}/include/c++'
|
||||
else
|
||||
. ${srcdir}/config.if
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir}
|
||||
fi
|
||||
else
|
||||
gxx_include_dir=${gxx_include_dir}
|
||||
fi
|
||||
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++' ;;
|
||||
*)
|
||||
. ${srcdir}/config.if
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
|
||||
FLAGS_FOR_TARGET=
|
||||
case " $target_configdirs " in
|
||||
|
|
@ -1989,7 +1972,6 @@ AC_SUBST(RPATH_ENVVAR)
|
|||
AC_SUBST(BUILD_PREFIX)
|
||||
AC_SUBST(BUILD_PREFIX_1)
|
||||
AC_SUBST(configlinks)
|
||||
AC_SUBST(enable_version_specific_runtime_libs)
|
||||
AC_SUBST(gcc_version_trigger)
|
||||
AC_SUBST(gcc_version)
|
||||
AC_SUBST(tooldir)
|
||||
|
|
|
|||
Loading…
Reference in New Issue