From 479759c861f07d40b18c9673919991a95eb85f5b Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 22 Mar 2005 00:49:18 +0000 Subject: top: * 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. --- config/ChangeLog | 5 +++++ config/gxx-include-dir.m4 | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/ChangeLog b/config/ChangeLog index 7d7dd7e..8572384 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2005-03-21 Zack Weinberg + + * gxx-include-dir.m4: In all substitutions, leave $(gcc_version) + to be expanded by the Makefile. + 2005-03-15 Zack Weinberg * gcc-version.m4: Delete. diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 87a65ad..0e6e4ff 100644 --- a/config/gxx-include-dir.m4 +++ b/config/gxx-include-dir.m4 @@ -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 -- cgit v1.1