From 677b3ae39a0420e00430245ad9d32c31b60eb82c Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 4 Apr 2002 21:33:33 +0000 Subject: [PATCH] via gawrilow@math.tu-berlin.de 2002-04-04 Benjamin Kosnik libstdc++/3457 via gawrilow@math.tu-berlin.de * acinclude.m4 (version_specific_libs): Fix combo usage with --with-gxx-include-dir. * aclocal.m4: Regenerate. * configure: Same. From-SVN: r51875 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/acinclude.m4 | 4 +++- libstdc++-v3/aclocal.m4 | 4 +++- libstdc++-v3/configure | 6 ++++-- libstdc++-v3/include/Makefile.in | 30 ++++++++++++++---------------- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 08561c0a97f..1125257b58a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2002-04-04 Benjamin Kosnik + + libstdc++/3457 + via gawrilow@math.tu-berlin.de + * acinclude.m4 (version_specific_libs): Fix combo usage with + --with-gxx-include-dir. + * aclocal.m4: Regenerate. + * configure: Same. + 2002-04-03 Benjamin Kosnik As per DR 184, libstdc++/3139 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 412a0a917db..38fa8140d35 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1847,7 +1847,9 @@ if test $version_specific_libs = yes; then 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++ + if test x"$gxx_include_dir" = x"no"; then + gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ + fi glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' changequote([,])dnl diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index eda0f222c2b..07cf49436b4 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1859,7 +1859,9 @@ if test $version_specific_libs = yes; then 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++ + if test x"$gxx_include_dir" = x"no"; then + gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ + fi glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' changequote([,])dnl diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 1c19f9b66fb..a7117c8efca 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -21260,7 +21260,9 @@ if test $version_specific_libs = yes; then 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++ + if test x"$gxx_include_dir" = x"no"; then + gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++ + fi glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' fi @@ -21285,7 +21287,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then fi echo $ac_n "checking for install location""... $ac_c" 1>&6 -echo "configure:21289: checking for install location" >&5 +echo "configure:21291: checking for install location" >&5 echo "$ac_t""$gxx_include_dir" 1>&6 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 9068ee8d5b7..c24c6e26fbe 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -458,9 +458,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnits include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -473,13 +473,8 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = include distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits include/Makefile @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ @@ -492,10 +487,12 @@ info-am: info: info-am dvi-am: dvi: dvi-am -check-am: all-am +check-am: check: check-am installcheck-am: installcheck: installcheck-am +install-info-am: +install-info: install-info-am install-exec-am: install-exec: install-exec-am @@ -543,11 +540,12 @@ maintainer-clean-am: maintainer-clean-generic distclean-am maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-local all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +installcheck-am installcheck install-info-am install-info \ +install-exec-am install-exec install-data-local install-data-am \ +install-data install-am install uninstall-am uninstall all-local \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Here are the rules for building the headers -- 2.30.2