* Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir,
	gcc_version, and gcc_version_trigger from set of flags to pass.
	* Makefile.tpl: Remove definitions of above variables.
	(config.status): Remove dependency on $(gcc_version_trigger).
	* Makefile.in: Regenerate.
	* configure.in: Do not reference config/gcc-version.m4 nor
	config/gxx-include-dir.m4.  Do not invoke TL_AC_GCC_VERSION nor
	TL_AC_GXX_INCLUDE_DIR.  Do not set gcc_version_trigger.
	* configure: Regenerate.
config:
	* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
	to be expanded by the Makefile.
This commit is contained in:
Zack Weinberg
2005-03-22 00:49:18 +00:00
parent 53107cc4a4
commit 479759c861
8 changed files with 122 additions and 190 deletions

View File

@ -14,10 +14,10 @@ case "${with_gxx_include_dir}" in
;;
no | "")
case "${enable_version_specific_runtime_libs}" in
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
*)
libstdcxx_incdir=c++/${gcc_version}
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
libstdcxx_incdir='c++/$(gcc_version)'
gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;;
esac