Skip to content

R
riscv-gcc-1
Commit 2f235b6d by Phil Edwards
Options

re PR libstdc++/7173 (_GLIBCPP_VERSION ="" on the 3.1 branch) 

2002-07-02  Phil Edwards  <pme@gcc.gnu.org>

	PR libstdc++/7173
	* acinclude.m4:  Simplify determination of gcc_version, and move
	up to GLIBCPP_CONFIGURE.
	* configure.in (release_VERSION):  Really remove.
	(AM_INIT_AUTOMAKE, AM_CONFIG_HEADER):  Move after GLIBCPP_CONFIGURE.
	* aclocal.m4, configure:  Regenerate.

From-SVN: r55174
parent fc7f0a80
Showing with 30 additions and 56 deletions
libstdc++-v3/ChangeLog
2002-07-02 Phil Edwards <pme@gcc.gnu.org> 2002-07-02 Phil Edwards <pme@gcc.gnu.org>
PR libstdc++/7173
* acinclude.m4: Simplify determination of gcc_version, and move
up to GLIBCPP_CONFIGURE.
* configure.in (release_VERSION): Really remove.
(AM_INIT_AUTOMAKE, AM_CONFIG_HEADER): Move after GLIBCPP_CONFIGURE.
* aclocal.m4, configure: Regenerate.
2002-07-02 Phil Edwards <pme@gcc.gnu.org>
* docs/html/configopts.html, docs/html/install.html: Tweaks. * docs/html/configopts.html, docs/html/install.html: Tweaks.
* include/ext/algorithm, include/ext/hash_map, include/ext/hash_set, * include/ext/algorithm, include/ext/hash_map, include/ext/hash_set,
include/ext/iterator, include/ext/numeric, include/ext/rb_tree, include/ext/iterator, include/ext/numeric, include/ext/rb_tree,
......
libstdc++-v3/acinclude.m4
...@@ -167,6 +167,11 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -167,6 +167,11 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
LIB_AC_PROG_CXX LIB_AC_PROG_CXX
# For directory versioning (e.g., headers) and other variables.
AC_MSG_CHECKING([for GCC version number])
gcc_version=`$glibcpp_CXX -dumpversion`
AC_MSG_RESULT($gcc_version)
# For some reason, gettext needs this. # For some reason, gettext needs this.
AC_ISC_POSIX AC_ISC_POSIX
...@@ -200,7 +205,6 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -200,7 +205,6 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
# Find platform-specific directories containing configuration info. In # Find platform-specific directories containing configuration info. In
# addition to possibly modifying the same flags, it also sets up symlinks. # addition to possibly modifying the same flags, it also sets up symlinks.
GLIBCPP_CHECK_TARGET GLIBCPP_CHECK_TARGET
]) ])
...@@ -1840,15 +1844,6 @@ version_specific_libs=no)dnl ...@@ -1840,15 +1844,6 @@ version_specific_libs=no)dnl
# Option set, now we can test it. # Option set, now we can test it.
AC_MSG_RESULT($version_specific_libs) AC_MSG_RESULT($version_specific_libs)
# Get the gcc version number. This is lifted from gcc/configure.in
AC_MSG_CHECKING([for gcc version number])
changequote(,)dnl
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/'`
changequote([,])dnl
AC_MSG_RESULT($gcc_version)
# Default case for install directory for include files. # Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/c++/${gcc_version} gxx_include_dir='$(prefix)'/include/c++/${gcc_version}
......
libstdc++-v3/aclocal.m4
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -179,6 +179,11 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -179,6 +179,11 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
LIB_AC_PROG_CXX LIB_AC_PROG_CXX
# For directory versioning (e.g., headers) and other variables.
AC_MSG_CHECKING([for GCC version number])
gcc_version=`$glibcpp_CXX -dumpversion`
AC_MSG_RESULT($gcc_version)
# For some reason, gettext needs this. # For some reason, gettext needs this.
AC_ISC_POSIX AC_ISC_POSIX
...@@ -212,7 +217,6 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -212,7 +217,6 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
# Find platform-specific directories containing configuration info. In # Find platform-specific directories containing configuration info. In
# addition to possibly modifying the same flags, it also sets up symlinks. # addition to possibly modifying the same flags, it also sets up symlinks.
GLIBCPP_CHECK_TARGET GLIBCPP_CHECK_TARGET
]) ])
...@@ -1852,15 +1856,6 @@ version_specific_libs=no)dnl ...@@ -1852,15 +1856,6 @@ version_specific_libs=no)dnl
# Option set, now we can test it. # Option set, now we can test it.
AC_MSG_RESULT($version_specific_libs) AC_MSG_RESULT($version_specific_libs)
# Get the gcc version number. This is lifted from gcc/configure.in
AC_MSG_CHECKING([for gcc version number])
changequote(,)dnl
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/'`
changequote([,])dnl
AC_MSG_RESULT($gcc_version)
# Default case for install directory for include files. # Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/c++/${gcc_version} gxx_include_dir='$(prefix)'/include/c++/${gcc_version}
...@@ -2206,37 +2201,12 @@ AC_MSG_RESULT($enable_symvers) ...@@ -2206,37 +2201,12 @@ AC_MSG_RESULT($enable_symvers)
]) ])
# isc-posix.m4 serial 1 (gettext-0.10.40)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package)
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
# give these diagnostics:
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
undefine([AC_ISC_POSIX])
AC_DEFUN([AC_ISC_POSIX],
[
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
]
)
# Add --enable-maintainer-mode option to configure. # Add --enable-maintainer-mode option to configure.
# From Jim Meyering # From Jim Meyering
# serial 1 # serial 1
AC_DEFUN([AM_MAINTAINER_MODE], AC_DEFUN(AM_MAINTAINER_MODE,
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode, AC_ARG_ENABLE(maintainer-mode,
...@@ -2253,7 +2223,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], ...@@ -2253,7 +2223,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
# Define a conditional. # Define a conditional.
AC_DEFUN([AM_CONDITIONAL], AC_DEFUN(AM_CONDITIONAL,
[AC_SUBST($1_TRUE) [AC_SUBST($1_TRUE)
AC_SUBST($1_FALSE) AC_SUBST($1_FALSE)
if $2; then if $2; then
...@@ -2273,7 +2243,7 @@ fi]) ...@@ -2273,7 +2243,7 @@ fi])
dnl Usage: dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL]) [AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1] PACKAGE=[$1]
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
...@@ -2301,7 +2271,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])]) ...@@ -2301,7 +2271,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
AC_DEFUN([AM_SANITY_CHECK], AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane]) [AC_MSG_CHECKING([whether build environment is sane])
# Just in case # Just in case
sleep 1 sleep 1
...@@ -2342,7 +2312,7 @@ AC_MSG_RESULT(yes)]) ...@@ -2342,7 +2312,7 @@ AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version. dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG], AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2) [AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
...@@ -2358,7 +2328,7 @@ AC_SUBST($1)]) ...@@ -2358,7 +2328,7 @@ AC_SUBST($1)])
# Like AC_CONFIG_HEADER, but automatically create stamp file. # Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN([AM_CONFIG_HEADER], AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12]) [AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1]) AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file. dnl When config.status generates a header, we must update the stamp-h file.
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure.in
...@@ -37,13 +37,13 @@ AC_CANONICAL_SYSTEM ...@@ -37,13 +37,13 @@ AC_CANONICAL_SYSTEM
target_alias=${target_alias-$target} target_alias=${target_alias-$target}
AC_SUBST(target_alias) AC_SUBST(target_alias)
AM_INIT_AUTOMAKE($PACKAGE, $release_VERSION)
AM_CONFIG_HEADER(config.h)
# Runs configure.target, finds CC, CXX and assorted other critical bits. # Runs configure.target, finds CC, CXX and assorted other critical bits.
# Must run this before the GLIBCPP_ENABLE_* macros below. # Must run this before the GLIBCPP_ENABLE_* macros below.
GLIBCPP_CONFIGURE(.) GLIBCPP_CONFIGURE(.)
AM_INIT_AUTOMAKE($PACKAGE, $gcc_version)
AM_CONFIG_HEADER(config.h)
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_SUBST(enable_shared) AC_SUBST(enable_shared)
......
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