* configure.in, aclocal.m4: Revert to pre-2.5x conversion status.

	* configure: Regenerate with autoconf 2.13.


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

1 files changed, 22 insertions, 1 deletions

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 054a2bb3ec7..788db372e19 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -16,6 +16,27 @@ if test $ac_cv_header_stdbool_h = yes; then
 fi
 ])
 
+dnl Fixed AC_CHECK_TYPE that doesn't need anything in acconfig.h.
+dnl Remove after migrating to 2.5x.
+AC_DEFUN([gcc_AC_CHECK_TYPE],
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+  AC_DEFINE($1, $2, [Define as \`$2' if <sys/types.h> doesn't define.])
+fi
+])
+
+
 dnl See whether we can include both string.h and strings.h.
 AC_DEFUN([gcc_AC_HEADER_STRING],
 [AC_CACHE_CHECK([whether string.h and strings.h may both be included],
@@ -732,7 +753,7 @@ AC_DEFUN([gcc_GAS_CHECK_FEATURE],
   if test $in_tree_gas = yes; then
     gcc_GAS_VERSION_GTE_IFELSE($3, [[$2]=yes])
   el])if test x$gcc_cv_as != x; then
-    echo ifelse(m4_substr([$5],0,1),[$], "[$5]", '[$5]') > conftest.s
+    echo ifelse(substr([$5],0,1),[$], "[$5]", '[$5]') > conftest.s
     if AC_TRY_COMMAND([$gcc_cv_as $4 -o conftest.o conftest.s >&AC_FD_CC])
     then
 	ifelse([$6],, [$2]=yes, [$6])