diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-17 20:23:12 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-17 20:23:12 +0000 |
| commit | 2eb169cd8166ba8342c6783d1d21c0848c7fd156 (patch) | |
| tree | bc40445978d8406152440975e0c56f5763886180 /libstdc++-v3/aclocal.m4 | |
| parent | 049cadd673cd20c803614319a0075e2925acd3ce (diff) | |
| download | gcc-2eb169cd8166ba8342c6783d1d21c0848c7fd156.tar.gz | |
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70522 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index df6fb7b1868..0deaab2b66b 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -601,27 +601,27 @@ dnl dnl Substs: dnl GLIBCXX_INCLUDES dnl TOPLEVEL_INCLUDES -dnl LIBMATH_INCLUDES -dnl LIBSUPCXX_INCLUDES dnl AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [ - # Root level of the build directory include sources. - GLIBCXX_INCLUDES="-I$glibcxx_builddir/include/$host_alias -I$glibcxx_builddir/include" + # Used for every C++ compile we perform. + GLIBCXX_INCLUDES="\ +-I$glibcxx_builddir/include/$host_alias \ +-I$glibcxx_builddir/include \ +-I$glibcxx_srcdir/libsupc++" - # Passed down for canadian crosses. + # For Canadian crosses, pick this up too. if test $CANADIAN = yes; then - TOPLEVEL_INCLUDES='-I${includedir}' + GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES '-I${includedir}'" fi - LIBMATH_INCLUDES='-I${glibcxx_srcdir}/libmath' - - LIBSUPCXX_INCLUDES='-I${glibcxx_srcdir}/libsupc++' + # Stuff in the actual top level. Currently only used by libsupc++ to + # get unwind* headers from the gcc dir. + #TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include' + TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc' # Now, export this to all the little Makefiles.... AC_SUBST(GLIBCXX_INCLUDES) AC_SUBST(TOPLEVEL_INCLUDES) - AC_SUBST(LIBMATH_INCLUDES) - AC_SUBST(LIBSUPCXX_INCLUDES) ]) |