diff options
author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-02-07 01:54:21 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-02-07 01:54:21 +0000 |
commit | 72ed2836928b9da4d6edfd3711028ff645ed257d (patch) | |
tree | d5471bf10a2fb612e8524e1fc3b9ac00f4659832 /libstdc++-v3/acinclude.m4 | |
parent | c00dd14e104d2e0fdd8011ff60d3ece69988eabd (diff) | |
download | gcc-72ed2836928b9da4d6edfd3711028ff645ed257d.zip gcc-72ed2836928b9da4d6edfd3711028ff645ed257d.tar.gz gcc-72ed2836928b9da4d6edfd3711028ff645ed257d.tar.bz2 |
acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Deal with library install locations too.
2001-02-06 Benjamin Kosnik <bkoz@fillmore.constant.com>
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Deal with library
install locations too.
* aclocal.m4: Regeneate.
* configure.in: Remove USE_LIBDIR.
* configure: Regenerate.
* src/Makefile.am (toolexecdir): Simplify, use
glibcpp_toolexecdir, glibcpp_toolexeclibdir.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Same.
* libsupc++/Makefile.in: Regenerate.
* src/Makefile.am: Just remove special rules for locale-inst.cc and
misc-inst.cc as no longer necessary.
Follow C++STYLE for naming non-static functions.
* include/bits/ostream.tcc (_S_pad_char): Not static, rename to
__pad_char.
* include/bits/streambuf.tcc: Same.
* include/bits/ostream.tcc: Same.
* include/bits/istream.tcc: Same.
* include/bits/locale_facets.tcc (_S_pad_numeric): To __pad_numeric.
(_S_output_float): To __output_float.
* include/bits/std_streambuf.h (_S_copy_streambufs): To
__copy_streambufs.
* include/bits/locale_facets.tcc (_S_build_float_format): To
__build_float_format.
(_S_format): To __output_integer.
(_S_fill): To __pad.
* src/locale.cc: Same.
* src/misc-inst.cc: Fix formatting. Fix signature for wchar_t. Correct
names.
* include/bits/locale_facets.tcc (_S_group_digits): To
__group_digits.
* src/locale-inst.cc: Fixup names. Add use_facet instantiations
for collate, numpunct.
From-SVN: r39508
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
-rw-r--r-- | libstdc++-v3/acinclude.m4 | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index bbe676b..c56d642 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1500,12 +1500,21 @@ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [ AC_SUBST(WARN_FLAGS) ]) - +dnl dnl GLIBCPP_EXPORT_INSTALL_INFO dnl calculates gxx_install_dir +dnl exports glibcpp_toolexecdir +dnl exports glibcpp_toolexeclibdir +dnl +dnl Assumes cross_compiling bits already done, and with_cross_host in +dnl particular dnl +dnl GLIBCPP_EXPORT_INSTALL_INFO AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [ +glibcpp_toolexecdir=no +glibcpp_toolexeclibdir=no + AC_MSG_CHECKING([for interface version number]) libstdcxx_interface=$INTERFACE AC_MSG_RESULT($libstdcxx_interface) @@ -1537,23 +1546,40 @@ AC_ARG_ENABLE(version-specific-runtime-libs, # and header files if --enable-version-specific-runtime-libs option # is selected. changequote(,)dnl -gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'` -gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'` -gcc_version=$gcc_num -gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++' +gcc_version_trigger=${srcdir}/../gcc/version.c +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` +gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ +glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version} changequote([,])dnl -AC_SUBST(gcc_version) -AM_CONDITIONAL(VERSION_SPECIFIC_LIBS, test x"$version_specific_libs" = x"yes") ],version_specific_libs=no) AC_MSG_RESULT($version_specific_libs) -AC_MSG_CHECKING([for install location]) +# Default case for install directory for include files. if test x"$version_specific_libs" = x"no" \ && test x"$gxx_include_dir"=x"no"; then - gxx_include_dir=${prefix}/include/g++-${libstdcxx_interface} + gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface} +fi + +# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir +# Install a library built with a cross compiler in tooldir, not libdir. +if test x"$glibcpp_toolexecdir" = x"no"; then + if test x"$with_cross_host" = x"yes"; then + glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + else + glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + fi fi + +AC_MSG_CHECKING([for install location]) AC_MSG_RESULT($gxx_include_dir) + AC_SUBST(gxx_include_dir) +AC_SUBST(glibcpp_toolexecdir) +AC_SUBST(glibcpp_toolexeclibdir) ]) |