From: panne <unknown>
Date: Wed, 22 Sep 2004 08:37:01 +0000 (+0000)
Subject: [project @ 2004-09-22 08:37:01 by panne]
X-Git-Tag: nhc98-1-18-release~246
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e689c74ff37943db15ce9886f6361387a8f80e5f;p=ghc-base.git

[project @ 2004-09-22 08:37:01 by panne]
* Replace obsolete macro AC_TRY_RUN with AC_RUN_IFELSE
* Same for AC_TRY_LINK and AC_LINK_IFELSE
* Minor cleanup
---

diff --git a/aclocal.m4 b/aclocal.m4
index d338568..cfc901b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,7 +8,7 @@ dnl
 dnl
 AC_DEFUN(FP_READDIR_EOF_ERRNO,
 [AC_CACHE_CHECK([what readdir sets errno to upon EOF], fptools_cv_readdir_eof_errno,
-[AC_TRY_RUN([#include <dirent.h>
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <dirent.h>
 #include <stdio.h>
 #include <errno.h>
 int
@@ -51,7 +51,7 @@ char **argv;
   closedir(dp);
   rmdir("testdir");
   return 0;
-}],fptools_cv_readdir_eof_errno=`cat conftestval`, fptools_cv_readdir_eof_errno=bogus, fptools_cv_readdir_eof_errno=0)])
+}]])],[fptools_cv_readdir_eof_errno=`cat conftestval`],[fptools_cv_readdir_eof_errno=bogus],[fptools_cv_readdir_eof_errno=0])])
 dnl the cross value is somewhat bogus.
 AC_DEFINE_UNQUOTED([READDIR_ERRNO_EOF], [$fptools_cv_readdir_eof_errno], [readdir() sets errno to this upon EOF])
 ])
@@ -67,7 +67,7 @@ dnl
 dnl
 AC_DEFUN(FP_DIRENT_FLAT_LAYOUT,
 [AC_CACHE_CHECK([if struct dirent layout is flat], fptools_cv_dirent_flat_layout,
-[AC_TRY_RUN([#include <dirent.h>
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <dirent.h>
 #include <stdio.h>
 #include <string.h>
 int
@@ -86,7 +86,7 @@ char **argv;
    */
   memset(&de,0,sizeof(struct dirent));
   return ((int)de.d_name == 0);
-}],fptools_cv_dirent_flat_layout=yes, fptools_cv_dirent_flat_layout=no, fptools_cv_dirent_flat_layout=yes)])
+}]])],[fptools_cv_dirent_flat_layout=yes],[fptools_cv_dirent_flat_layout=no],[fptools_cv_dirent_flat_layout=yes])])
 dnl the cross value is somewhat bogus.
 if test "$fptools_cv_dirent_flat_layout" = yes; then
 AC_DEFINE([STRUCT_DIRENT_FLAT_LAYOUT], [1], [Define to 1 if struct dirent is a flat structure])