Skip to content

R
riscv-gcc-1
Commit 73458fb7 by Nathanael Nerode
Options

Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. 

(toplev)
	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up.  Delete unused
	Make macro.
	* Makefile.in: Regenerate.
	* configure.in: Clean up gxx_include_dir logic.
	* configure: Regenerate.

(gcc)
	* Makefile.in: Eliminate all.indirect.  Update and clean up comments.
	Rearrange.  Reorganize.
	* configure.in: Rearrange.
	* configure: Regenerate.

From-SVN: r64260
parent 00530a21
Showing with 273 additions and 341 deletions
ChangeLog
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-12 Ansgar Esztermann <ansgar@thphy.uni-duesseldorf.de> 2003-03-12 Ansgar Esztermann <ansgar@thphy.uni-duesseldorf.de>
* MAINTAINERS (Write After Approval): Add myself. * MAINTAINERS (Write After Approval): Add myself.
......
Makefile.in
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 # Standard Autoconf-set variables
# ------------------------------- # -------------------------------
...@@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644 ...@@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644
# ------------------------------------------------- # -------------------------------------------------
links=@configlinks@ links=@configlinks@
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
# The file containing GCC's version number. # The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@ gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
...@@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \ ...@@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \
clean-gdb \ clean-gdb \
clean-expect \ clean-expect \
clean-guile \ clean-guile \
clean-tk \ clean-tk
clean-tix
# The target built for a native build. # The target built for a native build.
# This list only includes modules actually being configured and built. # This list only includes modules actually being configured and built.
...@@ -5402,73 +5404,6 @@ install-tk: installdirs ...@@ -5402,73 +5404,6 @@ install-tk: installdirs
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) (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 .PHONY: configure-libtermcap maybe-configure-libtermcap
maybe-configure-libtermcap: maybe-configure-libtermcap:
configure-libtermcap: configure-libtermcap:
...@@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger) ...@@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger)
AUTOCONF = autoconf AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
# Tell GNU make 3.79 not to run the top level in parallel. This # Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well # prevents contention for $builddir/$target/config.cache, as well
......
Makefile.tpl
...@@ -23,6 +23,10 @@ in ...@@ -23,6 +23,10 @@ in
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 # Standard Autoconf-set variables
# ------------------------------- # -------------------------------
...@@ -87,7 +91,6 @@ INSTALL_DATA = $(INSTALL) -m 644 ...@@ -87,7 +91,6 @@ INSTALL_DATA = $(INSTALL) -m 644
# ------------------------------------------------- # -------------------------------------------------
links=@configlinks@ links=@configlinks@
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
# The file containing GCC's version number. # The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@ gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
...@@ -1450,10 +1453,6 @@ config.status: configure $(gcc_version_trigger) ...@@ -1450,10 +1453,6 @@ config.status: configure $(gcc_version_trigger)
AUTOCONF = autoconf AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
# Tell GNU make 3.79 not to run the top level in parallel. This # Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well # prevents contention for $builddir/$target/config.cache, as well
......
configure
...@@ -2201,12 +2201,6 @@ EOF ...@@ -2201,12 +2201,6 @@ EOF
esac esac
fi 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 # 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 # 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 # 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=$ ...@@ -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 # Note, if you change the default, make sure to fix both here and in
# the gcc and libstdc++-v3 subdirectories. # the gcc and libstdc++-v3 subdirectories.
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
gxx_include_dir= case "${with_gxx_include_dir}" in
if test -n "${with_gxx_include_dir}"; then yes)
case "${with_gxx_include_dir}" in { echo "configure: error: --with-gxx-include-dir=[dir] requires a directory" 1>&2; exit 1; }
yes ) ;;
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2 no | "")
exit 1 case "${enable_version_specific_runtime_libs}" in
;; yes) gxx_include_dir='${libsubdir}/include/c++' ;;
no ) *)
;; . ${srcdir}/config.if
* ) gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
gxx_include_dir=${with_gxx_include_dir} esac ;;
;; *) gxx_include_dir=${with_gxx_include_dir} ;;
esac 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
FLAGS_FOR_TARGET= FLAGS_FOR_TARGET=
case " $target_configdirs " in case " $target_configdirs " in
...@@ -2658,7 +2641,6 @@ ospace_frag=${srcdir}/${ospace_frag} ...@@ -2658,7 +2641,6 @@ ospace_frag=${srcdir}/${ospace_frag}
# Build module lists & subconfigure args. # Build module lists & subconfigure args.
...@@ -2701,7 +2683,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- ...@@ -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. # 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 set dummy ${ncn_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2734,7 +2716,7 @@ if test -z "$ac_cv_prog_AR" ; then ...@@ -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. # Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2 set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2773,7 +2755,7 @@ fi ...@@ -2773,7 +2755,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2806,7 +2788,7 @@ if test -z "$ac_cv_prog_AS" ; then ...@@ -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. # Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2 set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2845,7 +2827,7 @@ fi ...@@ -2845,7 +2827,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2878,7 +2860,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then ...@@ -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. # Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2 set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2917,7 +2899,7 @@ fi ...@@ -2917,7 +2899,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2950,7 +2932,7 @@ if test -z "$ac_cv_prog_LD" ; then ...@@ -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. # Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2 set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2989,7 +2971,7 @@ fi ...@@ -2989,7 +2971,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3022,7 +3004,7 @@ if test -z "$ac_cv_prog_NM" ; then ...@@ -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. # Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2 set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3061,7 +3043,7 @@ fi ...@@ -3061,7 +3043,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3094,7 +3076,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then ...@@ -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. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3133,7 +3115,7 @@ fi ...@@ -3133,7 +3115,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3166,7 +3148,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then ...@@ -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. # Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2 set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3205,7 +3187,7 @@ fi ...@@ -3205,7 +3187,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3238,7 +3220,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then ...@@ -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. # Extract the first word of "objcopy", so it can be a program name with args.
set dummy objcopy; ac_word=$2 set dummy objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3277,7 +3259,7 @@ fi ...@@ -3277,7 +3259,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3310,7 +3292,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then ...@@ -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. # Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2 set dummy objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3358,7 +3340,7 @@ fi ...@@ -3358,7 +3340,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3391,7 +3373,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2 set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3430,7 +3412,7 @@ fi ...@@ -3430,7 +3412,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3463,7 +3445,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2 set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3502,7 +3484,7 @@ fi ...@@ -3502,7 +3484,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3535,7 +3517,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2 set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3574,7 +3556,7 @@ fi ...@@ -3574,7 +3556,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3607,7 +3589,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2 set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3646,7 +3628,7 @@ fi ...@@ -3646,7 +3628,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3679,7 +3661,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2 set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3718,7 +3700,7 @@ fi ...@@ -3718,7 +3700,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3751,7 +3733,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3790,7 +3772,7 @@ fi ...@@ -3790,7 +3772,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3823,7 +3805,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then ...@@ -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. # Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2 set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3890,7 +3872,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} ...@@ -3890,7 +3872,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_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 $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. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
...@@ -3977,34 +3959,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 ...@@ -3977,34 +3959,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS. # Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules. # Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion. # Protect against Makefile macro expansion.
# cat > conftest.defs <<\EOF
# If the first sed substitution is executed (which looks for macros that s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
# take arguments), then we branch to the quote section. Otherwise, s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
# look for a macro that doesn't take arguments. s%\[%\\&%g
cat >confdef2opt.sed <<\_ACEOF s%\]%\\&%g
t clear s%\$%$$%g
: clear EOF
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
t quote rm -f conftest.defs
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. # Without the "./", some shells look in PATH for config.status.
...@@ -4107,7 +4070,6 @@ s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g ...@@ -4107,7 +4070,6 @@ s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
s%@BUILD_PREFIX@%$BUILD_PREFIX%g s%@BUILD_PREFIX@%$BUILD_PREFIX%g
s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
s%@configlinks@%$configlinks%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_trigger@%$gcc_version_trigger%g
s%@gcc_version@%$gcc_version%g s%@gcc_version@%$gcc_version%g
s%@tooldir@%$tooldir%g s%@tooldir@%$tooldir%g
......
configure.in
...@@ -1541,12 +1541,6 @@ EOF ...@@ -1541,12 +1541,6 @@ EOF
esac esac
fi 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 # 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 # 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 # 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=$ ...@@ -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 # Note, if you change the default, make sure to fix both here and in
# the gcc and libstdc++-v3 subdirectories. # the gcc and libstdc++-v3 subdirectories.
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
gxx_include_dir= case "${with_gxx_include_dir}" in
if test -n "${with_gxx_include_dir}"; then yes)
case "${with_gxx_include_dir}" in AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
yes ) ;;
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2 no | "")
exit 1 case "${enable_version_specific_runtime_libs}" in
;; yes) gxx_include_dir='${libsubdir}/include/c++' ;;
no ) *)
;; . ${srcdir}/config.if
* ) gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
gxx_include_dir=${with_gxx_include_dir} esac ;;
;; *) gxx_include_dir=${with_gxx_include_dir} ;;
esac 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
FLAGS_FOR_TARGET= FLAGS_FOR_TARGET=
case " $target_configdirs " in case " $target_configdirs " in
...@@ -1989,7 +1972,6 @@ AC_SUBST(RPATH_ENVVAR) ...@@ -1989,7 +1972,6 @@ AC_SUBST(RPATH_ENVVAR)
AC_SUBST(BUILD_PREFIX) AC_SUBST(BUILD_PREFIX)
AC_SUBST(BUILD_PREFIX_1) AC_SUBST(BUILD_PREFIX_1)
AC_SUBST(configlinks) AC_SUBST(configlinks)
AC_SUBST(enable_version_specific_runtime_libs)
AC_SUBST(gcc_version_trigger) AC_SUBST(gcc_version_trigger)
AC_SUBST(gcc_version) AC_SUBST(gcc_version)
AC_SUBST(tooldir) AC_SUBST(tooldir)
......
gcc/ChangeLog
2003-03-12 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in: Eliminate all.indirect. Update and clean up comments.
Rearrange. Reorganize.
* configure.in: Rearrange.
* configure: Regenerate.
2003-03-12 Andreas Jaeger <aj@suse.de> 2003-03-12 Andreas Jaeger <aj@suse.de>
* c-cppbuiltin.c (cb_register_builtins): Define LP64 builtins for * c-cppbuiltin.c (cb_register_builtins): Define LP64 builtins for
......
gcc/Makefile.in
# Makefile for GNU C compiler. # Makefile for GNU Compiler Collection
# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 # Run 'configure' to generate Makefile from Makefile.in
# 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
# 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
#This file is part of GCC. #This file is part of GCC.
...@@ -25,17 +27,53 @@ ...@@ -25,17 +27,53 @@
# stage1, stage2, stage3, stage4. # stage1, stage2, stage3, stage4.
# This is the default target. # This is the default target.
all: # Set by autoconf to "all.internal" for a native build, or
# "all.cross" to build a cross compiler.
all: @ALL@
# Depend on this to specify a phony target portably.
force:
# This tells GNU make version 3 not to export the variables
# defined in this file into the environment (and thus recursive makes).
.NOEXPORT:
# And this tells it not to automatically pass command-line variables
# to recursive makes.
MAKEOVERRIDES =
# Suppress smart makes who think they know how to automake Yacc files # Suppress smart makes who think they know how to automake Yacc files
.y.c: .y.c:
# The only suffixes we want for implicit rules are .c and .o, so clear
# the list and add them. This speeds up GNU Make, and allows -r to work.
# For i18n support, we also need .gmo, .po, .pox.
# This must come before the language makefile fragments to allow them to
# add suffixes and rules of their own.
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo
# -------------------------------
# Standard autoconf-set variables
# -------------------------------
# Directory where sources are, from where we are. # Directory where sources are, from where we are.
srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
# Pointer to the GCC Project website build_canonical = @build_canonical@
website=http://gcc.gnu.org host_canonical = @host_canonical@
target=@target@
target_alias=@target_alias@
# Sed command to transform gcc to installed name.
program_transform_name = @program_transform_name@
program_transform_cross_name = s,^,$(target_alias)-,
# -----------------------------
# Directories used during build
# -----------------------------
# Directory where sources are, from where we are.
srcdir = @srcdir@
# These directories contain files that are provided as part of a FSF tarball, # These directories contain files that are provided as part of a FSF tarball,
# but not provided in CVS. Some GCC integrators like to use the CVS sources # but not provided in CVS. Some GCC integrators like to use the CVS sources
...@@ -44,20 +82,27 @@ website=http://gcc.gnu.org ...@@ -44,20 +82,27 @@ website=http://gcc.gnu.org
parsedir = $(srcdir) parsedir = $(srcdir)
docobjdir = $(srcdir)/doc docobjdir = $(srcdir)/doc
# Top build directory, relative to here.
top_builddir = .
# objdir is set by configure.
# It's normally the absolute path to the current directory.
objdir = @objdir@
# --------
# UNSORTED
# --------
# Variables that exist for you to override. # Variables that exist for you to override.
# See below for how to change them for certain systems. # See below for how to change them for certain systems.
# List of language subdirectories. # List of language subdirectories.
# This is overridden by configure.
SUBDIRS =@subdirs@ SUBDIRS =@subdirs@
# Selection of languages to be made. # Selection of languages to be made.
# This is overridden by configure.
CONFIG_LANGUAGES = @all_languages@ CONFIG_LANGUAGES = @all_languages@
LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES) LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES)
# Selection of languages to be made during stage1 build. # Selection of languages to be made during stage1 build.
# This is overridden by configure.
BOOT_LANGUAGES = c @all_boot_languages@ BOOT_LANGUAGES = c @all_boot_languages@
# Various ways of specifying flags for compilations: # Various ways of specifying flags for compilations:
...@@ -144,6 +189,11 @@ AR = ar ...@@ -144,6 +189,11 @@ AR = ar
AR_FLAGS = rc AR_FLAGS = rc
DLLTOOL = dlltool DLLTOOL = dlltool
RANLIB = @RANLIB@ RANLIB = @RANLIB@
# -------------------------------------------
# Programs which operate on the build machine
# -------------------------------------------
SHELL = @SHELL@ SHELL = @SHELL@
# pwd command to use. Allow user to override default by setting PWDCMD in # pwd command to use. Allow user to override default by setting PWDCMD in
# the environment to account for automounters. The make variable must not # the environment to account for automounters. The make variable must not
...@@ -165,18 +215,22 @@ MAKEINFOFLAGS = ...@@ -165,18 +215,22 @@ MAKEINFOFLAGS =
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-$(version)" POD2MAN = pod2man --center="GNU" --release="gcc-$(version)"
# For GNUmake: let us decide what gets passed to recursive makes.
MAKEOVERRIDES =
@SET_MAKE@
# Some compilers can't handle cc -c blah.c -o foo/blah.o.
# In stage2 and beyond, we force this to "-o $@" since we know we're using gcc.
OUTPUT_OPTION = @OUTPUT_OPTION@
# Some versions of `touch' (such as the version on Solaris 2.8) # Some versions of `touch' (such as the version on Solaris 2.8)
# do not correctly set the timestamp due to buggy versions of `utime' # do not correctly set the timestamp due to buggy versions of `utime'
# in the kernel. So, we use `echo' instead. # in the kernel. So, we use `echo' instead.
STAMP = echo timestamp > STAMP = echo timestamp >
# Make sure the $(MAKE) variable is defined.
@SET_MAKE@
# --------
# UNSORTED
# --------
# Some compilers can't handle cc -c blah.c -o foo/blah.o.
# In stage2 and beyond, we force this to "-o $@" since we know we're using gcc.
OUTPUT_OPTION = @OUTPUT_OPTION@
# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
# -I../zlib, unless we were configured with --with-system-zlib, in which # -I../zlib, unless we were configured with --with-system-zlib, in which
# case both are empty. # case both are empty.
...@@ -211,21 +265,9 @@ GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) ./xgcc -B./ -B$(build_tooldir)/bin/ -isyste ...@@ -211,21 +265,9 @@ GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) ./xgcc -B./ -B$(build_tooldir)/bin/ -isyste
# It also specifies -isystem ./include to find, e.g., stddef.h. # It also specifies -isystem ./include to find, e.g., stddef.h.
GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -isystem ./include $(TCFLAGS) GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -isystem ./include $(TCFLAGS)
# Sed command to transform gcc to installed name. Overwritten by configure. # ---------------------------------------------------
program_transform_name = @program_transform_name@ # Programs which produce files for the target machine
program_transform_cross_name = s,^,$(target_alias)-, # ---------------------------------------------------
build_canonical = @build_canonical@
host_canonical = @host_canonical@
# Tools to use when building a cross-compiler.
# These are used because `configure' appends `cross-make'
# to the makefile when making a cross-compiler.
# Use the tools from the build tree, if they are available.
# objdir is set by configure.
objdir = @objdir@
AR_FOR_TARGET = ` \ AR_FOR_TARGET = ` \
if [ -f $(objdir)/../binutils/ar ] ; then \ if [ -f $(objdir)/../binutils/ar ] ; then \
...@@ -263,6 +305,10 @@ NM_FOR_TARGET = ` \ ...@@ -263,6 +305,10 @@ NM_FOR_TARGET = ` \
fi; \ fi; \
fi` fi`
# --------
# UNSORTED
# --------
# Where to find some libiberty headers. # Where to find some libiberty headers.
HASHTAB_H = $(srcdir)/../include/hashtab.h HASHTAB_H = $(srcdir)/../include/hashtab.h
OBSTACK_H = $(srcdir)/../include/obstack.h OBSTACK_H = $(srcdir)/../include/obstack.h
...@@ -289,8 +335,6 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] ...@@ -289,8 +335,6 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
target=@target@
target_alias=@target_alias@
xmake_file=@dep_host_xmake_file@ xmake_file=@dep_host_xmake_file@
tmake_file=@dep_tmake_file@ tmake_file=@dep_tmake_file@
out_file=$(srcdir)/config/@out_file@ out_file=$(srcdir)/config/@out_file@
...@@ -323,6 +367,10 @@ gcc_version_trigger=@gcc_version_trigger@ ...@@ -323,6 +367,10 @@ gcc_version_trigger=@gcc_version_trigger@
version=$(gcc_version) version=$(gcc_version)
mainversion=`grep version_string $(srcdir)/version.c | sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/'` mainversion=`grep version_string $(srcdir)/version.c | sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/'`
# ------------------------
# Installation directories
# ------------------------
# Common prefix for installation directories. # Common prefix for installation directories.
# NOTE: This directory must exist when you start installation. # NOTE: This directory must exist when you start installation.
prefix = @prefix@ prefix = @prefix@
...@@ -337,6 +385,11 @@ exec_prefix = @exec_prefix@ ...@@ -337,6 +385,11 @@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
# Directory in which to put the directories used by the compiler. # Directory in which to put the directories used by the compiler.
libdir = @libdir@ libdir = @libdir@
# --------
# UNSORTED
# --------
# Directory in which the compiler finds executables, libraries, etc. # Directory in which the compiler finds executables, libraries, etc.
libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version) libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
# Used to produce a relative $(gcc_tooldir) in gcc.o # Used to produce a relative $(gcc_tooldir) in gcc.o
...@@ -375,9 +428,6 @@ man7dir = $(mandir)/man7 ...@@ -375,9 +428,6 @@ man7dir = $(mandir)/man7
# Dir for temp files. # Dir for temp files.
tmpdir = /tmp tmpdir = /tmp
# Top build directory, relative to here.
top_builddir = .
# Whether we were configured with NLS. # Whether we were configured with NLS.
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
...@@ -448,7 +498,6 @@ EXTRA_OBJS = @extra_objs@ ...@@ -448,7 +498,6 @@ EXTRA_OBJS = @extra_objs@
EXTRA_GCC_OBJS =@host_extra_gcc_objs@ EXTRA_GCC_OBJS =@host_extra_gcc_objs@
# List of additional header files to install. # List of additional header files to install.
# Often this is edited directly by `configure'.
EXTRA_HEADERS =@extra_headers_list@ EXTRA_HEADERS =@extra_headers_list@
# It is convenient for configure to add the assignment at the beginning, # It is convenient for configure to add the assignment at the beginning,
...@@ -484,7 +533,6 @@ GENERATED_MANPAGES = @GENERATED_MANPAGES@ ...@@ -484,7 +533,6 @@ GENERATED_MANPAGES = @GENERATED_MANPAGES@
OTHER_FIXINCLUDES_DIRS= OTHER_FIXINCLUDES_DIRS=
# A list of all the language-specific executables. # A list of all the language-specific executables.
# This is overridden by configure.
COMPILERS = cc1$(exeext) @all_compilers@ COMPILERS = cc1$(exeext) @all_compilers@
# List of things which should already be built whenever we try to use xgcc # List of things which should already be built whenever we try to use xgcc
...@@ -530,10 +578,6 @@ CPP_CROSS_NAME = `echo cpp|sed '$(program_transform_cross_name)'` ...@@ -530,10 +578,6 @@ CPP_CROSS_NAME = `echo cpp|sed '$(program_transform_cross_name)'`
PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'` PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'`
UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'` UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'`
# Set by autoconf to "all.internal" for a native build, or
# "all.cross" to build a cross compiler.
ALL = @ALL@
# Setup the testing framework, if you have one # Setup the testing framework, if you have one
EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \ EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
echo $${rootme}/../expect/expect ; \ echo $${rootme}/../expect/expect ; \
...@@ -570,15 +614,6 @@ SPECS = specs ...@@ -570,15 +614,6 @@ SPECS = specs
# End of variables for you to override. # End of variables for you to override.
# Definition of `all' is here so that new rules inserted by sed
# do not specify the default target.
# The real definition is under `all.internal' (for native compilers)
# or `all.cross' (for cross compilers).
all: all.indirect
# This tells GNU Make version 3 not to put all variables in the environment.
.NOEXPORT:
# GTM_H lists the config files that the generator files depend on, # GTM_H lists the config files that the generator files depend on,
# while TM_H lists the ones ordinary gcc files depend on, which # while TM_H lists the ones ordinary gcc files depend on, which
# includes several files generated by those generators. # includes several files generated by those generators.
...@@ -627,8 +662,6 @@ CPPLIB_H = cpplib.h line-map.h ...@@ -627,8 +662,6 @@ CPPLIB_H = cpplib.h line-map.h
# #
# Now figure out from those variables how to compile and link. # Now figure out from those variables how to compile and link.
all.indirect: $(ALL)
# IN_GCC distinguishes between code compiled into GCC itself and other # IN_GCC distinguishes between code compiled into GCC itself and other
# programs built during a bootstrap. # programs built during a bootstrap.
# autoconf inserts -DCROSS_COMPILE if we are building a cross compiler. # autoconf inserts -DCROSS_COMPILE if we are building a cross compiler.
...@@ -688,14 +721,10 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ ...@@ -688,14 +721,10 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
.c.o: .c.o:
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
# This tells GNU make version 3 not to export all the variables
# defined in this file into the environment.
.NOEXPORT:
# #
# Support for additional languages (other than c and objc). # Support for additional languages (other than C).
# ??? objc can be supported this way too (leave for later). # C can be supported this way too (leave for later).
# These next lines are overridden by configure.
LANG_MAKEFILES = @all_lang_makefiles@ LANG_MAKEFILES = @all_lang_makefiles@
LANG_STAGESTUFF = @all_stagestuff@ LANG_STAGESTUFF = @all_stagestuff@
...@@ -840,14 +869,6 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \ ...@@ -840,14 +869,6 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
# unwinder info. # unwinder info.
LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
# The only suffixes we want for implicit rules are .c and .o, so clear
# the list and add them. This speeds up GNU Make, and allows -r to work.
# For i18n support, we also need .gmo, .po, .pox.
# This must come before the language makefile fragments to allow them to
# add suffixes and rules of their own.
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo
# #
# Language makefile fragments. # Language makefile fragments.
...@@ -874,6 +895,10 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 ...@@ -874,6 +895,10 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
# End of language makefile fragments. # End of language makefile fragments.
# #
# -----------------------------
# Rebuilding this configuration
# -----------------------------
Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \ Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
$(xmake_file) $(tmake_file) $(LANG_MAKEFILES) $(xmake_file) $(tmake_file) $(LANG_MAKEFILES)
$(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \ $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \
...@@ -962,6 +987,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc version.c ...@@ -962,6 +987,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc version.c
LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status --recheck; \ LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status --recheck; \
fi fi
# --------
# UNSORTED
# --------
all.internal: start.encap rest.encap doc all.internal: start.encap rest.encap doc
# This is what to compile if making a cross-compiler. # This is what to compile if making a cross-compiler.
all.cross: native gcc-cross cpp$(exeext) specs \ all.cross: native gcc-cross cpp$(exeext) specs \
...@@ -3764,8 +3793,6 @@ risky-stage4: stage4 ...@@ -3764,8 +3793,6 @@ risky-stage4: stage4
.PHONY: stage1 stage2 stage3 stage4 clean maintainer-clean TAGS bootstrap .PHONY: stage1 stage2 stage3 stage4 clean maintainer-clean TAGS bootstrap
.PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4 .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4
force:
# Rules for generating translated message descriptions. # Rules for generating translated message descriptions.
# Disabled by autoconf if the tools are not available. # Disabled by autoconf if the tools are not available.
......
gcc/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
gcc/configure.in
...@@ -32,6 +32,18 @@ AC_CONFIG_HEADER(auto-host.h:config.in) ...@@ -32,6 +32,18 @@ AC_CONFIG_HEADER(auto-host.h:config.in)
# Determine the host, build, and target systems # Determine the host, build, and target systems
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# Define variables host_canonical and build_canonical
build_canonical=${build}
host_canonical=${host}
AC_SUBST(build_canonical)
AC_SUBST(host_canonical)
target_subdir=
if test "${host}" != "${target}" ; then
target_subdir=${target_alias}/
fi
AC_SUBST(target_subdir)
# Set program_transform_name # Set program_transform_name
AC_ARG_PROGRAM AC_ARG_PROGRAM
...@@ -227,6 +239,10 @@ fi ...@@ -227,6 +239,10 @@ fi
AC_SUBST(NO_MINUS_C_MINUS_O) AC_SUBST(NO_MINUS_C_MINUS_O)
AC_SUBST(OUTPUT_OPTION) AC_SUBST(OUTPUT_OPTION)
# -------------------------
# Check C compiler features
# -------------------------
AC_CACHE_CHECK(whether ${CC-cc} accepts -Wno-long-long, AC_CACHE_CHECK(whether ${CC-cc} accepts -Wno-long-long,
ac_cv_prog_cc_no_long_long, ac_cv_prog_cc_no_long_long,
[save_CFLAGS="$CFLAGS" [save_CFLAGS="$CFLAGS"
...@@ -439,9 +455,9 @@ esac], ...@@ -439,9 +455,9 @@ esac],
[coverage_flags=""]) [coverage_flags=""])
AC_SUBST(coverage_flags) AC_SUBST(coverage_flags)
# -------- # -------------------------------
# UNSORTED # Miscenalleous configure options
# -------- # -------------------------------
# With stabs # With stabs
AC_ARG_WITH(stabs, AC_ARG_WITH(stabs,
...@@ -581,43 +597,12 @@ AC_SUBST(TARGET_SYSTEM_ROOT) ...@@ -581,43 +597,12 @@ AC_SUBST(TARGET_SYSTEM_ROOT)
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
AC_SUBST(CROSS_SYSTEM_HEADER_DIR) AC_SUBST(CROSS_SYSTEM_HEADER_DIR)
# Stage specific cflags for build. # -------------------------
stage1_cflags= # Checks for other programs
case $build in # -------------------------
vax-*-*)
if test x$GCC = xyes
then
stage1_cflags="-Wa,-J"
else
stage1_cflags="-J"
fi
;;
powerpc-*-darwin*)
# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
# sources; use -no-cpp-precomp to get to GNU cpp.
# Apple's GCC has bugs in designated initializer handling, so disable
# that too.
stage1_cflags="-no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
;;
esac
AC_SUBST(stage1_cflags)
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_MSG_CHECKING(for GNU C library)
AC_CACHE_VAL(gcc_cv_glibc,
[AC_TRY_COMPILE(
[#include <features.h>],[
#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
#error Not a GNU C library system
#endif],
[gcc_cv_glibc=yes],
gcc_cv_glibc=no)])
AC_MSG_RESULT($gcc_cv_glibc)
if test $gcc_cv_glibc = yes; then
AC_DEFINE(_GNU_SOURCE, 1, [Always define this when using the GNU C Library])
fi
# Find some useful tools # Find some useful tools
AC_PROG_AWK AC_PROG_AWK
gcc_AC_PROG_LN gcc_AC_PROG_LN
...@@ -625,25 +610,6 @@ gcc_AC_PROG_LN_S ...@@ -625,25 +610,6 @@ gcc_AC_PROG_LN_S
AC_PROG_RANLIB AC_PROG_RANLIB
gcc_AC_PROG_INSTALL gcc_AC_PROG_INSTALL
AC_HEADER_STDC
AC_HEADER_TIME
gcc_AC_HEADER_STDBOOL
gcc_AC_HEADER_STRING
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
fcntl.h unistd.h sys/file.h sys/time.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h)
# Check for thread headers.
AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
# These tests can't be done till we know if we have limits.h.
gcc_AC_C_CHAR_BIT
AC_C_BIGENDIAN_CROSS
gcc_AC_C_FLOAT_FORMAT
# See if we have the mktemp command. # See if we have the mktemp command.
AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no) AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
...@@ -696,6 +662,68 @@ else ...@@ -696,6 +662,68 @@ else
AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison) AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)
fi fi
# --------------------
# Checks for C headers
# --------------------
AC_MSG_CHECKING(for GNU C library)
AC_CACHE_VAL(gcc_cv_glibc,
[AC_TRY_COMPILE(
[#include <features.h>],[
#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
#error Not a GNU C library system
#endif],
[gcc_cv_glibc=yes],
gcc_cv_glibc=no)])
AC_MSG_RESULT($gcc_cv_glibc)
if test $gcc_cv_glibc = yes; then
AC_DEFINE(_GNU_SOURCE, 1, [Always define this when using the GNU C Library])
fi
AC_HEADER_STDC
AC_HEADER_TIME
gcc_AC_HEADER_STDBOOL
gcc_AC_HEADER_STRING
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
fcntl.h unistd.h sys/file.h sys/time.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h)
# Check for thread headers.
AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
# These tests can't be done till we know if we have limits.h.
gcc_AC_C_CHAR_BIT
AC_C_BIGENDIAN_CROSS
gcc_AC_C_FLOAT_FORMAT
# --------
# UNSORTED
# --------
# Stage specific cflags for build.
stage1_cflags=
case $build in
vax-*-*)
if test x$GCC = xyes
then
stage1_cflags="-Wa,-J"
else
stage1_cflags="-J"
fi
;;
powerpc-*-darwin*)
# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
# sources; use -no-cpp-precomp to get to GNU cpp.
# Apple's GCC has bugs in designated initializer handling, so disable
# that too.
stage1_cflags="-no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
;;
esac
AC_SUBST(stage1_cflags)
# These libraries may be used by collect2. # These libraries may be used by collect2.
# We may need a special search path to get them linked. # We may need a special search path to get them linked.
AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs, AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs,
...@@ -2857,18 +2885,6 @@ if test "x$subdirs" != x; then ...@@ -2857,18 +2885,6 @@ if test "x$subdirs" != x; then
fi fi
echo "source ${srcdir}/gdbinit.in" >> .gdbinit echo "source ${srcdir}/gdbinit.in" >> .gdbinit
# Define variables host_canonical and build_canonical
# because some Cygnus local changes in the Makefile depend on them.
build_canonical=${build}
host_canonical=${host}
target_subdir=
if test "${host}" != "${target}" ; then
target_subdir=${target_alias}/
fi
AC_SUBST(build_canonical)
AC_SUBST(host_canonical)
AC_SUBST(target_subdir)
# If $(exec_prefix) exists and is not the same as $(prefix), then compute an # If $(exec_prefix) exists and is not the same as $(prefix), then compute an
# absolute path for gcc_tooldir based on inserting the number of up-directory # absolute path for gcc_tooldir based on inserting the number of up-directory
# movements required to get from $(exec_prefix) to $(prefix) into the basic # movements required to get from $(exec_prefix) to $(prefix) into the basic
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment