479759c861
* 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.
26 lines
876 B
Text
26 lines
876 B
Text
dnl Usage: TL_AC_GXX_INCLUDE_DIR
|
|
dnl
|
|
dnl Set $gxx_include_dir to the location of the installed C++ include
|
|
dnl directory. The value depends on $gcc_version and the configuration
|
|
dnl options --with-gxx-include-dir and --enable-version-specific-runtime-libs.
|
|
dnl
|
|
dnl If you change the default here, you'll need to change the gcc and
|
|
dnl libstdc++-v3 subdirectories too.
|
|
AC_DEFUN([TL_AC_GXX_INCLUDE_DIR],
|
|
[
|
|
case "${with_gxx_include_dir}" in
|
|
yes)
|
|
AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
|
|
;;
|
|
no | "")
|
|
case "${enable_version_specific_runtime_libs}" in
|
|
yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
|
|
*)
|
|
libstdcxx_incdir='c++/$(gcc_version)'
|
|
gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
|
|
esac ;;
|
|
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
|
esac
|
|
AC_SUBST(gxx_include_dir)
|
|
AC_SUBST(libstdcxx_incdir)
|
|
])
|