From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31935 invoked by alias); 9 Jun 2004 23:23:03 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 31821 invoked from network); 9 Jun 2004 23:22:30 -0000 Received: from unknown (HELO mailhub.air.net.au) (203.52.201.202) by sourceware.org with SMTP; 9 Jun 2004 23:22:30 -0000 Received: from mailhub.air.net.au (localhost [127.0.0.1]) by mailhub.air.net.au (Postfix) with ESMTP id A1C8336DC8 for ; Thu, 10 Jun 2004 09:22:27 +1000 (EST) Received: by mailhub.air.net.au (tmda-sendmail, from uid 500); Thu, 10 Jun 2004 09:22:26 +1000 (EST) Date: Wed, 09 Jun 2004 23:23:00 -0000 To: binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: top-level removal of dejagnu, expect Message-ID: <20040610092223.A1221@mailhub.air.net.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="IJpNTDwzlM2Ie8A6" Content-Disposition: inline User-Agent: Mutt/1.2.5.1i From: Ben Elliston X-Delivery-Agent: TMDA/0.86 (Venetian Way) X-Primary-Address: bje@air.net.au X-SW-Source: 2004-06/txt/msg00200.txt.bz2 --IJpNTDwzlM2Ie8A6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 66486 In preparation for the removal of src/{dejagnu,expect}. Okay to commit? 2004-06-10 Ben Elliston * Makefile.def (dejagnu, expect): Remove. * Makefile.tpl (EXPECT): Set to 'expect'. (RUNTEST): Set to 'runtest'. (all-dejagnu): Remove target. (configure-expect): Likewise. (all-expect): Likewise. * Makefile.in: Rebuild. * configure.in (host_tools): Remove expect and dejagnu. (noconfigdirs): Likewise for all target triples. * configure: Rebuild. * src-release (do-proto-toplev): Remove kludge for gdb/708. (DEJAGNU_SUPPORT_DIRS): Remove. (dejagnu.tar.bz2, dejagnu.tar): Likewise. (GDBD_SUPPORT_DIRS): Likewise. (gdb+dejagnu.tar.bz2, gdb+dejagnu.tar): Likewise. (INSIGHTD_SUPPORT_DIRS): Likewise. (insight+dejagnu.tar.bz2, insight+dejagnu.tar): Likewise. Index: Makefile.def =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.def,v retrieving revision 1.25 diff -u -r1.25 Makefile.def --- Makefile.def 9 Jun 2004 08:32:32 -0000 1.25 +++ Makefile.def 9 Jun 2004 23:16:39 -0000 @@ -37,7 +37,6 @@ host_modules=3D { module=3D bison; no_check_cross=3D true; bootstrap=3Dtru= e; }; host_modules=3D { module=3D byacc; no_check_cross=3D true; bootstrap=3Dtru= e; }; host_modules=3D { module=3D bzip2; }; -host_modules=3D { module=3D dejagnu; }; host_modules=3D { module=3D diff; }; host_modules=3D { module=3D dosutils; no_check=3D true; }; host_modules=3D { module=3D etc; }; @@ -88,7 +87,6 @@ host_modules=3D { module=3D zip; no_check_cross=3Dtrue; }; host_modules=3D { module=3D zlib; no_install=3Dtrue; no_check=3Dtrue; boot= strap=3Dtrue; }; host_modules=3D { module=3D gdb; with_x=3Dtrue; }; -host_modules=3D { module=3D expect; with_x=3Dtrue; }; host_modules=3D { module=3D guile; with_x=3Dtrue; }; host_modules=3D { module=3D tk; with_x=3Dtrue; }; host_modules=3D { module=3D tix; with_x=3Dtrue; }; Index: Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.in,v retrieving revision 1.175 diff -u -r1.175 Makefile.in --- Makefile.in 9 Jun 2004 08:32:32 -0000 1.175 +++ Makefile.in 9 Jun 2004 23:17:13 -0000 @@ -282,13 +282,8 @@ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS =3D --split-size=3D5000000 =20 -EXPECT =3D `if [ -f $$r/expect/expect ] ; \ - then echo $$r/expect/expect ; \ - else echo expect ; fi` - -RUNTEST =3D `if [ -f $$s/dejagnu/runtest ] ; \ - then echo $$s/dejagnu/runtest ; \ - else echo runtest ; fi` +EXPECT =3D expect +RUNTEST =3D runtest =20 # --------------------------------------------- # Programs producing files for the HOST machine @@ -638,7 +633,6 @@ maybe-configure-bison \ maybe-configure-byacc \ maybe-configure-bzip2 \ - maybe-configure-dejagnu \ maybe-configure-diff \ maybe-configure-dosutils \ maybe-configure-etc \ @@ -688,7 +682,6 @@ maybe-configure-zip \ maybe-configure-zlib \ maybe-configure-gdb \ - maybe-configure-expect \ maybe-configure-guile \ maybe-configure-tk \ maybe-configure-tix \ @@ -731,7 +724,6 @@ maybe-all-bison \ maybe-all-byacc \ maybe-all-bzip2 \ - maybe-all-dejagnu \ maybe-all-diff \ maybe-all-dosutils \ maybe-all-etc \ @@ -781,7 +773,6 @@ maybe-all-zip \ maybe-all-zlib \ maybe-all-gdb \ - maybe-all-expect \ maybe-all-guile \ maybe-all-tk \ maybe-all-tix \ @@ -828,7 +819,6 @@ maybe-info-bison \ maybe-info-byacc \ maybe-info-bzip2 \ - maybe-info-dejagnu \ maybe-info-diff \ maybe-info-dosutils \ maybe-info-etc \ @@ -878,7 +868,6 @@ maybe-info-zip \ maybe-info-zlib \ maybe-info-gdb \ - maybe-info-expect \ maybe-info-guile \ maybe-info-tk \ maybe-info-tix \ @@ -921,7 +910,6 @@ maybe-dvi-bison \ maybe-dvi-byacc \ maybe-dvi-bzip2 \ - maybe-dvi-dejagnu \ maybe-dvi-diff \ maybe-dvi-dosutils \ maybe-dvi-etc \ @@ -971,7 +959,6 @@ maybe-dvi-zip \ maybe-dvi-zlib \ maybe-dvi-gdb \ - maybe-dvi-expect \ maybe-dvi-guile \ maybe-dvi-tk \ maybe-dvi-tix \ @@ -1014,7 +1001,6 @@ maybe-TAGS-bison \ maybe-TAGS-byacc \ maybe-TAGS-bzip2 \ - maybe-TAGS-dejagnu \ maybe-TAGS-diff \ maybe-TAGS-dosutils \ maybe-TAGS-etc \ @@ -1064,7 +1050,6 @@ maybe-TAGS-zip \ maybe-TAGS-zlib \ maybe-TAGS-gdb \ - maybe-TAGS-expect \ maybe-TAGS-guile \ maybe-TAGS-tk \ maybe-TAGS-tix \ @@ -1107,7 +1092,6 @@ maybe-install-info-bison \ maybe-install-info-byacc \ maybe-install-info-bzip2 \ - maybe-install-info-dejagnu \ maybe-install-info-diff \ maybe-install-info-dosutils \ maybe-install-info-etc \ @@ -1157,7 +1141,6 @@ maybe-install-info-zip \ maybe-install-info-zlib \ maybe-install-info-gdb \ - maybe-install-info-expect \ maybe-install-info-guile \ maybe-install-info-tk \ maybe-install-info-tix \ @@ -1200,7 +1183,6 @@ maybe-installcheck-bison \ maybe-installcheck-byacc \ maybe-installcheck-bzip2 \ - maybe-installcheck-dejagnu \ maybe-installcheck-diff \ maybe-installcheck-dosutils \ maybe-installcheck-etc \ @@ -1250,7 +1232,6 @@ maybe-installcheck-zip \ maybe-installcheck-zlib \ maybe-installcheck-gdb \ - maybe-installcheck-expect \ maybe-installcheck-guile \ maybe-installcheck-tk \ maybe-installcheck-tix \ @@ -1293,7 +1274,6 @@ maybe-mostlyclean-bison \ maybe-mostlyclean-byacc \ maybe-mostlyclean-bzip2 \ - maybe-mostlyclean-dejagnu \ maybe-mostlyclean-diff \ maybe-mostlyclean-dosutils \ maybe-mostlyclean-etc \ @@ -1343,7 +1323,6 @@ maybe-mostlyclean-zip \ maybe-mostlyclean-zlib \ maybe-mostlyclean-gdb \ - maybe-mostlyclean-expect \ maybe-mostlyclean-guile \ maybe-mostlyclean-tk \ maybe-mostlyclean-tix \ @@ -1386,7 +1365,6 @@ maybe-clean-bison \ maybe-clean-byacc \ maybe-clean-bzip2 \ - maybe-clean-dejagnu \ maybe-clean-diff \ maybe-clean-dosutils \ maybe-clean-etc \ @@ -1436,7 +1414,6 @@ maybe-clean-zip \ maybe-clean-zlib \ maybe-clean-gdb \ - maybe-clean-expect \ maybe-clean-guile \ maybe-clean-tk \ maybe-clean-tix \ @@ -1479,7 +1456,6 @@ maybe-distclean-bison \ maybe-distclean-byacc \ maybe-distclean-bzip2 \ - maybe-distclean-dejagnu \ maybe-distclean-diff \ maybe-distclean-dosutils \ maybe-distclean-etc \ @@ -1529,7 +1505,6 @@ maybe-distclean-zip \ maybe-distclean-zlib \ maybe-distclean-gdb \ - maybe-distclean-expect \ maybe-distclean-guile \ maybe-distclean-tk \ maybe-distclean-tix \ @@ -1572,7 +1547,6 @@ maybe-maintainer-clean-bison \ maybe-maintainer-clean-byacc \ maybe-maintainer-clean-bzip2 \ - maybe-maintainer-clean-dejagnu \ maybe-maintainer-clean-diff \ maybe-maintainer-clean-dosutils \ maybe-maintainer-clean-etc \ @@ -1622,7 +1596,6 @@ maybe-maintainer-clean-zip \ maybe-maintainer-clean-zlib \ maybe-maintainer-clean-gdb \ - maybe-maintainer-clean-expect \ maybe-maintainer-clean-guile \ maybe-maintainer-clean-tk \ maybe-maintainer-clean-tix \ @@ -1722,7 +1695,6 @@ maybe-check-bison \ maybe-check-byacc \ maybe-check-bzip2 \ - maybe-check-dejagnu \ maybe-check-diff \ maybe-check-dosutils \ maybe-check-etc \ @@ -1772,7 +1744,6 @@ maybe-check-zip \ maybe-check-zlib \ maybe-check-gdb \ - maybe-check-expect \ maybe-check-guile \ maybe-check-tk \ maybe-check-tix \ @@ -1835,7 +1806,6 @@ maybe-install-bison \ maybe-install-byacc \ maybe-install-bzip2 \ - maybe-install-dejagnu \ maybe-install-diff \ maybe-install-dosutils \ maybe-install-etc \ @@ -1885,7 +1855,6 @@ maybe-install-zip \ maybe-install-zlib \ maybe-install-gdb \ - maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ maybe-install-tix \ @@ -1904,7 +1873,6 @@ maybe-install-bison \ maybe-install-byacc \ maybe-install-bzip2 \ - maybe-install-dejagnu \ maybe-install-diff \ maybe-install-dosutils \ maybe-install-etc \ @@ -1954,7 +1922,6 @@ maybe-install-zip \ maybe-install-zlib \ maybe-install-gdb \ - maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ maybe-install-tix \ @@ -5194,308 +5161,6 @@ @endif bzip2 =20 =20 -.PHONY: configure-dejagnu maybe-configure-dejagnu -maybe-configure-dejagnu: -@if dejagnu -maybe-configure-dejagnu: configure-dejagnu -configure-dejagnu: - @test ! -f dejagnu/Makefile || exit 0; \ - [ -d dejagnu ] || mkdir dejagnu; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in dejagnu; \ - cd dejagnu || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption=3D"--srcdir=3D."; \ - libsrcdir=3D".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption=3D"--srcdir=3D$(srcdir)/dejagnu"; \ - libsrcdir=3D"$$s/dejagnu";; \ - *) \ - srcdiroption=3D"--srcdir=3D../$(srcdir)/dejagnu"; \ - libsrcdir=3D"$$s/dejagnu";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif dejagnu - -.PHONY: all-dejagnu maybe-all-dejagnu -maybe-all-dejagnu: -@if dejagnu -maybe-all-dejagnu: all-dejagnu -all-dejagnu: configure-dejagnu - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all) -@endif dejagnu - -.PHONY: check-dejagnu maybe-check-dejagnu -maybe-check-dejagnu: -@if dejagnu -maybe-check-dejagnu: check-dejagnu - -check-dejagnu: - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check) - -@endif dejagnu - -.PHONY: install-dejagnu maybe-install-dejagnu -maybe-install-dejagnu: -@if dejagnu -maybe-install-dejagnu: install-dejagnu - -install-dejagnu: installdirs - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install) - -@endif dejagnu - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-dejagnu info-dejagnu -maybe-info-dejagnu: -@if dejagnu -maybe-info-dejagnu: info-dejagnu - -info-dejagnu: \ - configure-dejagnu=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing info in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - info) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-dvi-dejagnu dvi-dejagnu -maybe-dvi-dejagnu: -@if dejagnu -maybe-dvi-dejagnu: dvi-dejagnu - -dvi-dejagnu: \ - configure-dejagnu=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing dvi in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu -maybe-TAGS-dejagnu: -@if dejagnu -maybe-TAGS-dejagnu: TAGS-dejagnu - -TAGS-dejagnu: \ - configure-dejagnu=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing TAGS in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-install-info-dejagnu install-info-dejagnu -maybe-install-info-dejagnu: -@if dejagnu -maybe-install-info-dejagnu: install-info-dejagnu - -install-info-dejagnu: \ - configure-dejagnu \ - info-dejagnu=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing install-info in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu -maybe-installcheck-dejagnu: -@if dejagnu -maybe-installcheck-dejagnu: installcheck-dejagnu - -installcheck-dejagnu: \ - configure-dejagnu=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing installcheck in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu -maybe-mostlyclean-dejagnu: -@if dejagnu -maybe-mostlyclean-dejagnu: mostlyclean-dejagnu - -mostlyclean-dejagnu:=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing mostlyclean in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-clean-dejagnu clean-dejagnu -maybe-clean-dejagnu: -@if dejagnu -maybe-clean-dejagnu: clean-dejagnu - -clean-dejagnu:=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing clean in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - clean) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-distclean-dejagnu distclean-dejagnu -maybe-distclean-dejagnu: -@if dejagnu -maybe-distclean-dejagnu: distclean-dejagnu - -distclean-dejagnu:=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing distclean in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif dejagnu - -.PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu -maybe-maintainer-clean-dejagnu: -@if dejagnu -maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu - -maintainer-clean-dejagnu:=20 - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing maintainer-clean in dejagnu" ; \ - (cd dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif dejagnu - - .PHONY: configure-diff maybe-configure-diff maybe-configure-diff: @if diff @@ -20248,308 +19913,6 @@ @endif gdb =20 =20 -.PHONY: configure-expect maybe-configure-expect -maybe-configure-expect: -@if expect -maybe-configure-expect: configure-expect -configure-expect: - @test ! -f expect/Makefile || exit 0; \ - [ -d expect ] || mkdir expect; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in expect; \ - cd expect || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption=3D"--srcdir=3D."; \ - libsrcdir=3D".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption=3D"--srcdir=3D$(srcdir)/expect"; \ - libsrcdir=3D"$$s/expect";; \ - *) \ - srcdiroption=3D"--srcdir=3D../$(srcdir)/expect"; \ - libsrcdir=3D"$$s/expect";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif expect - -.PHONY: all-expect maybe-all-expect -maybe-all-expect: -@if expect -maybe-all-expect: all-expect -all-expect: configure-expect - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) -@endif expect - -.PHONY: check-expect maybe-check-expect -maybe-check-expect: -@if expect -maybe-check-expect: check-expect - -check-expect: - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) - -@endif expect - -.PHONY: install-expect maybe-install-expect -maybe-install-expect: -@if expect -maybe-install-expect: install-expect - -install-expect: installdirs - @r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) - -@endif expect - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-expect info-expect -maybe-info-expect: -@if expect -maybe-info-expect: info-expect - -info-expect: \ - configure-expect=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing info in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - info) \ - || exit 1 - -@endif expect - -.PHONY: maybe-dvi-expect dvi-expect -maybe-dvi-expect: -@if expect -maybe-dvi-expect: dvi-expect - -dvi-expect: \ - configure-expect=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing dvi in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif expect - -.PHONY: maybe-TAGS-expect TAGS-expect -maybe-TAGS-expect: -@if expect -maybe-TAGS-expect: TAGS-expect - -TAGS-expect: \ - configure-expect=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing TAGS in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif expect - -.PHONY: maybe-install-info-expect install-info-expect -maybe-install-info-expect: -@if expect -maybe-install-info-expect: install-info-expect - -install-info-expect: \ - configure-expect \ - info-expect=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing install-info in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif expect - -.PHONY: maybe-installcheck-expect installcheck-expect -maybe-installcheck-expect: -@if expect -maybe-installcheck-expect: installcheck-expect - -installcheck-expect: \ - configure-expect=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing installcheck in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif expect - -.PHONY: maybe-mostlyclean-expect mostlyclean-expect -maybe-mostlyclean-expect: -@if expect -maybe-mostlyclean-expect: mostlyclean-expect - -mostlyclean-expect:=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing mostlyclean in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif expect - -.PHONY: maybe-clean-expect clean-expect -maybe-clean-expect: -@if expect -maybe-clean-expect: clean-expect - -clean-expect:=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing clean in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - clean) \ - || exit 1 - -@endif expect - -.PHONY: maybe-distclean-expect distclean-expect -maybe-distclean-expect: -@if expect -maybe-distclean-expect: distclean-expect - -distclean-expect:=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing distclean in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif expect - -.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect -maybe-maintainer-clean-expect: -@if expect -maybe-maintainer-clean-expect: maintainer-clean-expect - -maintainer-clean-expect:=20 - @[ -f ./expect/Makefile ] || exit 0; \ - r=3D`${PWD_COMMAND}`; export r; \ - s=3D`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=3D]*\)=3D\(.*\)|\1=3D'\2'; export= \1|"`; \ - done; \ - echo "Doing maintainer-clean in expect" ; \ - (cd expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=3D$${AR}" "AS=3D$${AS}" \ - "CC=3D$${CC}" "CXX=3D$${CXX}" "LD=3D$${LD}" "NM=3D$${NM}" \ - "RANLIB=3D$${RANLIB}" \ - "DLLTOOL=3D$${DLLTOOL}" "WINDRES=3D$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif expect - - .PHONY: configure-guile maybe-configure-guile maybe-configure-guile: @if guile @@ -28883,9 +28246,6 @@ all-opcodes: maybe-all-bfd maybe-all-libiberty =20 # Other host modules in the 'src' repository. -all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk -configure-expect: maybe-configure-tcl maybe-configure-tk -all-expect: maybe-all-tcl maybe-all-tk configure-itcl: maybe-configure-tcl maybe-configure-tk all-itcl: maybe-all-tcl maybe-all-tk # We put install-tcl before install-itcl because itcl wants to run a Index: Makefile.tpl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.tpl,v retrieving revision 1.105 diff -u -r1.105 Makefile.tpl --- Makefile.tpl 9 Jun 2004 08:32:33 -0000 1.105 +++ Makefile.tpl 9 Jun 2004 23:17:15 -0000 @@ -285,13 +285,8 @@ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS =3D --split-size=3D5000000 =20 -EXPECT =3D `if [ -f $$r/expect/expect ] ; \ - then echo $$r/expect/expect ; \ - else echo expect ; fi` - -RUNTEST =3D `if [ -f $$s/dejagnu/runtest ] ; \ - then echo $$s/dejagnu/runtest ; \ - else echo runtest ; fi` +EXPECT =3D expect +RUNTEST =3D runtest =20 # --------------------------------------------- # Programs producing files for the HOST machine @@ -1683,9 +1678,6 @@ all-opcodes: maybe-all-bfd maybe-all-libiberty =20 # Other host modules in the 'src' repository. -all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk -configure-expect: maybe-configure-tcl maybe-configure-tk -all-expect: maybe-all-tcl maybe-all-tk configure-itcl: maybe-configure-tcl maybe-configure-tk all-itcl: maybe-all-tcl maybe-all-tk # We put install-tcl before install-itcl because itcl wants to run a Index: configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/configure,v retrieving revision 1.129 diff -u -r1.129 configure --- configure 9 Jun 2004 08:32:34 -0000 1.129 +++ configure 9 Jun 2004 23:17:22 -0000 @@ -886,7 +886,7 @@ # know that we are building the simulator. # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. -host_tools=3D"texinfo byacc flex bison binutils gas ld gcc sid sim gdb mak= e patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf au= tomake libtool diff rcs fileutils shellutils time textutils wdiff find uude= code hello tar gzip indent recode release sed utils guile perl gawk finduti= ls gettext zip fastjar" +host_tools=3D"texinfo byacc flex bison binutils gas ld gcc sid sim gdb mak= e patch prms send-pr gprof etc ash bash bzip2 m4 autoconf automake libtool = diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar = gzip indent recode release sed utils guile perl gawk findutils gettext zip = fastjar" =20 # libgcj represents the runtime libraries only used by gcj. libgcj=3D"target-libffi \ @@ -1053,14 +1053,14 @@ noconfigdirs=3D"$noconfigdirs byacc" ;; i[3456789]86-*-vsta) - noconfigdirs=3D"$noconfigdirs tcl expect dejagnu make texinfo bison pa= tch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnus= erv gettext" + noconfigdirs=3D"$noconfigdirs tcl make texinfo bison patch flex byacc = send-pr gprof uudecode diff guile perl itcl tix gnuserv gettext" ;; i[3456789]86-*-go32* | i[3456789]86-*-msdosdjgpp*) - noconfigdirs=3D"$noconfigdirs tcl tk expect dejagnu send-pr uudecode g= uile itcl tix gnuserv libffi" + noconfigdirs=3D"$noconfigdirs tcl tk send-pr uudecode guile itcl tix g= nuserv libffi" ;; i[3456789]86-*-mingw32*) - # noconfigdirs=3D"tcl tk expect dejagnu make texinfo bison patch flex = byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv" - noconfigdirs=3D"$noconfigdirs expect dejagnu autoconf automake send-pr= rcs guile perl texinfo libtool" + # noconfigdirs=3D"tcl tk make texinfo bison patch flex byacc send-pr u= udecode diff guile perl itcl tix gnuserv" + noconfigdirs=3D"$noconfigdirs autoconf automake send-pr rcs guile perl= texinfo libtool" ;; i[3456789]86-*-beos*) noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb" @@ -1072,10 +1072,10 @@ noconfigdirs=3D"$noconfigdirs rcs" ;; ppc*-*-pe) - noconfigdirs=3D"$noconfigdirs patch diff make tk tcl expect dejagnu au= toconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" + noconfigdirs=3D"$noconfigdirs patch diff make tk tcl autoconf automake= texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" ;; powerpc-*-beos*) - noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb dejagnu readline" + noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb readline" ;; *-*-darwin*) noconfigdirs=3D"$noconfigdirs tk itcl tix libgui" @@ -1229,7 +1229,6 @@ noconfigdirs=3D"$noconfigdirs target-examples" noconfigdirs=3D"$noconfigdirs target-libiberty texinfo send-pr" noconfigdirs=3D"$noconfigdirs tcl tix tk itcl libgui sim" - noconfigdirs=3D"$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs=3D"$noconfigdirs target-libstdc++-v3" noconfigdirs=3D"$noconfigdirs target-newlib" @@ -1353,12 +1352,12 @@ ;; i[3456789]86-*-mingw32*) target_configdirs=3D"$target_configdirs target-mingw" - noconfigdirs=3D"$noconfigdirs expect target-libgloss ${libgcj}" + noconfigdirs=3D"$noconfigdirs target-libgloss ${libgcj}" =20 # Can't build gdb for mingw32 if not native. case "${host}" in - i[3456789]86-*-mingw32) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs=3D"$noconfigdirs gdb tcl tk expect itcl tix gnuserv" + i[3456789]86-*-mingw32) ;; # keep gdb tcl tk etc. + *) noconfigdirs=3D"$noconfigdirs gdb tcl tk itcl tix gnuserv" ;; esac ;;=20=20=20=20 @@ -1370,8 +1369,8 @@ =20 # Can't build gdb for Cygwin if not native. case "${host}" in - *-*-cygwin*) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs=3D"$noconfigdirs gdb tcl tk expect itcl tix libgui g= nuserv" + *-*-cygwin*) ;; # keep gdb tcl tk etc. + *) noconfigdirs=3D"$noconfigdirs gdb tcl tk itcl tix libgui gnuserv" ;; esac ;;=20=20=20=20 @@ -1427,13 +1426,13 @@ ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs=3D"$target_configdirs target-winsup" - noconfigdirs=3D"$noconfigdirs gdb tcl tk make expect target-libgloss i= tcl tix gnuserv ${libgcj}" + noconfigdirs=3D"$noconfigdirs gdb tcl tk make target-libgloss itcl tix= gnuserv ${libgcj}" # always build newlib. skipdirs=3D`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; # This is temporary until we can link against shared libraries powerpcle-*-solaris*) - noconfigdirs=3D"$noconfigdirs gdb sim make tcl tk expect itcl tix gnus= erv ${libgcj}" + noconfigdirs=3D"$noconfigdirs gdb sim make tcl tk itcl tix gnuserv ${l= ibgcj}" ;; powerpc-*-beos*) noconfigdirs=3D"$noconfigdirs gdb target-newlib target-libgloss ${libg= cj}" @@ -1887,7 +1886,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1891: checking for $ac_word" >&5 +echo "configure:1890: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1917,7 +1916,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1921: checking for $ac_word" >&5 +echo "configure:1920: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1968,7 +1967,7 @@ # Extract the first word of "cl", so it can be a program name with a= rgs. set dummy cl; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1972: checking for $ac_word" >&5 +echo "configure:1971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2000,7 +1999,7 @@ fi =20 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""= ... $ac_c" 1>&6 -echo "configure:2004: checking whether the C compiler ($CC $CFLAGS $LDFLAG= S) works" >&5 +echo "configure:2003: checking whether the C compiler ($CC $CFLAGS $LDFLAG= S) works" >&5 =20 ac_ext=3Dc # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2011,12 +2010,12 @@ =20 cat > conftest.$ac_ext << EOF =20 -#line 2015 "configure" +#line 2014 "configure" #include "confdefs.h" =20 main(){return(0);} EOF -if { (eval echo configure:2020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; = } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; = } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=3Dyes # If we can't run a trivial program, we are probably using a cross compi= ler. if (./conftest; exit) 2>/dev/null; then @@ -2042,12 +2041,12 @@ { echo "configure: error: installation or configuration problem: C compi= ler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cr= oss-compiler""... $ac_c" 1>&6 -echo "configure:2046: checking whether the C compiler ($CC $CFLAGS $LDFLAG= S) is a cross-compiler" >&5 +echo "configure:2045: checking whether the C compiler ($CC $CFLAGS $LDFLAG= S) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=3D$ac_cv_prog_cc_cross =20 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2051: checking whether we are using GNU C" >&5 +echo "configure:2050: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2056,7 +2055,7 @@ yes; #endif EOF -if { ac_try=3D'${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 +if { ac_try=3D'${CC-cc} -E conftest.c'; { (eval echo configure:2059: \"$ac= _try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=3Dyes else ac_cv_prog_gcc=3Dno @@ -2075,7 +2074,7 @@ ac_save_CFLAGS=3D"$CFLAGS" CFLAGS=3D echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2079: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2078: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2111,7 +2110,7 @@ # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a pr= ogram name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2115: checking for $ac_word" >&5 +echo "configure:2114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2143,7 +2142,7 @@ # Extract the first word of "gnatbind", so it can be a program name with= args. set dummy gnatbind; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2147: checking for $ac_word" >&5 +echo "configure:2146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2176,7 +2175,7 @@ fi =20 echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1= >&6 -echo "configure:2180: checking whether compiler driver understands Ada" >&5 +echo "configure:2179: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" =3D set";= then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2208,7 @@ fi =20 echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2213: checking how to compare bootstrapped objects" >&5 +echo "configure:2212: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2282,9 +2281,9 @@ CFLAGS=3D"$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2286: checking for correct version of gmp.h" >&5 +echo "configure:2285: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) = 2>&5; }; then +if { (eval echo configure:2298: \"$ac_compile\") 1>&5; (eval $ac_compile) = 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2308,19 +2307,19 @@ =20 if test x"$have_gmp" =3D xyes; then echo $ac_n "checking for mpf_init in -lgmp""... $ac_c" 1>&6 -echo "configure:2312: checking for mpf_init in -lgmp" >&5 +echo "configure:2311: checking for mpf_init in -lgmp" >&5 =20 saved_LIBS=3D"$LIBS" LIBS=3D"$LIBS $gmplibs" cat > conftest.$ac_ext < int main() { mpf_t n; mpf_init(n); ; return 0; } EOF -if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; = } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2323: \"$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 @@ -2782,7 +2781,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with a= rgs. set dummy $ac_prog; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2786: checking for $ac_word" >&5 +echo "configure:2785: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_YACC'+set}'`\" =3D set"; th= en echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2817,7 +2816,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with a= rgs. set dummy $ac_prog; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2821: checking for $ac_word" >&5 +echo "configure:2820: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_M4'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2852,7 +2851,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with a= rgs. set dummy $ac_prog; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2856: checking for $ac_word" >&5 +echo "configure:2855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_LEX'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3464,7 +3463,7 @@ # Extract the first word of "${ncn_tool_prefix}ar", so it can be a progr= am name with args. set dummy ${ncn_tool_prefix}ar; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3468: checking for $ac_word" >&5 +echo "configure:3467: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3497,7 +3496,7 @@ # Extract the first word of "ar", so it can be a program name with arg= s. set dummy ar; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3501: checking for $ac_word" >&5 +echo "configure:3500: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3536,7 +3535,7 @@ # Extract the first word of "${ncn_tool_prefix}as", so it can be a progr= am name with args. set dummy ${ncn_tool_prefix}as; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3540: checking for $ac_word" >&5 +echo "configure:3539: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3569,7 +3568,7 @@ # Extract the first word of "as", so it can be a program name with arg= s. set dummy as; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3573: checking for $ac_word" >&5 +echo "configure:3572: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3608,7 +3607,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3612: checking for $ac_word" >&5 +echo "configure:3611: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3641,7 +3640,7 @@ # Extract the first word of "dlltool", so it can be a program name wit= h args. set dummy dlltool; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3645: checking for $ac_word" >&5 +echo "configure:3644: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" =3D set"; = then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3680,7 +3679,7 @@ # Extract the first word of "${ncn_tool_prefix}ld", so it can be a progr= am name with args. set dummy ${ncn_tool_prefix}ld; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3684: checking for $ac_word" >&5 +echo "configure:3683: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3713,7 +3712,7 @@ # Extract the first word of "ld", so it can be a program name with arg= s. set dummy ld; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3717: checking for $ac_word" >&5 +echo "configure:3716: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3752,7 +3751,7 @@ # Extract the first word of "${ncn_tool_prefix}nm", so it can be a progr= am name with args. set dummy ${ncn_tool_prefix}nm; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3756: checking for $ac_word" >&5 +echo "configure:3755: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3785,7 +3784,7 @@ # Extract the first word of "nm", so it can be a program name with arg= s. set dummy nm; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3789: checking for $ac_word" >&5 +echo "configure:3788: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3824,7 +3823,7 @@ # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a p= rogram name with args. set dummy ${ncn_tool_prefix}ranlib; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3828: checking for $ac_word" >&5 +echo "configure:3827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3857,7 +3856,7 @@ # Extract the first word of "ranlib", so it can be a program name with= args. set dummy ranlib; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3861: checking for $ac_word" >&5 +echo "configure:3860: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" =3D set"; t= hen echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3896,7 +3895,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3900: checking for $ac_word" >&5 +echo "configure:3899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3929,7 +3928,7 @@ # Extract the first word of "windres", so it can be a program name wit= h args. set dummy windres; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3933: checking for $ac_word" >&5 +echo "configure:3932: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" =3D set"; = then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3968,7 +3967,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3972: checking for $ac_word" >&5 +echo "configure:3971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4001,7 +4000,7 @@ # Extract the first word of "objcopy", so it can be a program name wit= h args. set dummy objcopy; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4005: checking for $ac_word" >&5 +echo "configure:4004: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" =3D set"; = then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4040,7 +4039,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4044: checking for $ac_word" >&5 +echo "configure:4043: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4073,7 +4072,7 @@ # Extract the first word of "objdump", so it can be a program name wit= h args. set dummy objdump; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4077: checking for $ac_word" >&5 +echo "configure:4076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" =3D set"; = then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4122,7 +4121,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4126: checking for $ac_word" >&5 +echo "configure:4125: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4155,7 +4154,7 @@ # Extract the first word of "ar", so it can be a program name with arg= s. set dummy ar; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4159: checking for $ac_word" >&5 +echo "configure:4158: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+se= t}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4194,7 +4193,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4198: checking for $ac_word" >&5 +echo "configure:4197: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4227,7 +4226,7 @@ # Extract the first word of "as", so it can be a program name with arg= s. set dummy as; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4231: checking for $ac_word" >&5 +echo "configure:4230: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+se= t}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4266,7 +4265,7 @@ # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it ca= n be a program name with args. set dummy ${ncn_target_tool_prefix}dlltool; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4270: checking for $ac_word" >&5 +echo "configure:4269: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}= '`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4299,7 +4298,7 @@ # Extract the first word of "dlltool", so it can be a program name wit= h args. set dummy dlltool; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4303: checking for $ac_word" >&5 +echo "configure:4302: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGE= T'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4338,7 +4337,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4342: checking for $ac_word" >&5 +echo "configure:4341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4371,7 +4370,7 @@ # Extract the first word of "ld", so it can be a program name with arg= s. set dummy ld; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4375: checking for $ac_word" >&5 +echo "configure:4374: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+se= t}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4410,7 +4409,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4414: checking for $ac_word" >&5 +echo "configure:4413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4443,7 +4442,7 @@ # Extract the first word of "nm", so it can be a program name with arg= s. set dummy nm; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4447: checking for $ac_word" >&5 +echo "configure:4446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+se= t}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4482,7 +4481,7 @@ # 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=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4486: checking for $ac_word" >&5 +echo "configure:4485: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'= `\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4515,7 +4514,7 @@ # Extract the first word of "ranlib", so it can be a program name with= args. set dummy ranlib; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4519: checking for $ac_word" >&5 +echo "configure:4518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET= '+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4554,7 +4553,7 @@ # Extract the first word of "${ncn_target_tool_prefix}windres", so it ca= n be a program name with args. set dummy ${ncn_target_tool_prefix}windres; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4558: checking for $ac_word" >&5 +echo "configure:4557: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}= '`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4587,7 +4586,7 @@ # Extract the first word of "windres", so it can be a program name wit= h args. set dummy windres; ac_word=3D$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4591: checking for $ac_word" >&5 +echo "configure:4590: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGE= T'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4672,7 +4671,7 @@ NM_FOR_TARGET=3D${NM_FOR_TARGET}${extra_nmflags_for_target} =20 echo $ac_n "checking whether to enable maintainer-specific portions of Mak= efiles""... $ac_c" 1>&6 -echo "configure:4676: checking whether to enable maintainer-specific porti= ons of Makefiles" >&5 +echo "configure:4675: checking whether to enable maintainer-specific porti= ons of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was = given. if test "${enable_maintainer_mode+set}" =3D set; then enableval=3D"$enable_maintainer_mode" @@ -4719,7 +4718,7 @@ # 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:4723: checking if symbolic links between directories work"= >&5 +echo "configure:4722: checking if symbolic links between directories work"= >&5 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" =3D set"; then echo $ac_n "(cached) $ac_c" 1>&6 else Index: configure.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/configure.in,v retrieving revision 1.220 diff -u -r1.220 configure.in --- configure.in 9 Jun 2004 08:32:34 -0000 1.220 +++ configure.in 9 Jun 2004 23:17:25 -0000 @@ -135,7 +135,7 @@ # know that we are building the simulator. # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. -host_tools=3D"texinfo byacc flex bison binutils gas ld gcc sid sim gdb mak= e patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf au= tomake libtool diff rcs fileutils shellutils time textutils wdiff find uude= code hello tar gzip indent recode release sed utils guile perl gawk finduti= ls gettext zip fastjar" +host_tools=3D"texinfo byacc flex bison binutils gas ld gcc sid sim gdb mak= e patch prms send-pr gprof etc ash bash bzip2 m4 autoconf automake libtool = diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar = gzip indent recode release sed utils guile perl gawk findutils gettext zip = fastjar" =20 # libgcj represents the runtime libraries only used by gcj. libgcj=3D"target-libffi \ @@ -281,14 +281,14 @@ noconfigdirs=3D"$noconfigdirs byacc" ;; i[[3456789]]86-*-vsta) - noconfigdirs=3D"$noconfigdirs tcl expect dejagnu make texinfo bison pa= tch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnus= erv gettext" + noconfigdirs=3D"$noconfigdirs tcl make texinfo bison patch flex byacc = send-pr gprof uudecode diff guile perl itcl tix gnuserv gettext" ;; i[[3456789]]86-*-go32* | i[[3456789]]86-*-msdosdjgpp*) - noconfigdirs=3D"$noconfigdirs tcl tk expect dejagnu send-pr uudecode g= uile itcl tix gnuserv libffi" + noconfigdirs=3D"$noconfigdirs tcl tk send-pr uudecode guile itcl tix g= nuserv libffi" ;; i[[3456789]]86-*-mingw32*) - # noconfigdirs=3D"tcl tk expect dejagnu make texinfo bison patch flex = byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv" - noconfigdirs=3D"$noconfigdirs expect dejagnu autoconf automake send-pr= rcs guile perl texinfo libtool" + # noconfigdirs=3D"tcl tk make texinfo bison patch flex byacc send-pr u= udecode diff guile perl itcl tix gnuserv" + noconfigdirs=3D"$noconfigdirs autoconf automake send-pr rcs guile perl= texinfo libtool" ;; i[[3456789]]86-*-beos*) noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb" @@ -300,10 +300,10 @@ noconfigdirs=3D"$noconfigdirs rcs" ;; ppc*-*-pe) - noconfigdirs=3D"$noconfigdirs patch diff make tk tcl expect dejagnu au= toconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" + noconfigdirs=3D"$noconfigdirs patch diff make tk tcl autoconf automake= texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" ;; powerpc-*-beos*) - noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb dejagnu readline" + noconfigdirs=3D"$noconfigdirs tk itcl tix libgui gdb readline" ;; *-*-darwin*) noconfigdirs=3D"$noconfigdirs tk itcl tix libgui" @@ -449,7 +449,6 @@ noconfigdirs=3D"$noconfigdirs target-examples" noconfigdirs=3D"$noconfigdirs target-libiberty texinfo send-pr" noconfigdirs=3D"$noconfigdirs tcl tix tk itcl libgui sim" - noconfigdirs=3D"$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs=3D"$noconfigdirs target-libstdc++-v3" noconfigdirs=3D"$noconfigdirs target-newlib" @@ -573,12 +572,12 @@ ;; i[[3456789]]86-*-mingw32*) target_configdirs=3D"$target_configdirs target-mingw" - noconfigdirs=3D"$noconfigdirs expect target-libgloss ${libgcj}" + noconfigdirs=3D"$noconfigdirs target-libgloss ${libgcj}" =20 # Can't build gdb for mingw32 if not native. case "${host}" in - i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs=3D"$noconfigdirs gdb tcl tk expect itcl tix gnuserv" + i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk etc. + *) noconfigdirs=3D"$noconfigdirs gdb tcl tk itcl tix gnuserv" ;; esac ;;=20=20=20=20 @@ -590,8 +589,8 @@ =20 # Can't build gdb for Cygwin if not native. case "${host}" in - *-*-cygwin*) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs=3D"$noconfigdirs gdb tcl tk expect itcl tix libgui g= nuserv" + *-*-cygwin*) ;; # keep gdb tcl tk etc. + *) noconfigdirs=3D"$noconfigdirs gdb tcl tk itcl tix libgui gnuserv" ;; esac ;;=20=20=20=20 @@ -647,13 +646,13 @@ ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs=3D"$target_configdirs target-winsup" - noconfigdirs=3D"$noconfigdirs gdb tcl tk make expect target-libgloss i= tcl tix gnuserv ${libgcj}" + noconfigdirs=3D"$noconfigdirs gdb tcl tk make target-libgloss itcl tix= gnuserv ${libgcj}" # always build newlib. skipdirs=3D`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; # This is temporary until we can link against shared libraries powerpcle-*-solaris*) - noconfigdirs=3D"$noconfigdirs gdb sim make tcl tk expect itcl tix gnus= erv ${libgcj}" + noconfigdirs=3D"$noconfigdirs gdb sim make tcl tk itcl tix gnuserv ${l= ibgcj}" ;; powerpc-*-beos*) noconfigdirs=3D"$noconfigdirs gdb target-newlib target-libgloss ${libg= cj}" Index: src-release =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/src-release,v retrieving revision 1.11 diff -u -r1.11 src-release --- src-release 25 Mar 2004 17:51:10 -0000 1.11 +++ src-release 9 Jun 2004 23:17:25 -0000 @@ -159,14 +159,6 @@ done cd etc && $(MAKE) info $(MAKE) distclean - # Kludge for pr gdb/708. 'configure' configures in - # dejagnu/example/calc, but 'make distclean' does not clean in - # dejagnu/example. Someday somebody might fix this in dejagnu, - # and then import a new dejagnu into sourceware. Right now, a - # couple of 'rm' commands will get the gdb snapshots working - # again. -- chastain 2003-08-15 - rm -f dejagnu/example/calc/config.status - rm -f dejagnu/example/calc/config.log # Kludge for pr gdb/857. intl/Makefile.in lacks a couple # of files in the distclean rule. Zack W is planning to make # the gcc version of intl/ the master version and then push @@ -284,30 +276,6 @@ MD5PROG=3D"$(MD5PROG)" \ SUPPORT_FILES=3D"$(GDB_SUPPORT_DIRS)" =20 -DEJAGNU_SUPPORT_DIRS=3D tcl expect libiberty -.PHONY: dejagnu.tar.bz2 -dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu - $(MAKE) -f $(SELF) gdb-taz TOOL=3Ddejagnu \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(DEJAGNU_SUPPORT_DIRS)" -.PHONY: dejagnu.tar -dejagnu.tar: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu - $(MAKE) -f $(SELF) gdb-tar TOOL=3Ddejagnu \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(DEJAGNU_SUPPORT_DIRS)" - -.PHONY: gdb+dejagnu.tar.bz2 -GDBD_SUPPORT_DIRS=3D $(GDB_SUPPORT_DIRS) tcl expect dejagnu -gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-taz TOOL=3Dgdb PACKAGE=3Dgdb+dejagnu \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(GDBD_SUPPORT_DIRS)" -.PHONY: gdb+dejagnu.tar -gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-tar TOOL=3Dgdb PACKAGE=3Dgdb+dejagnu \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(GDBD_SUPPORT_DIRS)" - .PHONY: insight.tar.bz2 INSIGHT_SUPPORT_DIRS=3D $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb @@ -320,17 +288,5 @@ MD5PROG=3D"$(MD5PROG)" \ SUPPORT_FILES=3D"$(INSIGHT_SUPPORT_DIRS)" =20 -.PHONY: insight+dejagnu.tar.bz2 -INSIGHTD_SUPPORT_DIRS=3D $(INSIGHT_SUPPORT_DIRS) expect dejagnu -insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-taz TOOL=3Dgdb PACKAGE=3D"insight+dejagnu" \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(INSIGHTD_SUPPORT_DIRS)" -.PHONY: insight+dejagnu.tar -insight+dejagnu.tar: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-tar TOOL=3Dgdb PACKAGE=3D"insight+dejagnu" \ - MD5PROG=3D"$(MD5PROG)" \ - SUPPORT_FILES=3D"$(INSIGHTD_SUPPORT_DIRS)" - .NOEXPORT: MAKEOVERRIDES=3D --IJpNTDwzlM2Ie8A6 Content-Type: application/pgp-signature Content-Disposition: inline Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (GNU/Linux) iD8DBQFAx5uvbNtDbHIEhSURAtAQAKDngrTO/BMc3wX8FP27ks8L0uXrBACfXqy5 TTUm9+oornuahqF6G1IcF2I= =QE97 -----END PGP SIGNATURE----- --IJpNTDwzlM2Ie8A6--