Commit 0314451d by Geoffrey Keating Committed by Geoffrey Keating

Index: libf2c/ChangeLog

Thu Feb  5 15:08:08 2004  Geoffrey Keating  <geoffk@apple.com>

	PR 12179
	* aclocal.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Use 'gcc', not 'gcc-lib'.
	Add comment about poorly-named variables.
	* Makefile.in (libsubdir): Use 'gcc', not 'gcc-lib'.
	* configure: Regenerate.

Index: libstdc++-v3/ChangeLog
2004-02-05  Geoffrey Keating  <geoffk@apple.com>

	PR 12179
	* .cvsignore: New.
	* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): Use 'gcc', not
	'gcc-lib'.  Add comment about poorly-named variables.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r77351
parent 89a95129
Thu Feb 5 15:08:08 2004 Geoffrey Keating <geoffk@apple.com>
PR 12179
* aclocal.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Use 'gcc', not 'gcc-lib'.
Add comment about poorly-named variables.
* Makefile.in (libsubdir): Use 'gcc', not 'gcc-lib'.
* configure: Regenerate.
2004-01-14 Kelley Cook <kcook@gcc.gnu.org> 2004-01-14 Kelley Cook <kcook@gcc.gnu.org>
* libF77/configure.in: Update to AC_PREREQ(2.13) * libF77/configure.in: Update to AC_PREREQ(2.13)
......
...@@ -42,7 +42,7 @@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ ...@@ -42,7 +42,7 @@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
top_builddir = . top_builddir = .
libdir = $(exec_prefix)/lib libdir = $(exec_prefix)/lib
libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
# #
# Versions should start at 0:0:0 - See libtool manual. # Versions should start at 0:0:0 - See libtool manual.
VERSION_MAJOR=0 VERSION_MAJOR=0
......
...@@ -194,9 +194,10 @@ AC_SUBST(gcc_version_trigger) ...@@ -194,9 +194,10 @@ AC_SUBST(gcc_version_trigger)
if test $version_specific_libs = yes; then if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries # Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected. FIXME: "toolexecdir" is a misnomer, there are no
# executables installed there.
changequote(,)dnl changequote(,)dnl
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl changequote([,])dnl
fi fi
...@@ -209,7 +210,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then ...@@ -209,7 +210,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib' glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else else
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)' glibcpp_toolexeclibdir='$(libdir)'
fi fi
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
......
2004-02-05 Geoffrey Keating <geoffk@apple.com>
PR 12179
* .cvsignore: New.
* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): Use 'gcc', not
'gcc-lib'. Add comment about poorly-named variables.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2004-02-05 Paolo Carlini <pcarlini@suse.de> 2004-02-05 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (money_get::do_get(string_type&)): * include/bits/locale_facets.tcc (money_get::do_get(string_type&)):
......
...@@ -762,11 +762,12 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -762,11 +762,12 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
if test $version_specific_libs = yes; then if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries # Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected. FIXME: these variables are misnamed, there are
# no executables installed in _toolexecdir or _toolexeclibdir.
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++ gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi fi
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)' glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi fi
...@@ -778,7 +779,7 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -778,7 +779,7 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
glibcxx_toolexecdir='${exec_prefix}/${host_alias}' glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib' glibcxx_toolexeclibdir='${toolexecdir}/lib'
else else
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}' glibcxx_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$CXX -print-multi-os-directory` multi_os_directory=`$CXX -print-multi-os-directory`
......
# generated automatically by aclocal 1.7.8 -*- Autoconf -*- # generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
...@@ -775,11 +775,12 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -775,11 +775,12 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
if test $version_specific_libs = yes; then if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries # Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected. FIXME: these variables are misnamed, there are
# no executables installed in _toolexecdir or _toolexeclibdir.
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++ gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi fi
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)' glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi fi
...@@ -791,7 +792,7 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -791,7 +792,7 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
glibcxx_toolexecdir='${exec_prefix}/${host_alias}' glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib' glibcxx_toolexeclibdir='${toolexecdir}/lib'
else else
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}' glibcxx_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$CXX -print-multi-os-directory` multi_os_directory=`$CXX -print-multi-os-directory`
...@@ -1996,7 +1997,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) ...@@ -1996,7 +1997,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# Call AM_AUTOMAKE_VERSION so it can be traced. # Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.7.8])]) [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
......
...@@ -64308,11 +64308,12 @@ echo "${ECHO_T}$version_specific_libs" >&6 ...@@ -64308,11 +64308,12 @@ echo "${ECHO_T}$version_specific_libs" >&6
if test $version_specific_libs = yes; then if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries # Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected. FIXME: these variables are misnamed, there are
# no executables installed in _toolexecdir or _toolexeclibdir.
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++ gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi fi
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)' glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi fi
...@@ -64324,7 +64325,7 @@ echo "${ECHO_T}$version_specific_libs" >&6 ...@@ -64324,7 +64325,7 @@ echo "${ECHO_T}$version_specific_libs" >&6
glibcxx_toolexecdir='${exec_prefix}/${host_alias}' glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib' glibcxx_toolexeclibdir='${toolexecdir}/lib'
else else
glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}' glibcxx_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$CXX -print-multi-os-directory` multi_os_directory=`$CXX -print-multi-os-directory`
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment