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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88205 138bc75d-0d04-0410-961f-82ee72b054a4

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
@@ -15155,7 +15155,6 @@ objdir=`${PWDCMD-pwd}`
 
 
 
-
 if test x"$SET_GCC_LIB_PATH_CMD" != x; then
   # SET_GCC_LIB_PATH_CMD is "XXX=path; export XXX;". It is expanded to
   #
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.