summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpanne <unknown>2003-08-20 15:54:45 +0000
committerpanne <unknown>2003-08-20 15:54:45 +0000
commit793ae9ef474a90b7e66bca52591d3cdf7efa61a8 (patch)
tree48c94acb5b6ba629f103f1661a78de69cbb703d4
parente0933fa4f2f4950e42c8b3dedeaa6b1622c762d9 (diff)
downloadhaskell-793ae9ef474a90b7e66bca52591d3cdf7efa61a8.tar.gz
[project @ 2003-08-20 15:54:43 by panne]
Nuked FPTOOLS_O_BINARY test and use FP_CHECK_CONST instead, which is shorter and better (e.g. cross compilation).
-rw-r--r--aclocal.m426
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 27 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index e7f51e6264..9bc0d4ce73 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -743,32 +743,6 @@ undefine([AC_CV_NAME])dnl
])
-dnl *** Can we open files in binary mode? ***
-dnl
-AC_DEFUN(FPTOOLS_O_BINARY,
-[
-AC_REQUIRE([AC_PROG_CC])
-AC_MSG_CHECKING(whether we can open files in binary mode)
-AC_CACHE_VAL(fptools_cv_have_o_binary,
-[
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILE(
-[#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif],
-[int x = O_BINARY;],
-fptools_cv_have_o_binary=yes,
-fptools_cv_have_o_binary=no)
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($fptools_cv_have_o_binary)
-if test "$fptools_cv_have_o_binary" = yes; then
- AC_DEFINE([HAVE_O_BINARY], [1], [Define to 1 if fcntl.h defines O_BINARY.])
-fi
-])
-
-
dnl Based on AC_TRY_LINK - run iftrue if links cleanly with no warning
dnl FPTOOLS_TRY_LINK_NOWARN(flags,main?,iftrue,iffalse)
diff --git a/configure.ac b/configure.ac
index 7422f47d27..c8e75b0740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -956,7 +956,7 @@ fi
FP_CHECK_CONSTS([E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EADV EAFNOSUPPORT EAGAIN EALREADY EBADF EBADMSG EBADRPC EBUSY ECHILD ECOMM ECONNABORTED ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDIRTY EDOM EDQUOT EEXIST EFAULT EFBIG EFTYPE EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK EMSGSIZE EMULTIHOP ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK ENOMEM ENOMSG ENONET ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK ENOTCONN ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM EPFNOSUPPORT EPIPE EPROCLIM EPROCUNAVAIL EPROGMISMATCH EPROGUNAVAIL EPROTO EPROTONOSUPPORT EPROTOTYPE ERANGE EREMCHG EREMOTE EROFS ERPCMISMATCH ERREMOTE ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESRMNT ESTALE ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV], [#include <errno.h>])
dnl ** can we open files in binary mode?
-FPTOOLS_O_BINARY
+FP_CHECK_CONST([O_BINARY], [#include <fcntl.h>], [0])
dnl ** check for GetModuleFileName and WinExec (windows only)
dnl Old: AC_CHECK_FUNCS(WinExec GetModuleFileName) dnl Windows