configure: use AC_CHECK_DECLS instead of AC_EGREP_CPP

Author: Bodigrim

System/Posix/DynamicLinker/Prim.hsc

@@ -60,16 +60,16 @@ import GHC.IO.Exception ( unsupportedOperation )
 
 haveRtldNext :: Bool
 
-#ifdef HAVE_RTLDNEXT
+#ifdef HAVE_DECL_RTLD_NEXT
 haveRtldNext = True
 foreign import ccall unsafe "__hsunix_rtldNext" rtldNext :: Ptr a
-#else  /* HAVE_RTLDNEXT */
+#else  /* HAVE_DECL_RTLD_NEXT */
 haveRtldNext = False
-#endif /* HAVE_RTLDNEXT */
+#endif /* HAVE_DECL_RTLD_NEXT */
 
-#ifdef HAVE_RTLDDEFAULT
+#ifdef HAVE_DECL_RTLD_DEFAULT
 foreign import ccall unsafe "__hsunix_rtldDefault" rtldDefault :: Ptr a
-#endif /* HAVE_RTLDDEFAULT */
+#endif /* HAVE_DECL_RTLD_DEFAULT */
 
 haveRtldLocal :: Bool
 haveRtldLocal = True
@@ -128,13 +128,13 @@ data DL = Null | Next | Default | DLHandle (Ptr ()) deriving (Show)
 packDL :: DL -> Ptr ()
 packDL Null = nullPtr
 
-#ifdef HAVE_RTLDNEXT
+#ifdef HAVE_DECL_RTLD_NEXT
 packDL Next = rtldNext
 #else
 packDL Next = error "RTLD_NEXT not available"
 #endif
 
-#ifdef HAVE_RTLDDEFAULT
+#ifdef HAVE_DECL_RTLD_DEFAULT
 packDL Default = rtldDefault
 #else
 packDL Default = nullPtr

System/Posix/Fcntl.hsc

@@ -30,17 +30,17 @@ module System.Posix.Fcntl (
 import Foreign.C
 import System.Posix.Types
 
-#if !HAVE_POSIX_FALLOCATE || !HAVE_O_DIRECT
+#if !HAVE_POSIX_FALLOCATE || !HAVE_DECL_O_DIRECT
 import System.IO.Error ( ioeSetLocation )
 import GHC.IO.Exception ( unsupportedOperation )
 #endif
 
-#if HAVE_O_DIRECT
+#if HAVE_DECL_O_DIRECT
 import Data.Bits (complement, (.&.), (.|.))
 import System.Posix.Internals (c_fcntl_read)
 #endif
 
-#if HAVE_O_DIRECT || HAVE_F_NOCACHE
+#if HAVE_DECL_O_DIRECT || HAVE_DECL_F_NOCACHE
 import System.Posix.Internals (c_fcntl_write)
 #endif
 
@@ -128,20 +128,20 @@ fileAllocate _ _ _ = ioError (ioeSetLocation unsupportedOperation
 -- Throws 'IOError' (\"unsupported operation\") if platform does not support
 -- getting the cache mode.
 --
--- Use @#if HAVE_O_DIRECT@ CPP guard to detect availability. Use @#include
--- "HsUnix.h"@ to bring @HAVE_O_DIRECT@ into scope.
+-- Use @#if HAVE_DECL_O_DIRECT@ CPP guard to detect availability. Use @#include
+-- "HsUnix.h"@ to bring @HAVE_DECL_O_DIRECT@ into scope.
 --
 -- @since 2.8.7.0
 fileGetCaching :: Fd -> IO Bool
-#if HAVE_O_DIRECT
+#if HAVE_DECL_O_DIRECT
 fileGetCaching (Fd fd) = do
     r <- throwErrnoIfMinus1 "fileGetCaching" (c_fcntl_read fd #{const F_GETFL})
     return ((r .&. opt_val) == 0)
   where
     opt_val = #{const O_DIRECT}
 #else
 {-# WARNING fileGetCaching
-     "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_O_DIRECT@)" #-}
+     "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_DECL_O_DIRECT@)" #-}
 fileGetCaching _ = ioError (ioeSetLocation unsupportedOperation "fileGetCaching")
 #endif
 
@@ -158,25 +158,25 @@ fileGetCaching _ = ioError (ioeSetLocation unsupportedOperation "fileGetCaching"
 -- Throws 'IOError' (\"unsupported operation\") if platform does not support
 -- setting the cache mode.
 --
--- Use @#if HAVE_O_DIRECT || HAVE_F_NOCACHE@ CPP guard to detect availability.
--- Use @#include "HsUnix.h"@ to bring @HAVE_O_DIRECT@ and @HAVE_F_NOCACHE@ into
+-- Use @#if HAVE_DECL_O_DIRECT || HAVE_DECL_F_NOCACHE@ CPP guard to detect availability.
+-- Use @#include "HsUnix.h"@ to bring @HAVE_DECL_O_DIRECT@ and @HAVE_DECL_F_NOCACHE@ into
 -- scope.
 --
 -- @since 2.8.7.0
 fileSetCaching :: Fd -> Bool -> IO ()
-#if HAVE_O_DIRECT
+#if HAVE_DECL_O_DIRECT
 fileSetCaching (Fd fd) val = do
     r <- throwErrnoIfMinus1 "fileSetCaching" (c_fcntl_read fd #{const F_GETFL})
     let r' | val       = fromIntegral r .&. complement opt_val
            | otherwise = fromIntegral r .|. opt_val
     throwErrnoIfMinus1_ "fileSetCaching" (c_fcntl_write fd #{const F_SETFL} r')
   where
     opt_val = #{const O_DIRECT}
-#elif HAVE_F_NOCACHE
+#elif HAVE_DECL_F_NOCACHE
 fileSetCaching (Fd fd) val = do
     throwErrnoIfMinus1_ "fileSetCaching" (c_fcntl_write fd #{const F_NOCACHE} (if val then 0 else 1))
 #else
 {-# WARNING fileSetCaching
-     "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_O_DIRECT || HAVE_F_NOCACHE @)" #-}
+     "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_DECL_O_DIRECT || HAVE_DECL_F_NOCACHE @)" #-}
 fileSetCaching _ _ = ioError (ioeSetLocation unsupportedOperation "fileSetCaching")
 #endif

System/Posix/IO/Common.hsc

@@ -371,21 +371,21 @@ data LockRequest = ReadLock
 
 type FileLock = (LockRequest, SeekMode, FileOffset, FileOffset)
 
-#if !defined(HAVE_F_GETLK)
+#if !defined(HAVE_DECL_F_GETLK)
 
 getLock :: Fd -> FileLock -> IO (Maybe (ProcessID, FileLock))
 {-# WARNING getLock
-    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_F_GETLK@)" #-}
+    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_DECL_F_GETLK@)" #-}
 getLock _ _ = ioError (ioeSetLocation unsupportedOperation "getLock")
 
 setLock :: Fd -> FileLock -> IO ()
 {-# WARNING setLock
-    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_F_GETLK@)" #-}
+    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_DECL_F_GETLK@)" #-}
 setLock _ _ = ioError (ioeSetLocation unsupportedOperation "setLock")
 
 waitToSetLock :: Fd -> FileLock -> IO ()
 {-# WARNING waitToSetLock
-    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_F_GETLK@)" #-}
+    "operation will throw 'IOError' \"unsupported operation\" (CPP guard: @#if HAVE_DECL_F_GETLK@)" #-}
 waitToSetLock _ _ = ioError (ioeSetLocation unsupportedOperation "waitToSetLock")
 
 #else
@@ -449,7 +449,7 @@ waitToSetLock (Fd fd) lock = do
     throwErrnoIfMinus1_ "waitToSetLock"
         (Base.c_fcntl_lock fd (#const F_SETLKW) p_flock)
 
-#endif // HAVE_F_GETLK
+#endif // HAVE_DECL_F_GETLK
 
 -- -----------------------------------------------------------------------------
 -- fd{Read,Write}Buf

System/Posix/User.hsc

@@ -493,7 +493,7 @@ getAllGroupEntries = error "System.Posix.User.getAllGroupEntries: not supported"
 
 #if defined(HAVE_GETGRGID_R) || defined(HAVE_GETGRNAM_R)
 grBufSize :: Int
-#if defined(HAVE_SYSCONF) && defined(HAVE_SC_GETGR_R_SIZE_MAX)
+#if defined(HAVE_SYSCONF) && defined(HAVE_DECL__SC_GETGR_R_SIZE_MAX)
 grBufSize = sysconfWithDefault 1024 (#const _SC_GETGR_R_SIZE_MAX)
 #else
 grBufSize = 1024
@@ -615,7 +615,7 @@ getAllUserEntries = error "System.Posix.User.getAllUserEntries: not supported"
 
 #if defined(HAVE_GETPWUID_R) || defined(HAVE_GETPWNAM_R)
 pwBufSize :: Int
-#if  defined(HAVE_SYSCONF) && defined(HAVE_SC_GETPW_R_SIZE_MAX)
+#if  defined(HAVE_SYSCONF) && defined(HAVE_DECL__SC_GETPW_R_SIZE_MAX)
 pwBufSize = sysconfWithDefault 1024 (#const _SC_GETPW_R_SIZE_MAX)
 #else
 pwBufSize = 1024

System/Posix/User/ByteString.hsc

@@ -456,7 +456,7 @@ getAllGroupEntries = error "System.Posix.User.getAllGroupEntries: not supported"
 
 #if defined(HAVE_GETGRGID_R) || defined(HAVE_GETGRNAM_R)
 grBufSize :: Int
-#if defined(HAVE_SYSCONF) && defined(HAVE_SC_GETGR_R_SIZE_MAX)
+#if defined(HAVE_SYSCONF) && defined(HAVE_DECL__SC_GETGR_R_SIZE_MAX)
 grBufSize = sysconfWithDefault 1024 (#const _SC_GETGR_R_SIZE_MAX)
 #else
 grBufSize = 1024
@@ -532,7 +532,7 @@ getAllUserEntries = error "System.Posix.User.getAllUserEntries: not supported"
 
 #if defined(HAVE_GETPWUID_R) || defined(HAVE_GETPWNAM_R)
 pwBufSize :: Int
-#if  defined(HAVE_SYSCONF) && defined(HAVE_SC_GETPW_R_SIZE_MAX)
+#if  defined(HAVE_SYSCONF) && defined(HAVE_DECL__SC_GETPW_R_SIZE_MAX)
 pwBufSize = sysconfWithDefault 1024 (#const _SC_GETPW_R_SIZE_MAX)
 #else
 pwBufSize = 1024

cbits/HsUnix.c

@@ -10,11 +10,11 @@
 
 char **__hsunix_get_environ (void) {return environ;}
 
-#ifdef HAVE_RTLDNEXT
+#ifdef HAVE_DECL_RTLD_NEXT
 void *__hsunix_rtldNext (void) {return RTLD_NEXT;}
 #endif
 
-#ifdef HAVE_RTLDDEFAULT
+#ifdef HAVE_DECL_RTLD_DEFAULT
 void *__hsunix_rtldDefault (void) {return RTLD_DEFAULT;}
 #endif
 

configure.ac

@@ -105,48 +105,11 @@ AC_MSG_RESULT(no)
 ]
 )
 
-
-AC_MSG_CHECKING(for F_GETLK from fcntl.h)
-AC_EGREP_CPP(yes,
-[
- #include <fcntl.h>
- #ifdef F_GETLK
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE([HAVE_F_GETLK], [1], [Define to 1 if F_GETLK is available.])
-], [
-  AC_MSG_RESULT(no)
-  ])
-
-AC_MSG_CHECKING(for O_DIRECT open flag)
-AC_EGREP_CPP(yes,
-[
- #include <fcntl.h>
- #ifdef O_DIRECT
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE([HAVE_O_DIRECT], [1], [Define to 1 if O_DIRECT open flag is available.])
-], [
-  AC_MSG_RESULT(no)
-  ])
-
-AC_MSG_CHECKING(for F_NOCACHE from fcntl.h)
-AC_EGREP_CPP(yes,
-[
- #include <fcntl.h>
- #ifdef F_NOCACHE
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE([HAVE_F_NOCACHE], [1], [Define to 1 if F_NOCACHE available.])
-], [
-  AC_MSG_RESULT(no)
-  ])
+AC_CHECK_DECLS([F_GETLK, O_DIRECT, F_NOCACHE], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+])
 
 dnl not available on android so check for it
 AC_CANONICAL_TARGET
@@ -232,29 +195,11 @@ FP_CHECK_CONSTS([SIGABRT SIGALRM SIGBUS SIGCHLD SIGCONT SIGFPE SIGHUP SIGILL SIG
 #include <signal.h>
 #endif])
 
-AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX])
-AC_EGREP_CPP(we_have_that_sysconf_thing,
-[
-#include <unistd.h>
-#ifdef _SC_GETGR_R_SIZE_MAX
-we_have_that_sysconf_thing
-#endif
-],
-[AC_MSG_RESULT([yes])
-AC_DEFINE([HAVE_SC_GETGR_R_SIZE_MAX], [1], [Define to 1 if <unistd.h> defines _SC_GETGR_R_SIZE_MAX.])],
-[AC_MSG_RESULT([no])])
-
-AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX])
-AC_EGREP_CPP(we_have_that_sysconf_thing,
-[
+AC_CHECK_DECLS([_SC_GETGR_R_SIZE_MAX, _SC_GETPW_R_SIZE_MAX], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#ifdef _SC_GETPW_R_SIZE_MAX
-we_have_that_sysconf_thing
 #endif
-],
-[AC_MSG_RESULT([yes])
-AC_DEFINE([HAVE_SC_GETPW_R_SIZE_MAX], [1], [Define to 1 if <unistd.h> defines _SC_GETPW_R_SIZE_MAX.])],
-[AC_MSG_RESULT([no])])
+])
 
 dnl ---------- usleep ----------
 dnl --- stolen from guile configure ---
@@ -288,33 +233,12 @@ esac
 dnl On some hosts (e.g. SuSe and Ubuntu Linux) RTLD_NEXT and RTLD_DEFAULT are
 dnl not visible without setting _GNU_SOURCE, which we really don't want to.
 dnl Also see comments in System/Posix/DynamicLinker/Prim.hsc.
-AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
-AC_EGREP_CPP(yes,
-[
- #include <dlfcn.h>
- #ifdef RTLD_NEXT
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE([HAVE_RTLDNEXT], [1], [Define to 1 if we can see RTLD_NEXT in dlfcn.h.])
-], [
-  AC_MSG_RESULT(no)
-  ])
 
-AC_MSG_CHECKING(for RTLD_DEFAULT from dlfcn.h)
-AC_EGREP_CPP(yes,
-[
- #include <dlfcn.h>
- #ifdef RTLD_DEFAULT
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE([HAVE_RTLDDEFAULT], [1], [Define to 1 if RTLD_DEFAULT is available.])
-], [
-  AC_MSG_RESULT(no)
-  ])
+AC_CHECK_DECLS([RTLD_NEXT, RTLD_DEFAULT], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+])
 
 AC_CHECK_FUNCS(openpty,,
    AC_CHECK_LIB(util,openpty,

include/HsUnix.h

@@ -100,11 +100,11 @@ extern HsInt nocldstop;
 /* defined in libc */
 extern char **environ;
 
-#ifdef HAVE_RTLDNEXT
+#ifdef HAVE_DECL_RTLD_NEXT
 void *__hsunix_rtldNext (void);
 #endif
 
-#ifdef HAVE_RTLDDEFAULT
+#ifdef HAVE_DECL_RTLD_DEFAULT
 void *__hsunix_rtldDefault (void);
 #endif