From b2cace2966ca1a0058a2271980868ef7a9497c4b Mon Sep 17 00:00:00 2001
From: "R. Kelley Cook" <kcook@gcc.gnu.org>
Date: Mon, 27 Sep 2004 22:51:37 +0000
Subject: [PATCH] aclocal.m4: Quote m4_includes.

2004-09-27  Kelley Cook  <kcook@gcc.gnu.org>

	* aclocal.m4: Quote m4_includes. Include ../config/gcc-lib-path.m4.
	* configure.ac: Don't sinclude it here.
	* configure: Regenerate.

From-SVN: r88205
---
 gcc/aclocal.m4   | 19 ++++++++++---------
 gcc/configure    |  1 -
 gcc/configure.ac |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 6298451c79d..38c10c8238a 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -1,12 +1,13 @@
-m4_include(../config/accross.m4)
-m4_include(../config/acx.m4)
-m4_include(../config/gettext-sister.m4)
-m4_include(../config/iconv.m4)
-m4_include(../config/lcmessage.m4)
-m4_include(../config/lib-ld.m4)
-m4_include(../config/lib-link.m4)
-m4_include(../config/lib-prefix.m4)
-m4_include(../config/progtest.m4)
+m4_include([../config/accross.m4])
+m4_include([../config/acx.m4])
+m4_include([../config/gettext-sister.m4])
+m4_include([../config/gcc-lib-path.m4])
+m4_include([../config/iconv.m4])
+m4_include([../config/lcmessage.m4])
+m4_include([../config/lib-ld.m4])
+m4_include([../config/lib-link.m4])
+m4_include([../config/lib-prefix.m4])
+m4_include([../config/progtest.m4])
 
 dnl See whether we need a declaration for a function.
 dnl The result is highly dependent on the INCLUDES passed in, so make sure
diff --git a/gcc/configure b/gcc/configure
index f90cebc6330..1ce5ca03e12 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -15153,7 +15153,6 @@ objdir=`${PWDCMD-pwd}`
 
 
 
-
 
 
 if test x"$SET_GCC_LIB_PATH_CMD" != x; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4d7c8da7bc0..d81dad533db 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3262,7 +3262,6 @@ AC_SUBST(target_cpu_default)
 
 AC_SUBST_FILE(language_hooks)
 
-sinclude(../config/gcc-lib-path.m4)
 TL_AC_GNU_MAKE_GCC_LIB_PATH
 
 # Echo link setup.