This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[libstdc++] Build system cleanup [4/n]
- From: Kelley Cook <kcook at gcc dot gnu dot org>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>, libstdc++ at gcc dot gnu dot org
- Date: Mon, 04 Apr 2005 16:43:58 -0400
- Subject: [libstdc++] Build system cleanup [4/n]
- Hop-count: 1
This takes advantage of a feature introduced with aclocal 1.8 which
automatically m4_include all the required macro files. This gets rid of
the manual includes in configure.ac and acinclude.m4 as well as the
libtool dance that GCC used to use.
It is noteworthy that this change results in no change to the generated
configure file while the only change to Makefile.in is the proper
recognition of libtool.m4 and crossconfig.m4 as dependencies for aclocal.m4.
GCC's other subdirectories using automake are using already using this.
Bootstrapped along with the other changes on i686-pc-cygwin
OK to install?
2005-04-04 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.
diff -pud /home/kcook34/gcc-orig/libstdc++-v3/Makefile.am ./Makefile.am
--- /home/kcook34/gcc-orig/libstdc++-v3/Makefile.am 2004-12-08 10:41:41.000000000 -0500
+++ ./Makefile.am 2005-04-01 16:19:23.881626800 -0500
@@ -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 -pud /home/kcook34/gcc-orig/libstdc++-v3/acinclude.m4 ./acinclude.m4
--- /home/kcook34/gcc-orig/libstdc++-v3/acinclude.m4 2005-03-24 00:44:28.000000000 -0500
+++ ./acinclude.m4 2005-04-01 16:06:39.440039200 -0500
@@ -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 -pud /home/kcook34/gcc-orig/libstdc++-v3/configure.ac ./configure.ac
--- /home/kcook34/gcc-orig/libstdc++-v3/configure.ac 2005-03-24 00:45:42.000000000 -0500
+++ ./configure.ac 2005-04-01 16:12:24.799422400 -0500
@@ -222,7 +219,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 -pud /home/kcook34/gcc-orig/libstdc++-v3/crossconfig.m4 ./crossconfig.m4
--- /home/kcook34/gcc-orig/libstdc++-v3/crossconfig.m4 2005-03-24 00:45:42.000000000 -0500
+++ ./crossconfig.m4 2005-04-01 17:09:47.529341500 -0500
@@ -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
-
+])