diff --git a/ChangeLog b/ChangeLog
index 238864b20..01fc7a5df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Switch more things to use maybe dependencies.
+	* Makefile.tpl: Switch more things to use maybe dependencies.  
+	Factor out common code from autogen IF statements.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
 2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
 
 	* configure.in: Accept i[3456789]86 for machine type.
diff --git a/Makefile.in b/Makefile.in
index d90b1aeac..a98c09970 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1331,8 +1331,87 @@ check:
 	$(MAKE) do-check NOTPARALLEL=parallel-ok
 
 # Only include modules actually being configured and built.
-do-check: @check_host_modules@ \
-	@check_target_modules@
+do-check: maybe-check-gcc  \
+    maybe-check-ash \
+    maybe-check-autoconf \
+    maybe-check-automake \
+    maybe-check-bash \
+    maybe-check-bfd \
+    maybe-check-opcodes \
+    maybe-check-binutils \
+    maybe-check-bison \
+    maybe-check-byacc \
+    maybe-check-bzip2 \
+    maybe-check-dejagnu \
+    maybe-check-diff \
+    maybe-check-dosutils \
+    maybe-check-etc \
+    maybe-check-fastjar \
+    maybe-check-fileutils \
+    maybe-check-findutils \
+    maybe-check-find \
+    maybe-check-flex \
+    maybe-check-gas \
+    maybe-check-gawk \
+    maybe-check-gettext \
+    maybe-check-gnuserv \
+    maybe-check-gprof \
+    maybe-check-gzip \
+    maybe-check-hello \
+    maybe-check-indent \
+    maybe-check-intl \
+    maybe-check-tcl \
+    maybe-check-itcl \
+    maybe-check-ld \
+    maybe-check-libgui \
+    maybe-check-libiberty \
+    maybe-check-libtool \
+    maybe-check-m4 \
+    maybe-check-make \
+    maybe-check-mmalloc \
+    maybe-check-patch \
+    maybe-check-perl \
+    maybe-check-prms \
+    maybe-check-rcs \
+    maybe-check-readline \
+    maybe-check-release \
+    maybe-check-recode \
+    maybe-check-sed \
+    maybe-check-send-pr \
+    maybe-check-shellutils \
+    maybe-check-sid \
+    maybe-check-sim \
+    maybe-check-tar \
+    maybe-check-texinfo \
+    maybe-check-textutils \
+    maybe-check-time \
+    maybe-check-uudecode \
+    maybe-check-wdiff \
+    maybe-check-zip \
+    maybe-check-zlib \
+    maybe-check-gdb \
+    maybe-check-expect \
+    maybe-check-guile \
+    maybe-check-tk \
+    maybe-check-tix \
+    maybe-check-libtermcap \
+    maybe-check-utils \
+    maybe-check-target-libstdc++-v3 \
+    maybe-check-target-newlib \
+    maybe-check-target-libf2c \
+    maybe-check-target-libobjc \
+    maybe-check-target-libtermcap \
+    maybe-check-target-winsup \
+    maybe-check-target-libgloss \
+    maybe-check-target-libiberty \
+    maybe-check-target-gperf \
+    maybe-check-target-examples \
+    maybe-check-target-libffi \
+    maybe-check-target-libjava \
+    maybe-check-target-zlib \
+    maybe-check-target-boehm-gc \
+    maybe-check-target-qthreads \
+    maybe-check-target-rda
 
 # Automated reporting of test results.
 
@@ -1360,6 +1439,73 @@ mail-report-with-warnings.log: warning.log
 .PHONY: install uninstall
 install: installdirs install-host install-target
 
+.PHONY: install-host-nogcc
+install-host-nogcc:  \
+    maybe-install-ash \
+    maybe-install-autoconf \
+    maybe-install-automake \
+    maybe-install-bash \
+    maybe-install-bfd \
+    maybe-install-opcodes \
+    maybe-install-binutils \
+    maybe-install-bison \
+    maybe-install-byacc \
+    maybe-install-bzip2 \
+    maybe-install-dejagnu \
+    maybe-install-diff \
+    maybe-install-dosutils \
+    maybe-install-etc \
+    maybe-install-fastjar \
+    maybe-install-fileutils \
+    maybe-install-findutils \
+    maybe-install-find \
+    maybe-install-flex \
+    maybe-install-gas \
+    maybe-install-gawk \
+    maybe-install-gettext \
+    maybe-install-gnuserv \
+    maybe-install-gprof \
+    maybe-install-gzip \
+    maybe-install-hello \
+    maybe-install-indent \
+    maybe-install-intl \
+    maybe-install-tcl \
+    maybe-install-itcl \
+    maybe-install-ld \
+    maybe-install-libgui \
+    maybe-install-libiberty \
+    maybe-install-libtool \
+    maybe-install-m4 \
+    maybe-install-make \
+    maybe-install-mmalloc \
+    maybe-install-patch \
+    maybe-install-perl \
+    maybe-install-prms \
+    maybe-install-rcs \
+    maybe-install-readline \
+    maybe-install-release \
+    maybe-install-recode \
+    maybe-install-sed \
+    maybe-install-send-pr \
+    maybe-install-shellutils \
+    maybe-install-sid \
+    maybe-install-sim \
+    maybe-install-tar \
+    maybe-install-texinfo \
+    maybe-install-textutils \
+    maybe-install-time \
+    maybe-install-uudecode \
+    maybe-install-wdiff \
+    maybe-install-zip \
+    maybe-install-zlib \
+    maybe-install-gdb \
+    maybe-install-expect \
+    maybe-install-guile \
+    maybe-install-tk \
+    maybe-install-tix \
+    maybe-install-libtermcap \
+    maybe-install-utils
+
 .PHONY: install-host
 install-host: maybe-install-gcc  \
     maybe-install-ash \
@@ -1426,6 +1572,7 @@ install-host: maybe-install-gcc  \
     maybe-install-tix \
     maybe-install-libtermcap \
     maybe-install-utils
+
 .PHONY: install-target
 install-target:  \
     maybe-install-target-libstdc++-v3 \
@@ -1462,7 +1609,7 @@ install.all: install-no-fixedincludes
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
-install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
+install-no-fixedincludes: installdirs install-host-nogcc \
 	install-target gcc-no-fixedincludes
 
 ### other supporting targets
@@ -1621,8 +1768,9 @@ all-ash: configure-ash
 	$(SET_LIB_PATH) \
 	(cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-ash maybe-check-ash
+maybe-check-ash:
 
-.PHONY: check-ash
 check-ash:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1630,9 +1778,9 @@ check-ash:
 	(cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-ash maybe-install-ash
 maybe-install-ash:
+
 install-ash: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1688,8 +1836,9 @@ all-autoconf: configure-autoconf
 	$(SET_LIB_PATH) \
 	(cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-autoconf maybe-check-autoconf
+maybe-check-autoconf:
 
-.PHONY: check-autoconf
 check-autoconf:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1697,9 +1846,9 @@ check-autoconf:
 	(cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-autoconf maybe-install-autoconf
 maybe-install-autoconf:
+
 install-autoconf: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1755,8 +1904,9 @@ all-automake: configure-automake
 	$(SET_LIB_PATH) \
 	(cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-automake maybe-check-automake
+maybe-check-automake:
 
-.PHONY: check-automake
 check-automake:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1764,9 +1914,9 @@ check-automake:
 	(cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-automake maybe-install-automake
 maybe-install-automake:
+
 install-automake: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1822,8 +1972,9 @@ all-bash: configure-bash
 	$(SET_LIB_PATH) \
 	(cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-bash maybe-check-bash
+maybe-check-bash:
 
-.PHONY: check-bash
 check-bash:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1831,9 +1982,9 @@ check-bash:
 	(cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-bash maybe-install-bash
 maybe-install-bash:
+
 install-bash: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1889,8 +2040,9 @@ all-bfd: configure-bfd
 	$(SET_LIB_PATH) \
 	(cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-bfd maybe-check-bfd
+maybe-check-bfd:
 
-.PHONY: check-bfd
 check-bfd:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1898,9 +2050,9 @@ check-bfd:
 	(cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-bfd maybe-install-bfd
 maybe-install-bfd:
+
 install-bfd: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1956,8 +2108,9 @@ all-opcodes: configure-opcodes
 	$(SET_LIB_PATH) \
 	(cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-opcodes maybe-check-opcodes
+maybe-check-opcodes:
 
-.PHONY: check-opcodes
 check-opcodes:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1965,9 +2118,9 @@ check-opcodes:
 	(cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-opcodes maybe-install-opcodes
 maybe-install-opcodes:
+
 install-opcodes: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2023,8 +2176,9 @@ all-binutils: configure-binutils
 	$(SET_LIB_PATH) \
 	(cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-binutils maybe-check-binutils
+maybe-check-binutils:
 
-.PHONY: check-binutils
 check-binutils:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2032,9 +2186,9 @@ check-binutils:
 	(cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-binutils maybe-install-binutils
 maybe-install-binutils:
+
 install-binutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2090,8 +2244,9 @@ all-bison: configure-bison
 	$(SET_LIB_PATH) \
 	(cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-bison maybe-check-bison
+maybe-check-bison:
 
-.PHONY: check-bison
 # This module is only tested in a native toolchain.
 check-bison:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -2102,9 +2257,9 @@ check-bison:
 	fi
 
 
-
 .PHONY: install-bison maybe-install-bison
 maybe-install-bison:
+
 install-bison: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2160,8 +2315,9 @@ all-byacc: configure-byacc
 	$(SET_LIB_PATH) \
 	(cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-byacc maybe-check-byacc
+maybe-check-byacc:
 
-.PHONY: check-byacc
 # This module is only tested in a native toolchain.
 check-byacc:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -2172,9 +2328,9 @@ check-byacc:
 	fi
 
 
-
 .PHONY: install-byacc maybe-install-byacc
 maybe-install-byacc:
+
 install-byacc: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2230,8 +2386,9 @@ all-bzip2: configure-bzip2
 	$(SET_LIB_PATH) \
 	(cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-bzip2 maybe-check-bzip2
+maybe-check-bzip2:
 
-.PHONY: check-bzip2
 check-bzip2:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2239,9 +2396,9 @@ check-bzip2:
 	(cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-bzip2 maybe-install-bzip2
 maybe-install-bzip2:
+
 install-bzip2: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2297,8 +2454,9 @@ all-dejagnu: configure-dejagnu
 	$(SET_LIB_PATH) \
 	(cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-dejagnu maybe-check-dejagnu
+maybe-check-dejagnu:
 
-.PHONY: check-dejagnu
 check-dejagnu:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2306,9 +2464,9 @@ check-dejagnu:
 	(cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-dejagnu maybe-install-dejagnu
 maybe-install-dejagnu:
+
 install-dejagnu: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2364,8 +2522,9 @@ all-diff: configure-diff
 	$(SET_LIB_PATH) \
 	(cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-diff maybe-check-diff
+maybe-check-diff:
 
-.PHONY: check-diff
 check-diff:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2373,9 +2532,9 @@ check-diff:
 	(cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-diff maybe-install-diff
 maybe-install-diff:
+
 install-diff: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2431,14 +2590,15 @@ all-dosutils: configure-dosutils
 	$(SET_LIB_PATH) \
 	(cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-dosutils maybe-check-dosutils
+maybe-check-dosutils:
 
-.PHONY: check-dosutils
 check-dosutils:
 
 
-
 .PHONY: install-dosutils maybe-install-dosutils
 maybe-install-dosutils:
+
 install-dosutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2494,8 +2654,9 @@ all-etc: configure-etc
 	$(SET_LIB_PATH) \
 	(cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-etc maybe-check-etc
+maybe-check-etc:
 
-.PHONY: check-etc
 check-etc:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2503,9 +2664,9 @@ check-etc:
 	(cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-etc maybe-install-etc
 maybe-install-etc:
+
 install-etc: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2561,8 +2722,9 @@ all-fastjar: configure-fastjar
 	$(SET_LIB_PATH) \
 	(cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-fastjar maybe-check-fastjar
+maybe-check-fastjar:
 
-.PHONY: check-fastjar
 # This module is only tested in a native toolchain.
 check-fastjar:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -2573,9 +2735,9 @@ check-fastjar:
 	fi
 
 
-
 .PHONY: install-fastjar maybe-install-fastjar
 maybe-install-fastjar:
+
 install-fastjar: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2631,8 +2793,9 @@ all-fileutils: configure-fileutils
 	$(SET_LIB_PATH) \
 	(cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-fileutils maybe-check-fileutils
+maybe-check-fileutils:
 
-.PHONY: check-fileutils
 check-fileutils:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2640,9 +2803,9 @@ check-fileutils:
 	(cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-fileutils maybe-install-fileutils
 maybe-install-fileutils:
+
 install-fileutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2698,8 +2861,9 @@ all-findutils: configure-findutils
 	$(SET_LIB_PATH) \
 	(cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-findutils maybe-check-findutils
+maybe-check-findutils:
 
-.PHONY: check-findutils
 check-findutils:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2707,9 +2871,9 @@ check-findutils:
 	(cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-findutils maybe-install-findutils
 maybe-install-findutils:
+
 install-findutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2765,8 +2929,9 @@ all-find: configure-find
 	$(SET_LIB_PATH) \
 	(cd find && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-find maybe-check-find
+maybe-check-find:
 
-.PHONY: check-find
 check-find:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2774,9 +2939,9 @@ check-find:
 	(cd find && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-find maybe-install-find
 maybe-install-find:
+
 install-find: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2832,8 +2997,9 @@ all-flex: configure-flex
 	$(SET_LIB_PATH) \
 	(cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-flex maybe-check-flex
+maybe-check-flex:
 
-.PHONY: check-flex
 # This module is only tested in a native toolchain.
 check-flex:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -2844,9 +3010,9 @@ check-flex:
 	fi
 
 
-
 .PHONY: install-flex maybe-install-flex
 maybe-install-flex:
+
 install-flex: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2902,8 +3068,9 @@ all-gas: configure-gas
 	$(SET_LIB_PATH) \
 	(cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gas maybe-check-gas
+maybe-check-gas:
 
-.PHONY: check-gas
 check-gas:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2911,9 +3078,9 @@ check-gas:
 	(cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gas maybe-install-gas
 maybe-install-gas:
+
 install-gas: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2969,8 +3136,9 @@ all-gawk: configure-gawk
 	$(SET_LIB_PATH) \
 	(cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gawk maybe-check-gawk
+maybe-check-gawk:
 
-.PHONY: check-gawk
 check-gawk:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -2978,9 +3146,9 @@ check-gawk:
 	(cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gawk maybe-install-gawk
 maybe-install-gawk:
+
 install-gawk: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3036,8 +3204,9 @@ all-gettext: configure-gettext
 	$(SET_LIB_PATH) \
 	(cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gettext maybe-check-gettext
+maybe-check-gettext:
 
-.PHONY: check-gettext
 check-gettext:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3045,9 +3214,9 @@ check-gettext:
 	(cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gettext maybe-install-gettext
 maybe-install-gettext:
+
 install-gettext: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3103,8 +3272,9 @@ all-gnuserv: configure-gnuserv
 	$(SET_LIB_PATH) \
 	(cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gnuserv maybe-check-gnuserv
+maybe-check-gnuserv:
 
-.PHONY: check-gnuserv
 check-gnuserv:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3112,9 +3282,9 @@ check-gnuserv:
 	(cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gnuserv maybe-install-gnuserv
 maybe-install-gnuserv:
+
 install-gnuserv: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3170,8 +3340,9 @@ all-gprof: configure-gprof
 	$(SET_LIB_PATH) \
 	(cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
 
-.PHONY: check-gprof
 check-gprof:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3179,9 +3350,9 @@ check-gprof:
 	(cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gprof maybe-install-gprof
 maybe-install-gprof:
+
 install-gprof: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3237,8 +3408,9 @@ all-gzip: configure-gzip
 	$(SET_LIB_PATH) \
 	(cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-gzip maybe-check-gzip
+maybe-check-gzip:
 
-.PHONY: check-gzip
 check-gzip:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3246,9 +3418,9 @@ check-gzip:
 	(cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gzip maybe-install-gzip
 maybe-install-gzip:
+
 install-gzip: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3304,8 +3476,9 @@ all-hello: configure-hello
 	$(SET_LIB_PATH) \
 	(cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-hello maybe-check-hello
+maybe-check-hello:
 
-.PHONY: check-hello
 check-hello:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3313,9 +3486,9 @@ check-hello:
 	(cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-hello maybe-install-hello
 maybe-install-hello:
+
 install-hello: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3371,8 +3544,9 @@ all-indent: configure-indent
 	$(SET_LIB_PATH) \
 	(cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-indent maybe-check-indent
+maybe-check-indent:
 
-.PHONY: check-indent
 check-indent:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3380,9 +3554,9 @@ check-indent:
 	(cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-indent maybe-install-indent
 maybe-install-indent:
+
 install-indent: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3438,8 +3612,9 @@ all-intl: configure-intl
 	$(SET_LIB_PATH) \
 	(cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-intl maybe-check-intl
+maybe-check-intl:
 
-.PHONY: check-intl
 check-intl:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3447,9 +3622,9 @@ check-intl:
 	(cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-intl maybe-install-intl
 maybe-install-intl:
+
 install-intl: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3505,8 +3680,9 @@ all-tcl: configure-tcl
 	$(SET_LIB_PATH) \
 	(cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-tcl maybe-check-tcl
+maybe-check-tcl:
 
-.PHONY: check-tcl
 check-tcl:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3514,9 +3690,9 @@ check-tcl:
 	(cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-tcl maybe-install-tcl
 maybe-install-tcl:
+
 install-tcl: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3572,8 +3748,9 @@ all-itcl: configure-itcl
 	$(SET_LIB_PATH) \
 	(cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-itcl maybe-check-itcl
+maybe-check-itcl:
 
-.PHONY: check-itcl
 check-itcl:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3581,9 +3758,9 @@ check-itcl:
 	(cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-itcl maybe-install-itcl
 maybe-install-itcl:
+
 install-itcl: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3639,8 +3816,9 @@ all-ld: configure-ld
 	$(SET_LIB_PATH) \
 	(cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
 
-.PHONY: check-ld
 check-ld:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3648,9 +3826,9 @@ check-ld:
 	(cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-ld maybe-install-ld
 maybe-install-ld:
+
 install-ld: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3706,8 +3884,9 @@ all-libgui: configure-libgui
 	$(SET_LIB_PATH) \
 	(cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
 
-.PHONY: check-libgui
 check-libgui:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3715,9 +3894,9 @@ check-libgui:
 	(cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-libgui maybe-install-libgui
 maybe-install-libgui:
+
 install-libgui: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3773,8 +3952,9 @@ all-libiberty: configure-libiberty
 	$(SET_LIB_PATH) \
 	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
 
-.PHONY: check-libiberty
 check-libiberty:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3782,9 +3962,9 @@ check-libiberty:
 	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-libiberty maybe-install-libiberty
 maybe-install-libiberty:
+
 install-libiberty: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3840,8 +4020,9 @@ all-libtool: configure-libtool
 	$(SET_LIB_PATH) \
 	(cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-libtool maybe-check-libtool
+maybe-check-libtool:
 
-.PHONY: check-libtool
 check-libtool:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3849,9 +4030,9 @@ check-libtool:
 	(cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-libtool maybe-install-libtool
 maybe-install-libtool:
+
 install-libtool: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3907,8 +4088,9 @@ all-m4: configure-m4
 	$(SET_LIB_PATH) \
 	(cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
 
-.PHONY: check-m4
 check-m4:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3916,9 +4098,9 @@ check-m4:
 	(cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-m4 maybe-install-m4
 maybe-install-m4:
+
 install-m4: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3974,8 +4156,9 @@ all-make: configure-make
 	$(SET_LIB_PATH) \
 	(cd make && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-make maybe-check-make
+maybe-check-make:
 
-.PHONY: check-make
 check-make:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -3983,9 +4166,9 @@ check-make:
 	(cd make && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-make maybe-install-make
 maybe-install-make:
+
 install-make: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4041,14 +4224,15 @@ all-mmalloc: configure-mmalloc
 	$(SET_LIB_PATH) \
 	(cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-mmalloc maybe-check-mmalloc
+maybe-check-mmalloc:
 
-.PHONY: check-mmalloc
 check-mmalloc:
 
 
-
 .PHONY: install-mmalloc maybe-install-mmalloc
 maybe-install-mmalloc:
+
 install-mmalloc: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4104,8 +4288,9 @@ all-patch: configure-patch
 	$(SET_LIB_PATH) \
 	(cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-patch maybe-check-patch
+maybe-check-patch:
 
-.PHONY: check-patch
 check-patch:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4113,9 +4298,9 @@ check-patch:
 	(cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-patch maybe-install-patch
 maybe-install-patch:
+
 install-patch: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4171,8 +4356,9 @@ all-perl: configure-perl
 	$(SET_LIB_PATH) \
 	(cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-perl maybe-check-perl
+maybe-check-perl:
 
-.PHONY: check-perl
 check-perl:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4180,9 +4366,9 @@ check-perl:
 	(cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-perl maybe-install-perl
 maybe-install-perl:
+
 install-perl: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4238,8 +4424,9 @@ all-prms: configure-prms
 	$(SET_LIB_PATH) \
 	(cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-prms maybe-check-prms
+maybe-check-prms:
 
-.PHONY: check-prms
 check-prms:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4247,9 +4434,9 @@ check-prms:
 	(cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-prms maybe-install-prms
 maybe-install-prms:
+
 install-prms: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4305,8 +4492,9 @@ all-rcs: configure-rcs
 	$(SET_LIB_PATH) \
 	(cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-rcs maybe-check-rcs
+maybe-check-rcs:
 
-.PHONY: check-rcs
 check-rcs:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4314,9 +4502,9 @@ check-rcs:
 	(cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-rcs maybe-install-rcs
 maybe-install-rcs:
+
 install-rcs: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4372,8 +4560,9 @@ all-readline: configure-readline
 	$(SET_LIB_PATH) \
 	(cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-readline maybe-check-readline
+maybe-check-readline:
 
-.PHONY: check-readline
 check-readline:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4381,9 +4570,9 @@ check-readline:
 	(cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-readline maybe-install-readline
 maybe-install-readline:
+
 install-readline: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4439,14 +4628,15 @@ all-release: configure-release
 	$(SET_LIB_PATH) \
 	(cd release && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-release maybe-check-release
+maybe-check-release:
 
-.PHONY: check-release
 check-release:
 
 
-
 .PHONY: install-release maybe-install-release
 maybe-install-release:
+
 install-release:
 
 
@@ -4498,8 +4688,9 @@ all-recode: configure-recode
 	$(SET_LIB_PATH) \
 	(cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-recode maybe-check-recode
+maybe-check-recode:
 
-.PHONY: check-recode
 check-recode:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4507,9 +4698,9 @@ check-recode:
 	(cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-recode maybe-install-recode
 maybe-install-recode:
+
 install-recode: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4565,8 +4756,9 @@ all-sed: configure-sed
 	$(SET_LIB_PATH) \
 	(cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-sed maybe-check-sed
+maybe-check-sed:
 
-.PHONY: check-sed
 check-sed:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4574,9 +4766,9 @@ check-sed:
 	(cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-sed maybe-install-sed
 maybe-install-sed:
+
 install-sed: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4632,8 +4824,9 @@ all-send-pr: configure-send-pr
 	$(SET_LIB_PATH) \
 	(cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-send-pr maybe-check-send-pr
+maybe-check-send-pr:
 
-.PHONY: check-send-pr
 check-send-pr:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4641,9 +4834,9 @@ check-send-pr:
 	(cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-send-pr maybe-install-send-pr
 maybe-install-send-pr:
+
 install-send-pr: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4699,8 +4892,9 @@ all-shellutils: configure-shellutils
 	$(SET_LIB_PATH) \
 	(cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-shellutils maybe-check-shellutils
+maybe-check-shellutils:
 
-.PHONY: check-shellutils
 check-shellutils:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4708,9 +4902,9 @@ check-shellutils:
 	(cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-shellutils maybe-install-shellutils
 maybe-install-shellutils:
+
 install-shellutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4766,8 +4960,9 @@ all-sid: configure-sid
 	$(SET_LIB_PATH) \
 	(cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-sid maybe-check-sid
+maybe-check-sid:
 
-.PHONY: check-sid
 check-sid:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4775,9 +4970,9 @@ check-sid:
 	(cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-sid maybe-install-sid
 maybe-install-sid:
+
 install-sid: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4833,8 +5028,9 @@ all-sim: configure-sim
 	$(SET_LIB_PATH) \
 	(cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-sim maybe-check-sim
+maybe-check-sim:
 
-.PHONY: check-sim
 check-sim:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4842,9 +5038,9 @@ check-sim:
 	(cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-sim maybe-install-sim
 maybe-install-sim:
+
 install-sim: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4900,8 +5096,9 @@ all-tar: configure-tar
 	$(SET_LIB_PATH) \
 	(cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-tar maybe-check-tar
+maybe-check-tar:
 
-.PHONY: check-tar
 check-tar:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4909,9 +5106,9 @@ check-tar:
 	(cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-tar maybe-install-tar
 maybe-install-tar:
+
 install-tar: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4967,8 +5164,9 @@ all-texinfo: configure-texinfo
 	$(SET_LIB_PATH) \
 	(cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-texinfo maybe-check-texinfo
+maybe-check-texinfo:
 
-.PHONY: check-texinfo
 check-texinfo:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -4976,9 +5174,9 @@ check-texinfo:
 	(cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-texinfo maybe-install-texinfo
 maybe-install-texinfo:
+
 install-texinfo:
 
 
@@ -5030,8 +5228,9 @@ all-textutils: configure-textutils
 	$(SET_LIB_PATH) \
 	(cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-textutils maybe-check-textutils
+maybe-check-textutils:
 
-.PHONY: check-textutils
 check-textutils:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5039,9 +5238,9 @@ check-textutils:
 	(cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-textutils maybe-install-textutils
 maybe-install-textutils:
+
 install-textutils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5097,8 +5296,9 @@ all-time: configure-time
 	$(SET_LIB_PATH) \
 	(cd time && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-time maybe-check-time
+maybe-check-time:
 
-.PHONY: check-time
 check-time:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5106,9 +5306,9 @@ check-time:
 	(cd time && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-time maybe-install-time
 maybe-install-time:
+
 install-time: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5164,8 +5364,9 @@ all-uudecode: configure-uudecode
 	$(SET_LIB_PATH) \
 	(cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-uudecode maybe-check-uudecode
+maybe-check-uudecode:
 
-.PHONY: check-uudecode
 check-uudecode:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5173,9 +5374,9 @@ check-uudecode:
 	(cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-uudecode maybe-install-uudecode
 maybe-install-uudecode:
+
 install-uudecode: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5231,8 +5432,9 @@ all-wdiff: configure-wdiff
 	$(SET_LIB_PATH) \
 	(cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-wdiff maybe-check-wdiff
+maybe-check-wdiff:
 
-.PHONY: check-wdiff
 check-wdiff:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5240,9 +5442,9 @@ check-wdiff:
 	(cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-wdiff maybe-install-wdiff
 maybe-install-wdiff:
+
 install-wdiff: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5298,8 +5500,9 @@ all-zip: configure-zip
 	$(SET_LIB_PATH) \
 	(cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-zip maybe-check-zip
+maybe-check-zip:
 
-.PHONY: check-zip
 # This module is only tested in a native toolchain.
 check-zip:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -5310,9 +5513,9 @@ check-zip:
 	fi
 
 
-
 .PHONY: install-zip maybe-install-zip
 maybe-install-zip:
+
 install-zip: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5368,14 +5571,15 @@ all-zlib: configure-zlib
 	$(SET_LIB_PATH) \
 	(cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-zlib maybe-check-zlib
+maybe-check-zlib:
 
-.PHONY: check-zlib
 check-zlib:
 
 
-
 .PHONY: install-zlib maybe-install-zlib
 maybe-install-zlib:
+
 install-zlib:
 
 
@@ -5427,8 +5631,9 @@ all-gdb: configure-gdb
 	$(SET_LIB_PATH) \
 	(cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
 
-.PHONY: check-gdb
 check-gdb:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5436,9 +5641,9 @@ check-gdb:
 	(cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-gdb maybe-install-gdb
 maybe-install-gdb:
+
 install-gdb: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5494,8 +5699,9 @@ all-expect: configure-expect
 	$(SET_LIB_PATH) \
 	(cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
 
-.PHONY: check-expect
 check-expect:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5503,9 +5709,9 @@ check-expect:
 	(cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-expect maybe-install-expect
 maybe-install-expect:
+
 install-expect: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5561,8 +5767,9 @@ all-guile: configure-guile
 	$(SET_LIB_PATH) \
 	(cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
 
-.PHONY: check-guile
 check-guile:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5570,9 +5777,9 @@ check-guile:
 	(cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-guile maybe-install-guile
 maybe-install-guile:
+
 install-guile: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5628,8 +5835,9 @@ all-tk: configure-tk
 	$(SET_LIB_PATH) \
 	(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
+.PHONY: check-tk maybe-check-tk
+maybe-check-tk:
 
-.PHONY: check-tk
 check-tk:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5637,9 +5845,9 @@ check-tk:
 	(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-tk maybe-install-tk
 maybe-install-tk:
+
 install-tk: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5695,8 +5903,9 @@ all-tix: configure-tix
 	$(SET_LIB_PATH) \
 	(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
+.PHONY: check-tix maybe-check-tix
+maybe-check-tix:
 
-.PHONY: check-tix
 check-tix:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5704,9 +5913,9 @@ check-tix:
 	(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
-
 .PHONY: install-tix maybe-install-tix
 maybe-install-tix:
+
 install-tix: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5762,14 +5971,15 @@ all-libtermcap: configure-libtermcap
 	$(SET_LIB_PATH) \
 	(cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
 
-.PHONY: check-libtermcap
 check-libtermcap:
 
 
-
 .PHONY: install-libtermcap maybe-install-libtermcap
 maybe-install-libtermcap:
+
 install-libtermcap: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5825,14 +6035,15 @@ all-utils: configure-utils
 	$(SET_LIB_PATH) \
 	(cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-utils maybe-check-utils
+maybe-check-utils:
 
-.PHONY: check-utils
 check-utils:
 
 
-
 .PHONY: install-utils maybe-install-utils
 maybe-install-utils:
+
 install-utils: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5927,7 +6138,9 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
 	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
 
-.PHONY: check-target-libstdc++-v3
+.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
+
 check-target-libstdc++-v3:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -5938,6 +6151,7 @@ check-target-libstdc++-v3:
 
 .PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
 maybe-install-target-libstdc++-v3:
+
 install-target-libstdc++-v3: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6027,7 +6241,9 @@ all-target-newlib: configure-target-newlib
 	(cd $(TARGET_SUBDIR)/newlib && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-newlib
+.PHONY: check-target-newlib maybe-check-target-newlib
+maybe-check-target-newlib:
+
 check-target-newlib:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6038,6 +6254,7 @@ check-target-newlib:
 
 .PHONY: install-target-newlib maybe-install-target-newlib
 maybe-install-target-newlib:
+
 install-target-newlib: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6127,7 +6344,9 @@ all-target-libf2c: configure-target-libf2c
 	(cd $(TARGET_SUBDIR)/libf2c && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-libf2c
+.PHONY: check-target-libf2c maybe-check-target-libf2c
+maybe-check-target-libf2c:
+
 check-target-libf2c:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6138,6 +6357,7 @@ check-target-libf2c:
 
 .PHONY: install-target-libf2c maybe-install-target-libf2c
 maybe-install-target-libf2c:
+
 install-target-libf2c: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6227,7 +6447,9 @@ all-target-libobjc: configure-target-libobjc
 	(cd $(TARGET_SUBDIR)/libobjc && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-libobjc
+.PHONY: check-target-libobjc maybe-check-target-libobjc
+maybe-check-target-libobjc:
+
 check-target-libobjc:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6238,6 +6460,7 @@ check-target-libobjc:
 
 .PHONY: install-target-libobjc maybe-install-target-libobjc
 maybe-install-target-libobjc:
+
 install-target-libobjc: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6327,13 +6550,16 @@ all-target-libtermcap: configure-target-libtermcap
 	(cd $(TARGET_SUBDIR)/libtermcap && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
+.PHONY: check-target-libtermcap maybe-check-target-libtermcap
+maybe-check-target-libtermcap:
+
 # Dummy target for uncheckable module.
-.PHONY: check-target-libtermcap
 check-target-libtermcap:
 
 
 .PHONY: install-target-libtermcap maybe-install-target-libtermcap
 maybe-install-target-libtermcap:
+
 install-target-libtermcap: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6423,7 +6649,9 @@ all-target-winsup: configure-target-winsup
 	(cd $(TARGET_SUBDIR)/winsup && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-winsup
+.PHONY: check-target-winsup maybe-check-target-winsup
+maybe-check-target-winsup:
+
 check-target-winsup:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6434,6 +6662,7 @@ check-target-winsup:
 
 .PHONY: install-target-winsup maybe-install-target-winsup
 maybe-install-target-winsup:
+
 install-target-winsup: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6523,13 +6752,16 @@ all-target-libgloss: configure-target-libgloss
 	(cd $(TARGET_SUBDIR)/libgloss && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
+.PHONY: check-target-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
+
 # Dummy target for uncheckable module.
-.PHONY: check-target-libgloss
 check-target-libgloss:
 
 
 .PHONY: install-target-libgloss maybe-install-target-libgloss
 maybe-install-target-libgloss:
+
 install-target-libgloss: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6619,7 +6851,9 @@ all-target-libiberty: configure-target-libiberty
 	(cd $(TARGET_SUBDIR)/libiberty && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-libiberty
+.PHONY: check-target-libiberty maybe-check-target-libiberty
+maybe-check-target-libiberty:
+
 check-target-libiberty:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6630,6 +6864,7 @@ check-target-libiberty:
 
 .PHONY: install-target-libiberty maybe-install-target-libiberty
 maybe-install-target-libiberty:
+
 install-target-libiberty: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6719,7 +6954,9 @@ all-target-gperf: configure-target-gperf
 	(cd $(TARGET_SUBDIR)/gperf && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-gperf
+.PHONY: check-target-gperf maybe-check-target-gperf
+maybe-check-target-gperf:
+
 check-target-gperf:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6730,6 +6967,7 @@ check-target-gperf:
 
 .PHONY: install-target-gperf maybe-install-target-gperf
 maybe-install-target-gperf:
+
 install-target-gperf: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6819,13 +7057,16 @@ all-target-examples: configure-target-examples
 	(cd $(TARGET_SUBDIR)/examples && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
+.PHONY: check-target-examples maybe-check-target-examples
+maybe-check-target-examples:
+
 # Dummy target for uncheckable module.
-.PHONY: check-target-examples
 check-target-examples:
 
 
 .PHONY: install-target-examples maybe-install-target-examples
 maybe-install-target-examples:
+
 # Dummy target for uninstallable.
 install-target-examples:
 
@@ -6911,7 +7152,9 @@ all-target-libffi: configure-target-libffi
 	(cd $(TARGET_SUBDIR)/libffi && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-libffi
+.PHONY: check-target-libffi maybe-check-target-libffi
+maybe-check-target-libffi:
+
 check-target-libffi:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -6922,6 +7165,7 @@ check-target-libffi:
 
 .PHONY: install-target-libffi maybe-install-target-libffi
 maybe-install-target-libffi:
+
 install-target-libffi: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7012,7 +7256,9 @@ all-target-libjava: configure-target-libjava
 	(cd $(TARGET_SUBDIR)/libjava && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
 
-.PHONY: check-target-libjava
+.PHONY: check-target-libjava maybe-check-target-libjava
+maybe-check-target-libjava:
+
 check-target-libjava:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7023,6 +7269,7 @@ check-target-libjava:
 
 .PHONY: install-target-libjava maybe-install-target-libjava
 maybe-install-target-libjava:
+
 install-target-libjava: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7112,7 +7359,9 @@ all-target-zlib: configure-target-zlib
 	(cd $(TARGET_SUBDIR)/zlib && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-zlib
+.PHONY: check-target-zlib maybe-check-target-zlib
+maybe-check-target-zlib:
+
 check-target-zlib:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7123,6 +7372,7 @@ check-target-zlib:
 
 .PHONY: install-target-zlib maybe-install-target-zlib
 maybe-install-target-zlib:
+
 install-target-zlib: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7212,7 +7462,9 @@ all-target-boehm-gc: configure-target-boehm-gc
 	(cd $(TARGET_SUBDIR)/boehm-gc && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-boehm-gc
+.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
+maybe-check-target-boehm-gc:
+
 check-target-boehm-gc:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7223,6 +7475,7 @@ check-target-boehm-gc:
 
 .PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
 maybe-install-target-boehm-gc:
+
 install-target-boehm-gc: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7312,7 +7565,9 @@ all-target-qthreads: configure-target-qthreads
 	(cd $(TARGET_SUBDIR)/qthreads && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-qthreads
+.PHONY: check-target-qthreads maybe-check-target-qthreads
+maybe-check-target-qthreads:
+
 check-target-qthreads:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7323,6 +7578,7 @@ check-target-qthreads:
 
 .PHONY: install-target-qthreads maybe-install-target-qthreads
 maybe-install-target-qthreads:
+
 install-target-qthreads: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7412,7 +7668,9 @@ all-target-rda: configure-target-rda
 	(cd $(TARGET_SUBDIR)/rda && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
-.PHONY: check-target-rda
+.PHONY: check-target-rda maybe-check-target-rda
+maybe-check-target-rda:
+
 check-target-rda:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7423,6 +7681,7 @@ check-target-rda:
 
 .PHONY: install-target-rda maybe-install-target-rda
 maybe-install-target-rda:
+
 install-target-rda: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
diff --git a/Makefile.tpl b/Makefile.tpl
index 419bf42b5..f0f596841 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -743,8 +743,13 @@ check:
 	$(MAKE) do-check NOTPARALLEL=parallel-ok
 
 # Only include modules actually being configured and built.
-do-check: @check_host_modules@ \
-	@check_target_modules@
+do-check: maybe-check-gcc [+
+  FOR host_modules +] \
+    maybe-check-[+module+][+
+  ENDFOR host_modules +][+
+  FOR target_modules +] \
+    maybe-check-target-[+module+][+
+  ENDFOR target_modules +]
 
 # Automated reporting of test results.
 
@@ -772,11 +777,18 @@ mail-report-with-warnings.log: warning.log
 .PHONY: install uninstall
 install: installdirs install-host install-target
 
+.PHONY: install-host-nogcc
+install-host-nogcc: [+
+  FOR host_modules +] \
+    maybe-install-[+module+][+
+  ENDFOR host_modules +]
+
 .PHONY: install-host
 install-host: maybe-install-gcc [+
   FOR host_modules +] \
     maybe-install-[+module+][+
   ENDFOR host_modules +]
+
 .PHONY: install-target
 install-target: [+
   FOR target_modules +] \
@@ -800,7 +812,7 @@ install.all: install-no-fixedincludes
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
-install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
+install-no-fixedincludes: installdirs install-host-nogcc \
 	install-target gcc-no-fixedincludes
 
 ### other supporting targets
@@ -962,11 +974,11 @@ all-[+module+]: configure-[+module+]
 	    +] $(X11_FLAGS_TO_PASS)[+ 
 	  ENDIF with_x +] all)
 
+.PHONY: check-[+module+] maybe-check-[+module+]
+maybe-check-[+module+]:
 [+ IF no_check +]
-.PHONY: check-[+module+]
 check-[+module+]:
 [+ ELIF no_check_cross +]
-.PHONY: check-[+module+]
 # This module is only tested in a native toolchain.
 check-[+module+]:
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@@ -979,7 +991,6 @@ check-[+module+]:
 	    ENDIF with_x +] check); \
 	fi
 [+ ELSE check +]
-.PHONY: check-[+module+]
 check-[+module+]:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -990,13 +1001,11 @@ check-[+module+]:
 	  ENDIF with_x +] check)
 [+ ENDIF no_check +]
 
-[+ IF no_install +]
 .PHONY: install-[+module+] maybe-install-[+module+]
 maybe-install-[+module+]:
+[+ IF no_install +]
 install-[+module+]:
 [+ ELSE install +]
-.PHONY: install-[+module+] maybe-install-[+module+]
-maybe-install-[+module+]:
 install-[+module+]: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1101,12 +1110,13 @@ all-target-[+module+]: configure-target-[+module+]
 	  +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
 	    ENDIF raw_cxx 
 	  +] all)
+
+.PHONY: check-target-[+module+] maybe-check-target-[+module+]
+maybe-check-target-[+module+]:
 [+ IF no_check +]
 # Dummy target for uncheckable module.
-.PHONY: check-target-[+module+]
 check-target-[+module+]:
 [+ ELSE check +]
-.PHONY: check-target-[+module+]
 check-target-[+module+]:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
@@ -1118,14 +1128,13 @@ check-target-[+module+]:
 	    ENDIF raw_cxx 
 	  +] check)
 [+ ENDIF no_check +]
-[+ IF no_install +]
+
 .PHONY: install-target-[+module+] maybe-install-target-[+module+]
 maybe-install-target-[+module+]:
+[+ IF no_install +]
 # Dummy target for uninstallable.
 install-target-[+module+]:
 [+ ELSE install +]
-.PHONY: install-target-[+module+] maybe-install-target-[+module+]
-maybe-install-target-[+module+]:
 install-target-[+module+]: installdirs
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
diff --git a/configure b/configure
index cb117c73a..fa3d44f80 100755
--- a/configure
+++ b/configure
@@ -2306,19 +2306,6 @@ for module in ${build_modules} ; do
   configure_build_modules=configure-build-${module}
 done
 
-check_host_modules=
-install_host_modules=
-for module in ${configdirs} ; do
-  check_host_modules="${check_host_modules} check-${module}"
-  install_host_modules="${install_host_modules} install-${module}"
-done
-install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
-
-check_target_modules=
-for module in ${target_configdirs} ; do
-  check_target_modules="${check_target_modules} check-target-${module}"
-done
-
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!
@@ -2354,7 +2341,7 @@ rm -f maybedep.tmp
 echo '# maybedep.tmp' > maybedep.tmp
 
 # Make-targets which may need maybe dependencies.
-mts="configure all install"
+mts="configure all install check"
 
 # Loop over modules and make-targets.
 for module in ${build_modules} ; do
@@ -2682,13 +2669,10 @@ ospace_frag=${srcdir}/${ospace_frag}
 
 
 
-
-
 # Target module lists & subconfigure args.
 
 
 
-
 # Build tools.
 
 
@@ -2707,7 +2691,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:2711: checking for $ac_word" >&5
+echo "configure:2695: 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
@@ -2740,7 +2724,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:2744: checking for $ac_word" >&5
+echo "configure:2728: 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
@@ -2779,7 +2763,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:2783: checking for $ac_word" >&5
+echo "configure:2767: 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
@@ -2812,7 +2796,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:2816: checking for $ac_word" >&5
+echo "configure:2800: 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
@@ -2851,7 +2835,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:2855: checking for $ac_word" >&5
+echo "configure:2839: 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
@@ -2884,7 +2868,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:2888: checking for $ac_word" >&5
+echo "configure:2872: 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
@@ -2923,7 +2907,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:2927: checking for $ac_word" >&5
+echo "configure:2911: 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
@@ -2956,7 +2940,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:2960: checking for $ac_word" >&5
+echo "configure:2944: 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
@@ -2995,7 +2979,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:2999: checking for $ac_word" >&5
+echo "configure:2983: 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
@@ -3028,7 +3012,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:3032: checking for $ac_word" >&5
+echo "configure:3016: 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
@@ -3067,7 +3051,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:3071: checking for $ac_word" >&5
+echo "configure:3055: 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
@@ -3100,7 +3084,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:3104: checking for $ac_word" >&5
+echo "configure:3088: 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
@@ -3139,7 +3123,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:3143: checking for $ac_word" >&5
+echo "configure:3127: 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
@@ -3172,7 +3156,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:3176: checking for $ac_word" >&5
+echo "configure:3160: 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
@@ -3211,7 +3195,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:3215: checking for $ac_word" >&5
+echo "configure:3199: 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
@@ -3244,7 +3228,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:3248: checking for $ac_word" >&5
+echo "configure:3232: 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
@@ -3283,7 +3267,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:3287: checking for $ac_word" >&5
+echo "configure:3271: 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
@@ -3316,7 +3300,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:3320: checking for $ac_word" >&5
+echo "configure:3304: 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
@@ -3364,7 +3348,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:3368: checking for $ac_word" >&5
+echo "configure:3352: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3397,7 +3381,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
     # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3401: checking for $ac_word" >&5
+echo "configure:3385: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3436,7 +3420,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:3440: checking for $ac_word" >&5
+echo "configure:3424: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3469,7 +3453,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
     # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3473: checking for $ac_word" >&5
+echo "configure:3457: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3508,7 +3492,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:3512: checking for $ac_word" >&5
+echo "configure:3496: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3541,7 +3525,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
     # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3545: checking for $ac_word" >&5
+echo "configure:3529: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3580,7 +3564,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:3584: checking for $ac_word" >&5
+echo "configure:3568: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3613,7 +3597,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
     # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3617: checking for $ac_word" >&5
+echo "configure:3601: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3652,7 +3636,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:3656: checking for $ac_word" >&5
+echo "configure:3640: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3685,7 +3669,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
     # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3689: checking for $ac_word" >&5
+echo "configure:3673: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3724,7 +3708,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:3728: checking for $ac_word" >&5
+echo "configure:3712: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3757,7 +3741,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3761: checking for $ac_word" >&5
+echo "configure:3745: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3796,7 +3780,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:3800: checking for $ac_word" >&5
+echo "configure:3784: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3829,7 +3813,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
     # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3833: checking for $ac_word" >&5
+echo "configure:3817: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3896,7 +3880,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:3900: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:3884: 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"
@@ -4109,11 +4093,8 @@ s%@configure_build_modules@%$configure_build_modules%g
 s%@all_build_modules@%$all_build_modules%g
 s%@host_configargs@%$host_configargs%g
 s%@configdirs@%$configdirs%g
-s%@check_host_modules@%$check_host_modules%g
-s%@install_host_modules_nogcc@%$install_host_modules_nogcc%g
 s%@target_configargs@%$target_configargs%g
 s%@target_configdirs@%$target_configdirs%g
-s%@check_target_modules@%$check_target_modules%g
 s%@BISON@%$BISON%g
 s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
 s%@LEX@%$LEX%g
diff --git a/configure.in b/configure.in
index e8e1016f5..8891c1b70 100644
--- a/configure.in
+++ b/configure.in
@@ -1620,19 +1620,6 @@ for module in ${build_modules} ; do
   configure_build_modules=configure-build-${module}
 done
 
-check_host_modules=
-install_host_modules=
-for module in ${configdirs} ; do
-  check_host_modules="${check_host_modules} check-${module}"
-  install_host_modules="${install_host_modules} install-${module}"
-done
-install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
-
-check_target_modules=
-for module in ${target_configdirs} ; do
-  check_target_modules="${check_target_modules} check-target-${module}"
-done
-
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!
@@ -1668,7 +1655,7 @@ rm -f maybedep.tmp
 echo '# maybedep.tmp' > maybedep.tmp
 
 # Make-targets which may need maybe dependencies.
-mts="configure all install"
+mts="configure all install check"
 
 # Loop over modules and make-targets.
 for module in ${build_modules} ; do
@@ -1994,13 +1981,10 @@ AC_SUBST(all_build_modules)
 # Host module lists & subconfigure args.
 AC_SUBST(host_configargs)
 AC_SUBST(configdirs)
-AC_SUBST(check_host_modules)
-AC_SUBST(install_host_modules_nogcc)
 
 # Target module lists & subconfigure args.
 AC_SUBST(target_configargs)
 AC_SUBST(target_configdirs)
-AC_SUBST(check_target_modules)
 
 # Build tools.
 AC_SUBST(BISON)