mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-29 22:55:53 +08:00
e9bbd9d707
config: * gxx-include-dir.m4: In all substitutions, leave $(gcc_version) to be expanded by the Makefile. libjava: * configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not set tool_include_dir. In all substitutions, leave $(gcc_version) to be expanded by the Makefile. * aclocal.m4, configure: Regenerate. * Makefile.am: Set gcc_version. Replace all uses of @gcc_version@ with $(gcc_version). * external/Makefile.am, external/sax/Makefile.am * external/w3c_dom/Makefile.am, gcj/Makefile.am * testsuite/Makefile.am: Set gcc_version. * include/Makefile.am: Set gcc_version and tool_include_dir. * Makefile.in, external/Makefile.in, external/sax/Makefile.in * external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in * testsuite/Makefile.in: Regenerate. From-SVN: r96825
27 lines
876 B
Plaintext
27 lines
876 B
Plaintext
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)
|
|
])
|