+2005-03-21 Zack Weinberg <zack@codesourcery.com>
+
+ * acinclude.m4 (GLIBCXX_CONFIGURE): Delete gcc_version logic.
+ (GLIBCXX_EXPORT_INSTALL_INFO): Adjust quotation so ${gcc_version}
+ is expanded by the Makefiles, not by configure.
+ * fragment.am: Set gcc_version.
+ * libmath/Makefile.am: Likewise.
+ * configure, Makefile.in, include/Makefile.in, libmath/Makefile.in
+ * libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in
+ * testsuite/Makefile.in: Regenerate.
+
2005-03-16 Paolo Carlini <pcarlini@suse.de>
* testsuite/20_util/functional/binders.cc: Remove explicit
* testsuite/23_containers/vector/cons/1.cc: Likewise.
* testsuite/23_containers/vector/cons/2.cc: Likewise.
* testsuite/23_containers/vector/cons/3.cc: Likewise.
- * testsuite/23_containers/vector/cons/6513.cc: Likewise.
+ * testsuite/23_containers/vector/cons/6513.cc: Likewise.
* testsuite/23_containers/vector/element_access/1.cc: Likewise.
* testsuite/23_containers/vector/invalidation/1.cc: Likewise.
* testsuite/23_containers/vector/invalidation/2.cc: Likewise.
* testsuite/23_containers/vector/invalidation/4.cc: Likewise.
* testsuite/23_containers/vector/modifiers/1.cc: Likewise.
* testsuite/23_containers/vector/modifiers/2.cc: Likewise.
- * testsuite/23_containers/vector/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/vector/modifiers/swap.cc: Likewise.
* testsuite/23_containers/vector/resize/1.cc: Likewise.
* testsuite/24_iterators/back_insert_iterator.cc: Likewise.
* testsuite/24_iterators/front_insert_iterator.cc: Likewise.
* testsuite/25_algorithms/copy/1.cc: Likewise.
* testsuite/25_algorithms/copy/2.cc: Likewise.
* testsuite/25_algorithms/copy/3.cc: Likewise.
- * testsuite/25_algorithms/copy/4.cc: Likewise.
+ * testsuite/25_algorithms/copy/4.cc: Likewise.
* testsuite/25_algorithms/equal.cc: Likewise.
* testsuite/25_algorithms/fill/1.cc: Likewise.
* testsuite/25_algorithms/fill/2.cc: Likewise.
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
dnl variables like $host.
dnl
dnl Sets:
-dnl gcc_version (x.y.z format)
dnl SUBDIRS
dnl Substs:
dnl glibcxx_builddir (absolute path)
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
- # For directory versioning (e.g., headers) and other variables.
- AC_MSG_CHECKING([for GCC version number])
- gcc_version=`$CXX -dumpversion`
- AC_MSG_RESULT($gcc_version)
-
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
# available). Uncomment the next line to force a particular method.
AC_PROG_LN_S
# 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}
+ gxx_include_dir='${prefix}/include/c++/${gcc_version}'
fi
# Version-specific runtime libs processing.
# 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
- gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
+ gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
fi
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
- glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
+ glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
- # For directory versioning (e.g., headers) and other variables.
- echo "$as_me:$LINENO: checking for GCC version number" >&5
-echo $ECHO_N "checking for GCC version number... $ECHO_C" >&6
- gcc_version=`$CXX -dumpversion`
- echo "$as_me:$LINENO: result: $gcc_version" >&5
-echo "${ECHO_T}$gcc_version" >&6
-
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
# available). Uncomment the next line to force a particular method.
echo "$as_me:$LINENO: checking whether ln -s works" >&5
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4393 "configure"' > conftest.$ac_ext
+ echo '#line 4386 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
#
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF
-#line 5014 "configure"
+#line 5007 "configure"
struct S { ~S(); };
void bar();
void foo()
# 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}
+ gxx_include_dir='${prefix}/include/c++/${gcc_version}'
fi
# Version-specific runtime libs processing.
# 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
- gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
+ gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
fi
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
- glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
+ glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
## This is used in all Makefile.am's except for libmath's. Set defaults here.
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = $(LIBMATHOBJS)
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = dejagnu nostdinc
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}