aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-12-07 13:33:17 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-12-07 13:33:17 +0000
commit76761d4715d79968cccbca945f33c3c1060ae292 (patch)
treedbe05fa71613537441f72eb9b75c6103be4ee9f3
parente1366e0c3942ac95b15477b9ca097fde2586cc26 (diff)
downloadgcc-76761d4715d79968cccbca945f33c3c1060ae292.zip
gcc-76761d4715d79968cccbca945f33c3c1060ae292.tar.gz
gcc-76761d4715d79968cccbca945f33c3c1060ae292.tar.bz2
configure.in: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
* configure.in: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE. * aclocal.m4 (gcc_AC_CHECK_TYPE): Remove. * configure: Regenerate. From-SVN: r74391
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/aclocal.m421
-rwxr-xr-xgcc/configure44
-rw-r--r--gcc/configure.in2
4 files changed, 37 insertions, 34 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23b5491..f34f808 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2003-12-07 Nathanael Nerode <neroden@gcc.gnu.org>
+ * configure.in: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
+ * aclocal.m4 (gcc_AC_CHECK_TYPE): Remove.
+ * configure: Regenerate.
+
* configure: Regenerate with (preferred) autoconf 2.57.
* doc/install.texi: Note that 'gcc' is now a 2.57 directory.
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index e2ed6b5..054a2bb 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -16,27 +16,6 @@ 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],
diff --git a/gcc/configure b/gcc/configure
index f8a27bc..2ea4a6b 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6828,26 +6828,46 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
+$ac_includes_default
+int
+main ()
+{
+if ((ssize_t *) 0)
+ return 0;
+if (sizeof (ssize_t))
+ return 0;
+ ;
+ return 0;
+}
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_type_ssize_t=yes
else
- ac_cv_type_ssize_t=no
-fi
-rm -f conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_type_ssize_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
-if test $ac_cv_type_ssize_t = no; then
+if test $ac_cv_type_ssize_t = yes; then
+ :
+else
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
#define ssize_t int
_ACEOF
diff --git a/gcc/configure.in b/gcc/configure.in
index a2fdb78..fb8d022 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -798,7 +798,7 @@ int main()
fi
fi
-gcc_AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(ssize_t, int)
# Try to determine the array type of the second argument of getgroups
# for the target system (int or gid_t).