Skip to content

R
riscv-gcc-1
Commit 41970073 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

configure.in (INTERFACE): Remove. 


2002-06-26  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in (INTERFACE): Remove.
	(release_VERSION): Remove.
	* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Change include placement.
	(libstdcxx_interface): Change. Use gcc methods to determine version.
	* configure: Regenerate.
	* aclocal.m4: Regenerate.

From-SVN: r55028
parent 7692f832
Showing with 41 additions and 46 deletions
libstdc++-v3/ChangeLog
2002-06-26 Benjamin Kosnik <bkoz@redhat.com>
* configure.in (INTERFACE): Remove.
(release_VERSION): Remove.
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Change include placement.
(libstdcxx_interface): Change. Use gcc methods to determine version.
* configure: Regenerate.
* aclocal.m4: Regenerate.
2002-06-25 DJ Delorie <dj@redhat.com> 2002-06-25 DJ Delorie <dj@redhat.com>
* acinclude.m4 (GLIBCPP_CONFIGURE): Split out * acinclude.m4 (GLIBCPP_CONFIGURE): Split out
......
libstdc++-v3/Makefile.in
...@@ -130,7 +130,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -130,7 +130,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/acinclude.m4
...@@ -1809,10 +1809,6 @@ glibcpp_toolexecdir=no ...@@ -1809,10 +1809,6 @@ glibcpp_toolexecdir=no
glibcpp_toolexeclibdir=no glibcpp_toolexeclibdir=no
glibcpp_prefixdir=${prefix} glibcpp_prefixdir=${prefix}
AC_MSG_CHECKING([for interface version number])
libstdcxx_interface=$INTERFACE
AC_MSG_RESULT($libstdcxx_interface)
# Process the option --with-gxx-include-dir=<path to include-files directory> # Process the option --with-gxx-include-dir=<path to include-files directory>
AC_MSG_CHECKING([for --with-gxx-include-dir]) AC_MSG_CHECKING([for --with-gxx-include-dir])
AC_ARG_WITH(gxx-include-dir, AC_ARG_WITH(gxx-include-dir,
...@@ -1844,26 +1840,30 @@ version_specific_libs=no)dnl ...@@ -1844,26 +1840,30 @@ 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.
if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/c++/${gcc_version}
fi
# Version-specific runtime libs processing.
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.
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/'`
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/c++
fi fi
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
# Default case for install directory for include files.
if test $version_specific_libs = no &&
test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface}
fi fi
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
......
libstdc++-v3/aclocal.m4
...@@ -1821,10 +1821,6 @@ glibcpp_toolexecdir=no ...@@ -1821,10 +1821,6 @@ glibcpp_toolexecdir=no
glibcpp_toolexeclibdir=no glibcpp_toolexeclibdir=no
glibcpp_prefixdir=${prefix} glibcpp_prefixdir=${prefix}
AC_MSG_CHECKING([for interface version number])
libstdcxx_interface=$INTERFACE
AC_MSG_RESULT($libstdcxx_interface)
# Process the option --with-gxx-include-dir=<path to include-files directory> # Process the option --with-gxx-include-dir=<path to include-files directory>
AC_MSG_CHECKING([for --with-gxx-include-dir]) AC_MSG_CHECKING([for --with-gxx-include-dir])
AC_ARG_WITH(gxx-include-dir, AC_ARG_WITH(gxx-include-dir,
...@@ -1856,26 +1852,30 @@ version_specific_libs=no)dnl ...@@ -1856,26 +1852,30 @@ 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.
if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/c++/${gcc_version}
fi
# Version-specific runtime libs processing.
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.
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/'`
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/c++
fi fi
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
# Default case for install directory for include files.
if test $version_specific_libs = no &&
test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface}
fi fi
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
......
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
...@@ -12,9 +12,6 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD ...@@ -12,9 +12,6 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD
PACKAGE=libstdc++ PACKAGE=libstdc++
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
# For typical GNU versioning info, format is MAJOR.MINOR.MICRO
release_VERSION=3.1.1
AC_SUBST(release_VERSION)
# For libtool versioning info, format is CURRENT:REVISION:AGE # For libtool versioning info, format is CURRENT:REVISION:AGE
libtool_VERSION=4:1:0 libtool_VERSION=4:1:0
AC_SUBST(libtool_VERSION) AC_SUBST(libtool_VERSION)
...@@ -378,9 +375,6 @@ else ...@@ -378,9 +375,6 @@ else
multilib_arg= multilib_arg=
fi fi
# Needed so that g++ can find the correct include subdir automatically.
INTERFACE=v3
# Export all the install information # Export all the install information
GLIBCPP_EXPORT_INSTALL_INFO GLIBCPP_EXPORT_INSTALL_INFO
......
libstdc++-v3/include/Makefile.in
...@@ -125,7 +125,6 @@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ ...@@ -125,7 +125,6 @@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/libio/Makefile.in
...@@ -127,7 +127,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -127,7 +127,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/libmath/Makefile.in
...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -125,7 +125,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -125,7 +125,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/po/Makefile.in
...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
......
libstdc++-v3/src/Makefile.in
...@@ -122,7 +122,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -122,7 +122,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
......
libstdc++-v3/testsuite/Makefile.in
...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@ ...@@ -129,7 +129,6 @@ gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libio_la = @libio_la@ libio_la = @libio_la@
libtool_VERSION = @libtool_VERSION@ libtool_VERSION = @libtool_VERSION@
release_VERSION = @release_VERSION@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = cygnus dejagnu AUTOMAKE_OPTIONS = cygnus dejagnu
......
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