From 656fdd475e166a0d09af021f7c207710501ab502 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 9 Jun 2004 08:32:35 +0000 Subject: [PATCH] 2004-06-09 Paolo Bonzini * Makefile.tpl (touch-stage[+id+]): New. (restage[+prev+]): Depend on touch-stage[+id+]. * Makefile.tpl (RECURSE_FLAGS_TO_PASS): New. Use it throughout. * Makefile.def: Add profile and feedback bootstrap stages. Remove next field from bootstrap stages. * Makefile.tpl (LN, LN_S): Substitute. (stageN-start, stageN-end): Use double-colon rules, to provide a hook for additional setup commands. (distclean-stageN-gcc, restageN): Create dependencies from [+prev+], not from [+next+]. (stageN-bubble): Add commands for successive stages from [+prev+], using double-colon rules. (all-stageN-gcc): Fix typo. (stagefeedback-start, profiledbootstrap): New. * Makefile.in: Regenerate. * configure.in: Call ACX_PROG_LN. * configure: Regenerate. config/ChangeLog: 2004-06-09 Paolo Bonzini * acx.m4 (ACX_PROG_LN): From gcc, modified to accept a parameter. --- ChangeLog | 23 +++ Makefile.def | 20 ++- Makefile.in | 439 +++++++++++++++++++++++++++++++++++++++-------- Makefile.tpl | 91 +++++++--- config/ChangeLog | 5 + config/acx.m4 | 24 +++ configure | 200 +++++++++------------ configure.in | 5 +- 8 files changed, 589 insertions(+), 218 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6bcdf8127b..bd23a2382af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2004-06-09 Paolo Bonzini + + * Makefile.tpl (touch-stage[+id+]): New. + (restage[+prev+]): Depend on touch-stage[+id+]. + + * Makefile.tpl (RECURSE_FLAGS_TO_PASS): New. + Use it throughout. + + * Makefile.def: Add profile and feedback bootstrap stages. + Remove next field from bootstrap stages. + * Makefile.tpl (LN, LN_S): Substitute. + (stageN-start, stageN-end): Use double-colon rules, to + provide a hook for additional setup commands. + (distclean-stageN-gcc, restageN): Create dependencies from + [+prev+], not from [+next+]. + (stageN-bubble): Add commands for successive stages from + [+prev+], using double-colon rules. + (all-stageN-gcc): Fix typo. + (stagefeedback-start, profiledbootstrap): New. + * Makefile.in: Regenerate. + * configure.in: Call ACX_PROG_LN. + * configure: Regenerate. + 2004-06-03 Paolo Bonzini * configure.in: Fix --enable-bootstrap breakage introduced in trees diff --git a/Makefile.def b/Makefile.def index c14e3273600..b3941381420 100644 --- a/Makefile.def +++ b/Makefile.def @@ -216,25 +216,33 @@ flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; // Toplevel bootstrap bootstrap_stage = { - id=1 ; next=2 ; + id=1 ; extra_configure_flags='--disable-intermodule \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; extra_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; }; bootstrap_stage = { - id=2 ; prev=1 ; next=3 ; + id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; extra_configure_flags="@stage2_werror_flag@" ; - extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; + extra_make_flags="" ; }; bootstrap_stage = { - id=3 ; prev=2 ; next=4 ; + id=3 ; prev=2 ; compare_target=compare ; bootstrap_target=bootstrap ; cleanstrap_target=cleanstrap ; extra_configure_flags="@stage2_werror_flag@" ; - extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; + extra_make_flags="" ; }; bootstrap_stage = { id=4 ; prev=3 ; compare_target=compare3 ; bootstrap_target=bootstrap4 ; extra_configure_flags="@stage2_werror_flag@" ; - extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; + extra_make_flags="" ; }; +bootstrap_stage = { + id=profile ; prev=1 ; + extra_configure_flags="@stage2_werror_flag@" ; + extra_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; }; +bootstrap_stage = { + id=feedback ; prev=1 ; + extra_configure_flags="@stage2_werror_flag@" ; + extra_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; }; diff --git a/Makefile.in b/Makefile.in index db429bccac6..02d9f7ed2e5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,6 +65,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ +LN = @LN@ +LN_S = @LN_S@ # ------------------------------------------------- # Miscellaneous non-standard autoconf-set variables @@ -552,6 +554,8 @@ RECURSE_FLAGS = \ CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ +RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) + # Flags to pass down to most sub-makes, in which we're building with # the host environment. EXTRA_HOST_FLAGS = \ @@ -27733,7 +27737,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all profiledbootstrap: all-bootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ @@ -27746,7 +27750,7 @@ profiledbootstrap: all-bootstrap configure-gcc s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries and training compiler"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ @@ -27766,8 +27770,7 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - LANGUAGES="c c++" all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap .PHONY: check-gcc maybe-check-gcc @@ -28110,12 +28113,14 @@ objext = .o # Real targets act phony if they depend on phony targets; this hack # prevents gratuitous rebuilding of stage 1. prebootstrap: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-bootstrap + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-bootstrap $(STAMP) prebootstrap # Flags to pass to stage2 and later makes. BOOT_CFLAGS= -g -O2 POSTSTAGE1_FLAGS_TO_PASS = \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ + STAGE_PREFIX=$$r/stage-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ ADAC="\$$(CC)" @@ -28131,13 +28136,13 @@ POSTSTAGE1_FLAGS_TO_PASS = \ .PHONY: stage1-start stage1-end -stage1-start: +stage1-start:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : echo stage1 > stage_last ; \ [ -d stage1-gcc ] || mkdir stage1-gcc; \ set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ -stage1-end: +stage1-end:: rm -f stage_last ; \ set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @@ -28145,18 +28150,14 @@ stage1-end: # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage1-bubble -stage1-bubble: +stage1-bubble:: @if [ -f all-stage1-gcc ] ; then \ echo Remaking stage 1 ; \ rm -f all-stage1-gcc ; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - all-stage1-gcc && \ - if [ -f configure-stage2-gcc ] ; then \ - $(STAMP) configure-stage2-gcc ; \ - fi ; \ - else \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage1-gcc ; \ - fi + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1-gcc + + configure-stage1-gcc: prebootstrap $(MAKE) stage1-start @@ -28200,29 +28201,44 @@ all-stage1-gcc: configure-stage1-gcc -.PHONY: restage1 distclean-stage1 +.PHONY: restage1 touch-stage1 distclean-stage1 + +# Rules to wipe a stage and all the following ones, used for cleanstrap -distclean-stage1: distclean-stage2 +distclean-stage1:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc -restage1: distclean-stage2 +# Rules to renew the timestamp on a stage and all the following ones + +touch-stage1:: + @[ -f configure-stage1-gcc ] && \ + echo '$(STAMP) configure-stage1-gcc' && \ + $(STAMP) configure-stage1-gcc; \ + [ -f all-stage1-gcc ] && \ + echo '$(STAMP) all-stage1-gcc' && \ + $(STAMP) all-stage1-gcc; \ + : + +# After building a stage, touch the following ones + +restage1:: rm -rf all-stage1-gcc - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage1-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1-gcc .PHONY: stage2-start stage2-end -stage2-start: +stage2-start:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : echo stage2 > stage_last ; \ [ -d stage2-gcc ] || mkdir stage2-gcc; \ set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ -stage2-end: +stage2-end:: rm -f stage_last ; \ set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ ; \ set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @@ -28231,19 +28247,20 @@ stage2-end: # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage2-bubble -stage2-bubble: stage1-bubble +stage2-bubble:: stage1-bubble @if [ -f all-stage2-gcc ] ; then \ echo Remaking stage 2 ; \ rm -f all-stage2-gcc ; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - all-stage2-gcc && \ - if [ -f configure-stage3-gcc ] ; then \ - $(STAMP) configure-stage3-gcc ; \ - fi ; \ - else \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage2-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2-gcc + + +stage1-bubble:: + @if [ -f configure-stage2-gcc ] ; then \ + $(STAMP) configure-stage2-gcc ; \ fi + configure-stage2-gcc: all-stage1-gcc $(MAKE) stage2-start @if [ -f stage2-gcc/Makefile ] ; then \ @@ -28280,42 +28297,56 @@ all-stage2-gcc: configure-stage2-gcc $(STAGE_HOST_EXPORTS) \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage1-gcc/ \ - $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc + $(POSTSTAGE1_FLAGS_TO_PASS) \ + && $(STAMP) ../all-stage2-gcc .PHONY: bootstrap2 bootstrap2: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) stage2-bubble \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble \ stage2-start all stage2-end -.PHONY: restage2 distclean-stage2 +.PHONY: restage2 touch-stage2 distclean-stage2 -distclean-stage2: distclean-stage3 +# Rules to wipe a stage and all the following ones, used for cleanstrap +distclean-stage1:: distclean-stage2 +distclean-stage2:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : rm -rf configure-stage2-gcc all-stage2-gcc stage2-gcc -restage2: distclean-stage3 +# Rules to renew the timestamp on a stage and all the following ones +touch-stage1:: touch-stage2 +touch-stage2:: + @[ -f configure-stage2-gcc ] && \ + echo '$(STAMP) configure-stage2-gcc' && \ + $(STAMP) configure-stage2-gcc; \ + [ -f all-stage2-gcc ] && \ + echo '$(STAMP) all-stage2-gcc' && \ + $(STAMP) all-stage2-gcc; \ + : + +# After building a stage, touch the following ones +restage1:: touch-stage2 +restage2:: rm -rf all-stage2-gcc - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage2-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2-gcc .PHONY: stage3-start stage3-end -stage3-start: +stage3-start:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : echo stage3 > stage_last ; \ [ -d stage3-gcc ] || mkdir stage3-gcc; \ set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ -stage3-end: +stage3-end:: rm -f stage_last ; \ set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ ; \ set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ @@ -28324,19 +28355,20 @@ stage3-end: # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage3-bubble -stage3-bubble: stage2-bubble +stage3-bubble:: stage2-bubble @if [ -f all-stage3-gcc ] ; then \ echo Remaking stage 3 ; \ rm -f all-stage3-gcc ; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - all-stage3-gcc && \ - if [ -f configure-stage4-gcc ] ; then \ - $(STAMP) configure-stage4-gcc ; \ - fi ; \ - else \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage3-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3-gcc + + +stage2-bubble:: + @if [ -f configure-stage3-gcc ] ; then \ + $(STAMP) configure-stage3-gcc ; \ fi + configure-stage3-gcc: all-stage2-gcc $(MAKE) stage3-start @if [ -f stage3-gcc/Makefile ] ; then \ @@ -28373,9 +28405,8 @@ all-stage3-gcc: configure-stage3-gcc $(STAGE_HOST_EXPORTS) \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage2-gcc/ \ - $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc + $(POSTSTAGE1_FLAGS_TO_PASS) \ + && $(STAMP) ../all-stage3-gcc compare: all-stage3-gcc @@ -28404,19 +28435,34 @@ compare: all-stage3-gcc .PHONY: bootstrap bootstrap: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) stage3-bubble compare \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble compare \ stage3-start all stage3-end -.PHONY: restage3 distclean-stage3 +.PHONY: restage3 touch-stage3 distclean-stage3 -distclean-stage3: distclean-stage4 +# Rules to wipe a stage and all the following ones, used for cleanstrap +distclean-stage2:: distclean-stage3 +distclean-stage3:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : rm -rf configure-stage3-gcc all-stage3-gcc stage3-gcc compare -restage3: distclean-stage4 +# Rules to renew the timestamp on a stage and all the following ones +touch-stage2:: touch-stage3 +touch-stage3:: + @[ -f configure-stage3-gcc ] && \ + echo '$(STAMP) configure-stage3-gcc' && \ + $(STAMP) configure-stage3-gcc; \ + [ -f all-stage3-gcc ] && \ + echo '$(STAMP) all-stage3-gcc' && \ + $(STAMP) all-stage3-gcc; \ + : + +# After building a stage, touch the following ones +restage2:: touch-stage3 +restage3:: rm -rf all-stage3-gcc compare - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) compare + $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare .PHONY: cleanstrap @@ -28426,14 +28472,14 @@ cleanstrap: distclean-stage1 bootstrap .PHONY: stage4-start stage4-end -stage4-start: +stage4-start:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : echo stage4 > stage_last ; \ [ -d stage4-gcc ] || mkdir stage4-gcc; \ set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ -stage4-end: +stage4-end:: rm -f stage_last ; \ set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@ ; \ set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ @@ -28442,16 +28488,20 @@ stage4-end: # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage4-bubble -stage4-bubble: stage3-bubble +stage4-bubble:: stage3-bubble @if [ -f all-stage4-gcc ] ; then \ echo Remaking stage 4 ; \ rm -f all-stage4-gcc ; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - all-stage4-gcc ; \ - else \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage4-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4-gcc + + +stage3-bubble:: + @if [ -f configure-stage4-gcc ] ; then \ + $(STAMP) configure-stage4-gcc ; \ fi + configure-stage4-gcc: all-stage3-gcc $(MAKE) stage4-start @if [ -f stage4-gcc/Makefile ] ; then \ @@ -28488,9 +28538,8 @@ all-stage4-gcc: configure-stage4-gcc $(STAGE_HOST_EXPORTS) \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage3-gcc/ \ - $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage4-gcc + $(POSTSTAGE1_FLAGS_TO_PASS) \ + && $(STAMP) ../all-stage4-gcc compare3: all-stage4-gcc @@ -28519,22 +28568,270 @@ compare3: all-stage4-gcc .PHONY: bootstrap4 bootstrap4: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) stage4-bubble compare3 \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble compare3 \ stage4-start all stage4-end -.PHONY: restage4 distclean-stage4 +.PHONY: restage4 touch-stage4 distclean-stage4 -distclean-stage4: +# Rules to wipe a stage and all the following ones, used for cleanstrap +distclean-stage3:: distclean-stage4 +distclean-stage4:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : rm -rf configure-stage4-gcc all-stage4-gcc stage4-gcc compare3 -restage4: +# Rules to renew the timestamp on a stage and all the following ones +touch-stage3:: touch-stage4 +touch-stage4:: + @[ -f configure-stage4-gcc ] && \ + echo '$(STAMP) configure-stage4-gcc' && \ + $(STAMP) configure-stage4-gcc; \ + [ -f all-stage4-gcc ] && \ + echo '$(STAMP) all-stage4-gcc' && \ + $(STAMP) all-stage4-gcc; \ + : + +# After building a stage, touch the following ones +restage3:: touch-stage4 +restage4:: rm -rf all-stage4-gcc compare3 - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) compare3 + $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 + + + + +.PHONY: stageprofile-start stageprofile-end + +stageprofile-start:: + [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : + echo stageprofile > stage_last ; \ + [ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \ + set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + +stageprofile-end:: + rm -f stage_last ; \ + set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + +# Bubble a bugfix through all the stages up to stage profile. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. +.PHONY: stageprofile-bubble +stageprofile-bubble:: stage1-bubble + @if [ -f all-stageprofile-gcc ] ; then \ + echo Remaking stage profile ; \ + rm -f all-stageprofile-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile-gcc + + +stage1-bubble:: + @if [ -f configure-stageprofile-gcc ] ; then \ + $(STAMP) configure-stageprofile-gcc ; \ + fi +configure-stageprofile-gcc: all-stage1-gcc + $(MAKE) stageprofile-start + @if [ -f stageprofile-gcc/Makefile ] ; then \ + $(STAMP) configure-stageprofile-gcc ; \ + exit 0; \ + else \ + true ; \ + fi ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ && \ + $(STAMP) ../configure-stageprofile-gcc + +all-stageprofile-gcc: configure-stageprofile-gcc + $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(GCC_FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && $(STAMP) ../all-stageprofile-gcc + + + + + +.PHONY: restageprofile touch-stageprofile distclean-stageprofile + +# Rules to wipe a stage and all the following ones, used for cleanstrap +distclean-stage1:: distclean-stageprofile +distclean-stageprofile:: + [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : + rm -rf configure-stageprofile-gcc all-stageprofile-gcc stageprofile-gcc +# Rules to renew the timestamp on a stage and all the following ones +touch-stage1:: touch-stageprofile +touch-stageprofile:: + @[ -f configure-stageprofile-gcc ] && \ + echo '$(STAMP) configure-stageprofile-gcc' && \ + $(STAMP) configure-stageprofile-gcc; \ + [ -f all-stageprofile-gcc ] && \ + echo '$(STAMP) all-stageprofile-gcc' && \ + $(STAMP) all-stageprofile-gcc; \ + : + +# After building a stage, touch the following ones +restage1:: touch-stageprofile +restageprofile:: + rm -rf all-stageprofile-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile-gcc + + + + +.PHONY: stagefeedback-start stagefeedback-end + +stagefeedback-start:: + [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : + echo stagefeedback > stage_last ; \ + [ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \ + set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + +stagefeedback-end:: + rm -f stage_last ; \ + set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + +# Bubble a bugfix through all the stages up to stage feedback. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. +.PHONY: stagefeedback-bubble +stagefeedback-bubble:: stage1-bubble + @if [ -f all-stagefeedback-gcc ] ; then \ + echo Remaking stage feedback ; \ + rm -f all-stagefeedback-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback-gcc + + +stage1-bubble:: + @if [ -f configure-stagefeedback-gcc ] ; then \ + $(STAMP) configure-stagefeedback-gcc ; \ + fi + + +configure-stagefeedback-gcc: all-stage1-gcc + $(MAKE) stagefeedback-start + @if [ -f stagefeedback-gcc/Makefile ] ; then \ + $(STAMP) configure-stagefeedback-gcc ; \ + exit 0; \ + else \ + true ; \ + fi ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ && \ + $(STAMP) ../configure-stagefeedback-gcc + +all-stagefeedback-gcc: configure-stagefeedback-gcc + $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(GCC_FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && $(STAMP) ../all-stagefeedback-gcc + + + + + +.PHONY: restagefeedback touch-stagefeedback distclean-stagefeedback + +# Rules to wipe a stage and all the following ones, used for cleanstrap +distclean-stage1:: distclean-stagefeedback +distclean-stagefeedback:: + [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : + rm -rf configure-stagefeedback-gcc all-stagefeedback-gcc stagefeedback-gcc + +# Rules to renew the timestamp on a stage and all the following ones +touch-stage1:: touch-stagefeedback +touch-stagefeedback:: + @[ -f configure-stagefeedback-gcc ] && \ + echo '$(STAMP) configure-stagefeedback-gcc' && \ + $(STAMP) configure-stagefeedback-gcc; \ + [ -f all-stagefeedback-gcc ] && \ + echo '$(STAMP) all-stagefeedback-gcc' && \ + $(STAMP) all-stagefeedback-gcc; \ + : + +# After building a stage, touch the following ones +restage1:: touch-stagefeedback +restagefeedback:: + rm -rf all-stagefeedback-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback-gcc + + + + + +stagefeedback-start:: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + cd stageprofile-gcc && \ + { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \ + { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); } + +profiledbootstrap: all-bootstrap configure-gcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(GCC_HOST_EXPORTS) \ + echo "Bootstrapping the compiler"; \ + $(MAKE) stageprofile-bubble distclean-stagefeedback stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ + echo "Building runtime libraries and training compiler"; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(GCC_HOST_EXPORTS) \ + echo "Building feedback based compiler"; \ + $(MAKE) stagefeedback-bubble stagefeedback-end @endif gcc-bootstrap diff --git a/Makefile.tpl b/Makefile.tpl index 6ffecc82222..ac15895db12 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -68,6 +68,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ +LN = @LN@ +LN_S = @LN_S@ # ------------------------------------------------- # Miscellaneous non-standard autoconf-set variables @@ -494,6 +496,8 @@ RECURSE_FLAGS = \ CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ +RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) + # Flags to pass down to most sub-makes, in which we're building with # the host environment. EXTRA_HOST_FLAGS = \ @@ -1258,7 +1262,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all profiledbootstrap: all-bootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ @@ -1271,7 +1275,7 @@ profiledbootstrap: all-bootstrap configure-gcc s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries and training compiler"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ @@ -1291,8 +1295,7 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - LANGUAGES="c c++" all + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap .PHONY: check-gcc maybe-check-gcc @@ -1440,12 +1443,14 @@ objext = .o # Real targets act phony if they depend on phony targets; this hack # prevents gratuitous rebuilding of stage 1. prebootstrap: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-bootstrap + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-bootstrap $(STAMP) prebootstrap # Flags to pass to stage2 and later makes. BOOT_CFLAGS= -g -O2 POSTSTAGE1_FLAGS_TO_PASS = \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ + STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ ADAC="\$$(CC)" @@ -1461,14 +1466,14 @@ POSTSTAGE1_FLAGS_TO_PASS = \ [+ FOR bootstrap-stage +] .PHONY: stage[+id+]-start stage[+id+]-end -stage[+id+]-start: +stage[+id+]-start:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : echo stage[+id+] > stage_last ; \ [ -d stage[+id+]-gcc ] || mkdir stage[+id+]-gcc; \ set stage[+id+]-gcc gcc ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ set stage[+prev+]-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] -stage[+id+]-end: +stage[+id+]-end:: rm -f stage_last ; \ set gcc stage[+id+]-gcc ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ set prev-gcc stage[+prev+]-gcc ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] @@ -1477,18 +1482,19 @@ stage[+id+]-end: # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage[+id+]-bubble -stage[+id+]-bubble: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] +stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @if [ -f all-stage[+id+]-gcc ] ; then \ echo Remaking stage [+id+] ; \ rm -f all-stage[+id+]-gcc ; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ - all-stage[+id+]-gcc [+ IF next +] && \ - if [ -f configure-stage[+next+]-gcc ] ; then \ - $(STAMP) configure-stage[+next+]-gcc ; \ - fi [+ ENDIF next +]; \ - else \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all-stage[+id+]-gcc ; \ + fi ; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]-gcc + +[+ IF prev +] +stage[+prev+]-bubble:: + @if [ -f configure-stage[+id+]-gcc ] ; then \ + $(STAMP) configure-stage[+id+]-gcc ; \ fi +[+ ENDIF prev +] configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+ ELSE +] prebootstrap [+ ENDIF prev +] @@ -1529,8 +1535,7 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc $(GCC_HOST_EXPORTS) [+ ENDIF prev +] \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) [+ IF prev +] \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage[+prev+]-gcc/ [+ ENDIF prev +] \ + $(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \ [+extra_make_flags+] && $(STAMP) ../all-stage[+id+]-gcc [+ IF compare-target +] @@ -1560,23 +1565,38 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc [+ IF bootstrap-target +] .PHONY: [+bootstrap-target+] [+bootstrap-target+]: - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) stage[+id+]-bubble [+ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble [+ IF compare-target +] [+compare-target+] [+ ENDIF compare-target +] \ stage[+id+]-start all stage[+id+]-end [+ ENDIF bootstrap-target +] -.PHONY: restage[+id+] distclean-stage[+id+] +.PHONY: restage[+id+] touch-stage[+id+] distclean-stage[+id+] -distclean-stage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +] +# Rules to wipe a stage and all the following ones, used for cleanstrap +[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +] +distclean-stage[+id+]:: [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : rm -rf configure-stage[+id+]-gcc all-stage[+id+]-gcc stage[+id+]-gcc [+ IF compare-target +][+compare-target+] [+ ENDIF compare-target +] -restage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +] +# Rules to renew the timestamp on a stage and all the following ones +[+ IF prev +]touch-stage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +] +touch-stage[+id+]:: + @[ -f configure-stage[+id+]-gcc ] && \ + echo '$(STAMP) configure-stage[+id+]-gcc' && \ + $(STAMP) configure-stage[+id+]-gcc; \ + [ -f all-stage[+id+]-gcc ] && \ + echo '$(STAMP) all-stage[+id+]-gcc' && \ + $(STAMP) all-stage[+id+]-gcc; \ + : + +# After building a stage, touch the following ones +[+ IF prev +]restage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +] +restage[+id+]:: rm -rf all-stage[+id+]-gcc [+ IF compare-target +][+compare-target+] [+ ENDIF compare-target +] - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) [+ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+ IF compare-target +][+compare-target+] [+ ELSE +] all-stage[+id+]-gcc [+ ENDIF compare-target +] @@ -1586,6 +1606,33 @@ restage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +] [+ ENDIF cleanstrap-target +] [+ ENDFOR bootstrap-stage +] + +stagefeedback-start:: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + cd stageprofile-gcc && \ + { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \ + { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); } + +profiledbootstrap: all-bootstrap configure-gcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(GCC_HOST_EXPORTS) \ + echo "Bootstrapping the compiler"; \ + $(MAKE) stageprofile-bubble distclean-stagefeedback stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ + echo "Building runtime libraries and training compiler"; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(GCC_HOST_EXPORTS) \ + echo "Building feedback based compiler"; \ + $(MAKE) stagefeedback-bubble stagefeedback-end + @endif gcc-bootstrap # -------------------------------------- diff --git a/config/ChangeLog b/config/ChangeLog index 5f4adecc62e..6711da5bdbf 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2004-06-09 Paolo Bonzini + + * acx.m4 (ACX_PROG_LN): From gcc, modified to + accept a parameter. + 2004-05-23 Paolo Bonzini * acx.m4 (ACX_HEADER_STDBOOL, ACX_HEADER_STRING): diff --git a/config/acx.m4 b/config/acx.m4 index b96d688bde3..09bac1c6c64 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -258,3 +258,27 @@ if test $gcc_cv_c__bool = yes; then fi ]) +dnl See if hard links work and if not, try to substitute $1 or simple copy. +AC_DEFUN([ACX_PROG_LN], +[AC_MSG_CHECKING(whether ln works) +AC_CACHE_VAL(acx_cv_prog_LN, +[rm -f conftestdata_t +echo >conftestdata_f +if ln conftestdata_f conftestdata_t 2>/dev/null +then + acx_cv_prog_LN=ln +else + acx_cv_prog_LN=no +fi +rm -f conftestdata_f conftestdata_t +])dnl +if test $acx_cv_prog_LN = no; then + LN="ifelse([$1],,cp,[$1])" + AC_MSG_RESULT([no, using $LN]) +else + LN="$acx_cv_prog_LN" + AC_MSG_RESULT(yes) +fi +AC_SUBST(LN)dnl +]) + diff --git a/configure b/configure index 13f9f04fd83..d3c5983f41f 100755 --- a/configure +++ b/configure @@ -735,8 +735,32 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +echo $ac_n "checking whether ln works""... $ac_c" 1>&6 +echo "configure:740: checking whether ln works" >&5 +if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + rm -f conftestdata_t +echo >conftestdata_f +if ln conftestdata_f conftestdata_t 2>/dev/null +then + acx_cv_prog_LN=ln +else + acx_cv_prog_LN=no +fi +rm -f conftestdata_f conftestdata_t + +fi +if test $acx_cv_prog_LN = no; then + LN="cp" + echo "$ac_t""no, using $LN" 1>&6 +else + LN="$acx_cv_prog_LN" + echo "$ac_t""yes" 1>&6 +fi + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:740: checking whether ln -s works" >&5 +echo "configure:764: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -757,65 +781,6 @@ else fi -# Autoconf M4 include file defining utility macros for complex Canadian -# cross builds. - - - - - - -#### -# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM -# or AC_INIT. -# These demand that AC_CANONICAL_SYSTEM be called beforehand. - -#### -# NCN_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path]) -# Like AC_CHECK_TOOL, but tries a prefix of the target, not the host. -# Code is pretty much lifted from autoconf2.53. - - - -#### -# NCN_STRICT_CHECK_TOOL(variable, prog-to-check-for,[value-if-not-found],[path]) -# Like AC_CHECK_TOOL, but requires the prefix if build!=host. - - - -#### -# NCN_STRICT_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path]) -# Like NCN_CHECK_TARGET_TOOL, but requires the prefix if build!=target. - - -### -# AC_PROG_CPP_WERROR -# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which -# triggers warnings from the preprocessor. Will be in autoconf 2.58. -# For now, using this also overrides header checks to use only the -# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a -# bit harder from here). -# Eventually autoconf will default to checking headers with the compiler -# instead, and we'll have to do this differently. - -# AC_PROG_CPP_WERROR - -# Test for GNAT. -# We require the gnatbind program, and a compiler driver that -# understands Ada. We use the user's CC setting, already found. -# -# Sets the shell variable have_gnat to yes or no as appropriate, and -# substitutes GNATBIND. - - - - - - - - - - ### we might need to use some other shell than /bin/sh for running subshells ### If we are on Windows, search for the shell. This will permit people ### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure @@ -1922,7 +1887,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1926: checking for $ac_word" >&5 +echo "configure:1891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1952,7 +1917,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1956: checking for $ac_word" >&5 +echo "configure:1921: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2003,7 +1968,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2007: checking for $ac_word" >&5 +echo "configure:1972: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2035,7 +2000,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2046,12 +2011,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2050 "configure" +#line 2015 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2077,12 +2042,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2046: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2086: checking whether we are using GNU C" >&5 +echo "configure:2051: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2091,7 +2056,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2110,7 +2075,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2114: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2079: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2146,7 +2111,7 @@ fi # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2150: checking for $ac_word" >&5 +echo "configure:2115: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2178,7 +2143,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2182: checking for $ac_word" >&5 +echo "configure:2147: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2211,7 +2176,7 @@ fi fi echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2215: checking whether compiler driver understands Ada" >&5 +echo "configure:2180: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2244,7 +2209,7 @@ else fi echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2248: checking how to compare bootstrapped objects" >&5 +echo "configure:2213: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2317,9 +2282,9 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2321: checking for correct version of gmp.h" >&5 +echo "configure:2286: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2343,19 +2308,19 @@ rm -f conftest* if test x"$have_gmp" = xyes; then echo $ac_n "checking for mpf_init in -lgmp""... $ac_c" 1>&6 -echo "configure:2347: checking for mpf_init in -lgmp" >&5 +echo "configure:2312: checking for mpf_init in -lgmp" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext < int main() { mpf_t n; mpf_init(n); ; return 0; } EOF -if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2817,7 +2782,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2821: checking for $ac_word" >&5 +echo "configure:2786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2852,7 +2817,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2856: checking for $ac_word" >&5 +echo "configure:2821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2887,7 +2852,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2891: checking for $ac_word" >&5 +echo "configure:2856: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3499,7 +3464,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:3503: checking for $ac_word" >&5 +echo "configure:3468: 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 @@ -3532,7 +3497,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:3536: checking for $ac_word" >&5 +echo "configure:3501: 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 @@ -3571,7 +3536,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:3575: checking for $ac_word" >&5 +echo "configure:3540: 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 @@ -3604,7 +3569,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:3608: checking for $ac_word" >&5 +echo "configure:3573: 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 @@ -3643,7 +3608,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:3647: checking for $ac_word" >&5 +echo "configure:3612: 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 @@ -3676,7 +3641,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:3680: checking for $ac_word" >&5 +echo "configure:3645: 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 @@ -3715,7 +3680,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:3719: checking for $ac_word" >&5 +echo "configure:3684: 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 @@ -3748,7 +3713,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:3752: checking for $ac_word" >&5 +echo "configure:3717: 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 @@ -3787,7 +3752,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:3791: checking for $ac_word" >&5 +echo "configure:3756: 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 @@ -3820,7 +3785,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:3824: checking for $ac_word" >&5 +echo "configure:3789: 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 @@ -3859,7 +3824,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:3863: checking for $ac_word" >&5 +echo "configure:3828: 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 @@ -3892,7 +3857,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:3896: checking for $ac_word" >&5 +echo "configure:3861: 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 @@ -3931,7 +3896,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:3935: checking for $ac_word" >&5 +echo "configure:3900: 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 @@ -3964,7 +3929,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:3968: checking for $ac_word" >&5 +echo "configure:3933: 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 @@ -4003,7 +3968,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:4007: checking for $ac_word" >&5 +echo "configure:3972: 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 @@ -4036,7 +4001,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:4040: checking for $ac_word" >&5 +echo "configure:4005: 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 @@ -4075,7 +4040,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:4079: checking for $ac_word" >&5 +echo "configure:4044: 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 @@ -4108,7 +4073,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:4112: checking for $ac_word" >&5 +echo "configure:4077: 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 @@ -4157,7 +4122,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:4161: checking for $ac_word" >&5 +echo "configure:4126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4190,7 +4155,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4194: checking for $ac_word" >&5 +echo "configure:4159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4229,7 +4194,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:4233: checking for $ac_word" >&5 +echo "configure:4198: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4262,7 +4227,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4266: checking for $ac_word" >&5 +echo "configure:4231: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4301,7 +4266,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:4305: checking for $ac_word" >&5 +echo "configure:4270: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4334,7 +4299,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4338: checking for $ac_word" >&5 +echo "configure:4303: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4373,7 +4338,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:4377: checking for $ac_word" >&5 +echo "configure:4342: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4406,7 +4371,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4410: checking for $ac_word" >&5 +echo "configure:4375: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4445,7 +4410,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:4449: checking for $ac_word" >&5 +echo "configure:4414: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4478,7 +4443,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4482: checking for $ac_word" >&5 +echo "configure:4447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4517,7 +4482,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:4521: checking for $ac_word" >&5 +echo "configure:4486: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4550,7 +4515,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4554: checking for $ac_word" >&5 +echo "configure:4519: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4589,7 +4554,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:4593: checking for $ac_word" >&5 +echo "configure:4558: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4622,7 +4587,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4626: checking for $ac_word" >&5 +echo "configure:4591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4707,7 +4672,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:4711: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4676: 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" @@ -4754,7 +4719,7 @@ esac # gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not # possible, however, we can resort to mv. echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 -echo "configure:4758: checking if symbolic links between directories work" >&5 +echo "configure:4723: checking if symbolic links between directories work" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4965,6 +4930,7 @@ s%@build_os@%$build_os%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@LN@%$LN%g s%@LN_S@%$LN_S%g s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g s%@build_subdir@%$build_subdir%g diff --git a/configure.in b/configure.in index 7f6e97179a6..a42a1c51d25 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,8 @@ ############################################################################## ### WARNING: this file contains embedded tabs. Do not run untabify on this file. +sinclude(config/acx.m4) + AC_INIT(move-if-change) AC_PREREQ(2.13) AC_CANONICAL_SYSTEM @@ -25,10 +27,9 @@ AC_ARG_PROGRAM # Get 'install' or 'install-sh' and its variants. AC_PROG_INSTALL +ACX_PROG_LN AC_PROG_LN_S -sinclude(config/acx.m4) - ### we might need to use some other shell than /bin/sh for running subshells ### If we are on Windows, search for the shell. This will permit people ### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure -- 2.30.2