diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7461bd1e318943205de2163771f19bbe490b50f6..80a7f32100e1c400d11138c8f97bf1c4e3d793c2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-05 Kelley Cook <kcook@gcc.gnu.org>
+
+ * Makefile.am (ACLOCAL_AMFLAGS): Define.
+ * crossconfig.m4: Wrap file into new GLIBCXX_CROSSCONFIG macro.
+ * configure.ac: Use it.
+ * acinclude.m4: Delete explicit m4_includes and sincludes.
+ * aclocal.m4, configure, Makefile.in, po/Makefile.in,
+ src/Makefile.in, include/Makefile.in, libmath/Makefile.in,
+ testsuite/Makefile.in: Regenerate.
+
2005-04-05 Jonathan Wakely <redi@gcc.gnu.org>
* include/tr1/memory, include/tr1/boost_shared_ptr.h: Use mutex
@@ -23,7 +33,7 @@
2005-04-05 Kelley Cook <kcook@gcc.gnu.org>
- * acconfig.h: Delete macros already ACDEFINED.
+ * acconfig.h: Delete macros already AC_DEFINED.
* config.h.in: Regenerate.
2005-04-05 Kelley Cook <kcook@gcc.gnu.org>
diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 89fe901cf720bcdfb92774d5c4001dae8e1da7c3..bccacb65f78a9fbac37b1653eacf37c99ecaa5ca 100644
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -30,6 +30,8 @@ endif
## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE.
SUBDIRS = include libsupc++ $(hosted_source)
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+
# These rules are messy, but are hella worth it.
doxygen:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 2d03aa9e6b5cd501c36cc6fa730f33d90aa184df..0cf5e061596c74a715cbaa5ed7ee516ca61ffc3b 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -46,10 +46,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
$(top_srcdir)/scripts/testsuite_flags.in ChangeLog acconfig.h
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -275,6 +274,7 @@ WARN_CXXFLAGS = \
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
@GLIBCXX_HOSTED_TRUE@hosted_source = libmath src po testsuite
SUBDIRS = include libsupc++ $(hosted_source)
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config
# Multilib support.
MAKEOVERRIDES =
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 92ce9a238ecba16df2df2064ccf50ad4d79b10c4..d911e2f803224f897cc0f8e9ab85bf7e0464508f 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -131,10 +131,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
])
-m4_include([linkage.m4])
-m4_include([../config/no-executables.m4])
-
-
dnl
dnl Tests for newer compiler features, or features that are present in newer
dnl compiler versions but not older compiler versions still in use, should
@@ -1820,14 +1816,4 @@ AC_DEFUN([AC_LC_MESSAGES], [
])
-sinclude([../libtool.m4])
-dnl The lines below arrange for aclocal not to bring an installed
-dnl libtool.m4 into aclocal.m4, while still arranging for automake to
-dnl add a definition of LIBTOOL to Makefile.in.
-ifelse(,,,[AC_SUBST(LIBTOOL)
-AC_DEFUN([AM_PROG_LIBTOOL])
-AC_DEFUN([AC_LIBTOOL_DLOPEN])
-AC_DEFUN([AC_PROG_LD])
-])
-
dnl vim:et:ts=2:sw=2
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 0111a59f978e2a30ec40a4690215dabb253daf7c..7dda07cdfd0399865b9544b1d413bc8f6d11ff01 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -817,4 +817,8 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../config/no-executables.m4])
+m4_include([../libtool.m4])
+m4_include([crossconfig.m4])
+m4_include([linkage.m4])
m4_include([acinclude.m4])
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 908fada25a84087a9f63e105e2931cbb76a3aace..778483ec105273bf5a0eb5d648305cad2730063a 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -86504,7 +86504,6 @@ echo "$as_me: error: No support for this host/target combination." >&2;}
;;
esac
-
fi
# At some point, we should differentiate between architectures
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index f2271c1740666df3bf618171e5125476c0630d82..8d2844ad86b102eea94642da250bde7d95dbddd0 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -222,7 +222,7 @@ else
AC_DEFINE(HAVE_S_ISREG)
AC_DEFINE(HAVE_S_IFREG)
else
- m4_include([crossconfig.m4])
+ GLIBCXX_CROSSCONFIG
fi
# At some point, we should differentiate between architectures
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 598a5de4558e1856f12592dfe668fc747a3b6c58..200aa6275cc8ecf4f54327c64d6c3a9de2552468 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -2,6 +2,7 @@ dnl
dnl This file contains details for non-natives builds.
dnl
+AC_DEFUN([GLIBCXX_CROSSCONFIG],[
# Base decisions on target environment.
case "${host}" in
arm*-*-symbianelf*)
@@ -477,4 +478,4 @@ case "${host}" in
AC_MSG_ERROR([No support for this host/target combination.])
;;
esac
-
+])
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index ddd636c9eace6ca1c10e90946fa7b97ab914c114..66c3899f7ae3ff6e6a9e159630fe06c1e545122e 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -40,10 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index 5e6e5adefd10c045b5f3a4274d0d680ff9d6b1c4..fa6a32eea9f2e3c8e863a1e411b7b11cce664ddd 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -42,10 +42,9 @@ target_triplet = @target@
subdir = libmath
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 6bf437166f3503f4ace3665bb4b24aefcfcb6d94..93c8d09f273fdb27035fd7f07a3836c53fb07858 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -44,10 +44,9 @@ DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/fragment.am
subdir = libsupc++
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index a402a67515f0fbfbcf00ab1199d1564ed1103ea2..cc0937f1384a5c4e5cba0e5f16323834f0db9941 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -40,10 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = po
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 1770a5dcb3b85ad7b9508fa6223046fd4843263d..c3729ca53ca9437a711b199deb1ea0ac61c4b06a 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -42,10 +42,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index c96fabc6707d381352db4f7375259196cd64a27b..77ac3c2ad1c1eb7662156af1a184fe301364b32a 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -43,10 +43,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = testsuite
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/linkage.m4 \
- $(top_srcdir)/../config/no-executables.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
+ $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)