2002-11-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/sysv-ipc.m4: Adaptation to autoconf-2.5x.
	* aclocal/check-newlib.m4: Sync with ../aclocal/check-newlib.m4.

3 files changed, 23 insertions, 26 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 39de930743..d2860d9319 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,6 +1,11 @@
+2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/sysv-ipc.m4: Adaptation to autoconf-2.5x.
+	* aclocal/check-newlib.m4: Sync with ../aclocal/check-newlib.m4.
+
 2002-11-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-	* include/rtems/libio.h: Remove.
+	* include/rtems/libio_.h: Remove.
 
 2002-11-18	Joel Sherrill <joel@OARcorp.com>
 
diff --git a/cpukit/aclocal/check-newlib.m4 b/cpukit/aclocal/check-newlib.m4
index a26624702e..e80755d462 100644
--- a/cpukit/aclocal/check-newlib.m4
+++ b/cpukit/aclocal/check-newlib.m4
@@ -8,19 +8,18 @@ AC_CACHE_CHECK([for RTEMS newlib],
   rtems_cv_use_newlib,
   [
 dnl some versions of newlib provide not_required_by_rtems
-    AC_TRY_LINK(
-      [extern void not_required_by_rtems() ;],
-      [not_required_by_rtems()],
-      rtems_cv_use_newlib="yes")
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[extern void not_required_by_rtems() ;]], 
+        [[not_required_by_rtems()]])],
+      [rtems_cv_use_newlib="yes"],[])
 
 dnl some versions of newlib provide rtems_provides_crt0()
     AS_IF([test -z "$rtems_cv_use_newlib"],
-      [AC_TRY_LINK(
-        [extern void rtems_provides_crt0() ;],
-        [rtems_provides_crt0()],
-        rtems_cv_use_newlib="yes",
-        rtems_cv_use_newlib="no")]
-    )
+      [AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM([[extern void rtems_provides_crt0() ;]],
+           [[rtems_provides_crt0()]])],
+         [rtems_cv_use_newlib="yes"],[rtems_cv_use_newlib="no"])
+    ])
   ])
   RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
   AC_SUBST(RTEMS_USE_NEWLIB)
diff --git a/cpukit/aclocal/sysv-ipc.m4 b/cpukit/aclocal/sysv-ipc.m4
index 5b3fff738a..b73f515073 100644
--- a/cpukit/aclocal/sysv-ipc.m4
+++ b/cpukit/aclocal/sysv-ipc.m4
@@ -20,13 +20,10 @@ AC_DEFUN(RTEMS_UNION_SEMUN,
 [
 AC_CACHE_CHECK([whether $host defines union semun],
   rtems_cv_HAS_UNION_SEMUN,
-  [AC_TRY_COMPILE([
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/ipc.h>
-#include <sys/sem.h>],
-[union semun arg ;],
-[rtems_cv_HAS_UNION_SEMUN="yes"],
-[rtems_cv_HAS_UNION_SEMUN="no"])
+#include <sys/sem.h>]], [[union semun arg ;]])],[rtems_cv_HAS_UNION_SEMUN="yes"],[rtems_cv_HAS_UNION_SEMUN="no"])
 ])
 if test "$rtems_cv_HAS_UNION_SEMUN" = "yes"; then
     AC_DEFINE(HAS_UNION_SEMUN,[1],[if having union semum])
@@ -39,8 +36,7 @@ AC_DEFUN(RTEMS_SYSV_SEM,
 AC_CACHE_CHECK(whether $host supports System V semaphores,
 rtems_cv_sysv_sem,
 [
-AC_TRY_RUN(
-[
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
@@ -62,8 +58,7 @@ int main () {
     exit(1);
   exit(0);
 }
-],
-rtems_cv_sysv_sem="yes", rtems_cv_sysv_sem="no", :)
+]])],[rtems_cv_sysv_sem="yes"],[rtems_cv_sysv_sem="no"],[:])
 ])
 ])
 
@@ -73,7 +68,7 @@ AC_DEFUN(RTEMS_SYSV_SHM,
 AC_CACHE_CHECK(whether $host supports System V shared memory,
 rtems_cv_sysv_shm,
 [
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -85,8 +80,7 @@ int main () {
     exit(1);
   exit(0);
 }
-],
-rtems_cv_sysv_shm="yes", rtems_cv_sysv_shm="no", :)
+]])],[rtems_cv_sysv_shm="yes"],[rtems_cv_sysv_shm="no"],[:])
 ])
 ])
 
@@ -96,7 +90,7 @@ AC_DEFUN(RTEMS_SYSV_MSG,
 AC_CACHE_CHECK(whether $host supports System V messages,
 rtems_cv_sysv_msg,
 [
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -108,8 +102,7 @@ int main () {
     exit(1);
   exit(0);
 }
-],
-rtems_cv_sysv_msg="yes", rtems_cv_sysv_msg="no", :)
+]])],[rtems_cv_sysv_msg="yes"],[rtems_cv_sysv_msg="no"],[:])
 ])
 ])