[project @ 2003-08-27 15:18:29 by panne]

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41de88b..bba4b3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,15 +16,17 @@ dnl
 # First off, a distrib sanity check..
 AC_INIT(mk/config.mk.in)
 
 # First off, a distrib sanity check..
 AC_INIT(mk/config.mk.in)
 

-dnl * We require autoconf version 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE
-AC_PREREQ(2.50)
+dnl * We require autoconf version 2.52
+dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
+dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH.
+AC_PREREQ(2.52)

 
 dnl * Declare subdirectories that have a private configure script
 dnl
 dnl After the toplevel configuration is complete, the script will recurse into
 
 dnl * Declare subdirectories that have a private configure script
 dnl
 dnl After the toplevel configuration is complete, the script will recurse into

-dnl these subdirectories (the use of cache values makes repeated checks cheap)
-dnl (We probably have to add hslibs/{OpenGL,GLUT} here later...)
-AC_CONFIG_SUBDIRS(ghc)
+dnl these subdirectories if they exist. The use of a cache file makes repeated
+dnl checks cheap.
+AC_CONFIG_SUBDIRS([ghc libraries])

 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files

@@ -204,6 +206,15 @@ ia64-*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;

+x86_64-*-linux*)
+        HostPlatform=x86_64-unknown-linux
+        TargetPlatform=x86_64-unknown-linux
+        BuildPlatform=x86_64-unknown-linux
+        HostPlatform_CPP='x86_64_unknown_linux'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='linux'
+       ;;

 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
         HostArch_CPP='m68k'
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
         HostArch_CPP='m68k'

@@ -584,7 +595,7 @@ AC_ARG_ENABLE(dotnet,
 [  --enable-dotnet
         Build .NET interop layer.
 ],
 [  --enable-dotnet
         Build .NET interop layer.
 ],

-[DotnetSupport=YES; AC_DEFINE(WANT_DOTNET_SUPPORT)],
+[DotnetSupport=YES; AC_DEFINE([WANT_DOTNET_SUPPORT], [1], [Define to 1 if you want to include .NET interop support.])],

 [DotnetSupport=NO]
 )
 AC_SUBST(DotnetSupport)
 [DotnetSupport=NO]
 )
 AC_SUBST(DotnetSupport)

@@ -643,12 +654,10 @@ AC_PROG_CPP
 dnl ** Without optimization some INLINE trickery fails for GHCi
 SRC_CC_OPTS="-O"
 
 dnl ** Without optimization some INLINE trickery fails for GHCi
 SRC_CC_OPTS="-O"
 

-dnl ** Try to add -mno-cygwin to the C compiler options for mingw32 targets
-if test x"$TargetOS_CPP" = x"mingw32"; then
-  FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN)
-  SRC_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $SRC_CC_OPTS"
-  CPPFLAGS="$CC_SUPPORTS_MNO_CYGWIN $CPPFLAGS"
-fi
+dnl ** Try to add -mno-cygwin to the C compiler options
+FP_CHECK_FLAG([-mno-cygwin], [
+SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS"
+CPPFLAGS="-mno-cygwin $CPPFLAGS"])

 AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs
 AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs

@@ -661,7 +670,7 @@ dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
 
 dnl If you can run configure, you certainly have /bin/sh
 AC_PROG_INSTALL
 
 dnl If you can run configure, you certainly have /bin/sh

-AC_DEFINE(HAVE_BIN_SH)
+AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])

 
 dnl ** how to invoke `ar' and `ranlib'
 FPTOOLS_PROG_AR_AND_RANLIB
 
 dnl ** how to invoke `ar' and `ranlib'
 FPTOOLS_PROG_AR_AND_RANLIB

@@ -681,9 +690,6 @@ dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 

-dnl ** check for gzip/compress
-AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
-

 dnl ** check for jade/openjade & determine a working catalog
 AC_PATH_PROGS(JadeCmd,openjade jade,jade)
 FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
 dnl ** check for jade/openjade & determine a working catalog
 AC_PATH_PROGS(JadeCmd,openjade jade,jade)
 FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 

@@ -707,15 +713,6 @@ case $Catalog in
 esac   
 AC_SUBST(Catalog)
 
 esac   
 AC_SUBST(Catalog)
 

-compress_nm=`basename $CompressCmd`
-if test x"$compress_nm" = xgzip; then
-  CompressCmd="$CompressCmd -d"
-  CompressSuffix="gz"
-else
-  CompressSuffix="Z"
-fi
-AC_SUBST(CompressCmd)
-AC_SUBST(CompressSuffix)

 
 dnl ** check for ghc-pkg command
 changequote(, )dnl
 
 dnl ** check for ghc-pkg command
 changequote(, )dnl

@@ -730,10 +727,10 @@ fi
 
 AC_ARG_WITH(greencard,
 [  --with-greencard=<greencard compiler>
 
 AC_ARG_WITH(greencard,
 [  --with-greencard=<greencard compiler>

-        Use a command different from 'green-card' to compile GreenCard files
+        Use a command different from 'greencard' to compile GreenCard files

 ],
 [
 ],
 [

-GreencardCmd=$withval;
+GreenCardCmd=$withval;

 FPTOOLS_GREENCARD(3.00)
 ]
 )
 FPTOOLS_GREENCARD(3.00)
 ]
 )

@@ -790,7 +787,7 @@ dnl    off_t, because it will affect the result of that test.
 AC_SYS_LARGEFILE
 
 dnl ** check for specific header (.h) files that we are interested in
 AC_SYS_LARGEFILE
 
 dnl ** check for specific header (.h) files that we are interested in

-AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stddef.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h bfd.h winsock.h pthread.h sys/uio.h)
+AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h locale.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stddef.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h bfd.h winsock.h pthread.h sys/uio.h)

 AC_CHECK_HEADER(unistd.h,[AC_CHECK_FUNCS(lchown)])
 
 AC_CHECK_HEADER(readline/readline.h, [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO])
 AC_CHECK_HEADER(unistd.h,[AC_CHECK_FUNCS(lchown)])
 
 AC_CHECK_HEADER(readline/readline.h, [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO])

@@ -798,10 +795,10 @@ AC_CHECK_HEADER(readline/history.h, [HaveReadlineHistoryH=YES], [HaveReadlineHis
 
 if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then
   HaveReadlineHeaders=YES
 
 if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then
   HaveReadlineHeaders=YES

-  AC_DEFINE(HAVE_READLINE_HEADERS,1)
+  AC_DEFINE([HAVE_READLINE_HEADERS], [1], [Define to 1 if readline/readline.h and readline/history.h exist.])

 else
   HaveReadlineHeaders=NO
 else
   HaveReadlineHeaders=NO

-  AC_DEFINE(HAVE_READLINE_HEADERS,0)
+  AC_DEFINE([HAVE_READLINE_HEADERS], [0], [Define to 1 if readline/readline.h and readline/history.h exist.])

 fi
 AC_SUBST(HaveReadlineHeaders)
 
 fi
 AC_SUBST(HaveReadlineHeaders)
 

@@ -848,8 +845,16 @@ dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
 dnl ** check what fields struct msghdr contains
 AC_CHECK_TYPES([long long])
 
 dnl ** check what fields struct msghdr contains

-FPTOOLS_MSGHDR_MSG_ACCRIGHTS
-FPTOOLS_MSGHDR_MSG_CONTROL
+AC_CHECK_HEADERS([sys/types.h sys/socket.h sys/uio.h])
+AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], [], [], [#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif])

 
 dnl ** what are the sizes of various types
 AC_CHECK_SIZEOF(char,               1)
 
 dnl ** what are the sizes of various types
 AC_CHECK_SIZEOF(char,               1)

@@ -945,10 +950,10 @@ FPTOOLS_CHECK_HTYPE(GLdouble)
 FPTOOLS_CHECK_HTYPE(GLclampd)
 fi
 
 FPTOOLS_CHECK_HTYPE(GLclampd)
 fi
 

-FPTOOLS_CHECK_CCONSTS(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)
+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?
 
 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
 
 dnl ** check for GetModuleFileName and WinExec (windows only)
 dnl Old: AC_CHECK_FUNCS(WinExec GetModuleFileName)       dnl Windows

@@ -967,7 +972,7 @@ main() {
 [have_winexec=1],
 [have_winexec=0])
 if test "$have_winexec" = "1"; then
 [have_winexec=1],
 [have_winexec=0])
 if test "$have_winexec" = "1"; then

-AC_DEFINE(HAVE_WINEXEC)
+  AC_DEFINE([HAVE_WINEXEC], [1], [Define to 1 if you have the WinExec function.])

 fi
 
 FPTOOLS_TRY_LINK_NOWARN(,[
 fi
 
 FPTOOLS_TRY_LINK_NOWARN(,[

@@ -983,7 +988,7 @@ main() {
 [have_getmodulefilename=1],
 [have_getmodulefilename=0])
 if test "$have_getmodulefilename" = "1"; then
 [have_getmodulefilename=1],
 [have_getmodulefilename=0])
 if test "$have_getmodulefilename" = "1"; then

-AC_DEFINE(HAVE_GETMODULEFILENAME)
+AC_DEFINE([HAVE_GETMODULEFILENAME], [1], [Define to 1 if you have the GetModuleFileName function.])

 fi
 
 dnl ** check return type of signal handlers
 fi
 
 dnl ** check return type of signal handlers

@@ -1007,7 +1012,7 @@ dnl fi
 dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)".
 AC_TYPE_SIGNAL
 if test "$ac_cv_type_signal" = void; then
 dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)".
 AC_TYPE_SIGNAL
 if test "$ac_cv_type_signal" = void; then

-AC_DEFINE(VOID_INT_SIGNALS)
+  AC_DEFINE([VOID_INT_SIGNALS], [1], [Define to 1 if signal handlers have type void (*)(int). Otherwise, they're assumed to have type int (*)(void).])

 fi
 
 dnl ** check for more functions
 fi
 
 dnl ** check for more functions

@@ -1049,7 +1054,7 @@ if test $HostPlatform = "powerpc-apple-darwin"; then
  LIBS="-framework HaskellSupport"
  AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
  if test $HaveFrameworkHaskellSupport = YES; then
  LIBS="-framework HaskellSupport"
  AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
  if test $HaveFrameworkHaskellSupport = YES; then

-  AC_DEFINE(HAVE_FRAMEWORK_HASKELLSUPPORT)
+  AC_DEFINE([HAVE_FRAMEWORK_HASKELLSUPPORT], [1], [Define to 1 if the HaskellSupport.framework is installed (Mac OS X only).])

  fi;
  LIBS="$save_libs"
  AC_MSG_RESULT([$HaveFrameworkHaskellSupport])
  fi;
  LIBS="$save_libs"
  AC_MSG_RESULT([$HaveFrameworkHaskellSupport])

@@ -1061,7 +1066,7 @@ AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
 AC_SUBST(HaveLibMingwEx)
 
 if test $HaveLibMingwEx = YES ; then
 AC_SUBST(HaveLibMingwEx)
 
 if test $HaveLibMingwEx = YES ; then

-  AC_DEFINE(HAVE_MINGWEX)
+  AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.])

 fi
 
 if test "$HaveLibGmp" = "NO"; then
 fi
 
 if test "$HaveLibGmp" = "NO"; then

@@ -1075,6 +1080,9 @@ dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
 AC_CHECK_LIB(bfd,    bfd_init)
 
 AC_CHECK_LIB(iberty, xmalloc)
 AC_CHECK_LIB(bfd,    bfd_init)
 

+dnl ** check for wide-char classifications
+AC_CHECK_HEADERS(wctype.h)
+

 dnl ** check for readline, for Hugs and hslibs' Readline
 dnl ncurses supersedes termcap and curses, but for compatibility,
 dnl we have to check for all...
 dnl ** check for readline, for Hugs and hslibs' Readline
 dnl ncurses supersedes termcap and curses, but for compatibility,
 dnl we have to check for all...

@@ -1089,24 +1097,24 @@ if test $HaveLibTermcap = YES ; then
 fi
 
 if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
 fi
 
 if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then

-  AC_DEFINE(HAVE_READLINE_LIBS,1)
+  AC_DEFINE([HAVE_READLINE_LIBS], [1], [Define to 1 if readline plus any additional libs needed for it exist.])

   LibsReadline="readline $LibTermcap"
 else
   LibsReadline="readline $LibTermcap"
 else

-  AC_DEFINE(HAVE_READLINE_LIBS,0)
+  AC_DEFINE([HAVE_READLINE_LIBS], [0], [Define to 1 if readline plus any additional libs needed for it exist.])

   LibsReadline=
 fi
 AC_SUBST(LibsReadline)
 
 if test "$HaveLibReadline"; then
   AC_CHECK_LIB(readline, rl_erase_empty_line,
   LibsReadline=
 fi
 AC_SUBST(LibsReadline)
 
 if test "$HaveLibReadline"; then
   AC_CHECK_LIB(readline, rl_erase_empty_line,

-    [AC_DEFINE(HAVE_READLINE_4, 1)],
-    [AC_DEFINE(HAVE_READLINE_4, 0)])
+    [AC_DEFINE([HAVE_READLINE_4], [1], [Define to 1 if readline has version >= 4.0.])],
+    [AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.])])

   AC_CHECK_LIB(readline, rl_free_undo_list,
   AC_CHECK_LIB(readline, rl_free_undo_list,

-    [AC_DEFINE(HAVE_READLINE_4_2, 1)],
-    [AC_DEFINE(HAVE_READLINE_4_2, 0)])
+    [AC_DEFINE([HAVE_READLINE_4_2], [1], [Define to 1 if readline has version >= 4.2.])],
+    [AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.])])

 else
 else

-  AC_DEFINE(HAVE_READLINE_4, 0)
-  AC_DEFINE(HAVE_READLINE_4_2, 0)
+  AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.])
+  AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.])

 fi
 
 dnl ** check for math library
 fi
 
 dnl ** check for math library

@@ -1145,11 +1153,11 @@ if test $HaveFrameworkHaskellSupport = YES; then
     HaveLibDL=NO
     HaveRtldNext=NO
     HaveRtldLocal=YES
     HaveLibDL=NO
     HaveRtldNext=NO
     HaveRtldLocal=YES

-    AC_DEFINE(HAVE_RTLDLOCAL)
+    AC_DEFINE([HAVE_RTLDLOCAL], [1], [Define to 1 if RTLD_LOCAL is available.])

     HaveRtldGlobal=YES
     HaveRtldGlobal=YES

-    AC_DEFINE(HAVE_RTLDGLOBAL)
+    AC_DEFINE([HAVE_RTLDGLOBAL], [1], [Define to 1 if RTLD_GLOBAL is available.])

     HaveRtldNow=YES
     HaveRtldNow=YES

-    AC_DEFINE(HAVE_RTLDNOW)
+    AC_DEFINE([HAVE_RTLDNOW], [1], [Define to 1 if we can see RTLD_NOW in dlfcn.h.])

     AC_SUBST(HaveLibDL)
     AC_SUBST(HaveRtldNext)
     AC_SUBST(HaveRtldLocal)
     AC_SUBST(HaveLibDL)
     AC_SUBST(HaveRtldNext)
     AC_SUBST(HaveRtldLocal)

@@ -1158,7 +1166,7 @@ if test $HaveFrameworkHaskellSupport = YES; then
 else
     AC_CHECK_LIB(dl, dlopen, 
        [HaveLibDL=YES
 else
     AC_CHECK_LIB(dl, dlopen, 
        [HaveLibDL=YES

-        AC_DEFINE(HAVE_LIBDL)
+        AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().])

         LIBS="$LIBS -ldl"], 
        [HaveLibDL=NO])
     AC_CHECK_FUNCS(dlopen)
         LIBS="$LIBS -ldl"], 
        [HaveLibDL=NO])
     AC_CHECK_FUNCS(dlopen)

@@ -1174,7 +1182,7 @@ else
      #endif
     ], [
       AC_MSG_RESULT(yes)
      #endif
     ], [
       AC_MSG_RESULT(yes)

-      AC_DEFINE(HAVE_RTLDNEXT)
+      AC_DEFINE([HAVE_RTLDNEXT], [1], [Define to 1 if we can see RTLD_NEXT in dlfcn.h.])

       HaveRtldNext=YES
     ], [
       AC_MSG_RESULT(no)
       HaveRtldNext=YES
     ], [
       AC_MSG_RESULT(no)

@@ -1252,8 +1260,7 @@ AC_CACHE_CHECK([return type of usleep], cv_func_usleep_return_type,
                    [cv_func_usleep_return_type=int])])
 case "$cv_func_usleep_return_type" in
   "void" )
                    [cv_func_usleep_return_type=int])])
 case "$cv_func_usleep_return_type" in
   "void" )

-    AC_DEFINE(USLEEP_RETURNS_VOID, 1,
-      [Define if the system headers declare usleep to return void.])
+    AC_DEFINE([USLEEP_RETURNS_VOID], [1], [Define if the system headers declare usleep to return void.])

   ;;
 esac
 
   ;;
 esac
 

@@ -1262,7 +1269,7 @@ dnl * test for in_addr_t
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for in_addr_t in netinet/in.h)
 AC_EGREP_HEADER(in_addr_t, netinet/in.h,
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for in_addr_t in netinet/in.h)
 AC_EGREP_HEADER(in_addr_t, netinet/in.h,

- [ AC_DEFINE(HAVE_IN_ADDR_T) AC_MSG_RESULT(yes) ],
+ [ AC_DEFINE([HAVE_IN_ADDR_T], [1], [Define to 1 if in_addr_t is available.]) AC_MSG_RESULT(yes) ],

  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------
  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------

@@ -1270,7 +1277,7 @@ dnl * test for Linux sendfile(2)
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for sendfile in sys/sendfile.h)
 AC_EGREP_HEADER(sendfile, sys/sendfile.h,
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for sendfile in sys/sendfile.h)
 AC_EGREP_HEADER(sendfile, sys/sendfile.h,

- [ AC_DEFINE(HAVE_LINUX_SENDFILE) AC_MSG_RESULT(yes) ],
+ [ AC_DEFINE([HAVE_LINUX_SENDFILE], [1], [Define to 1 if you have a Linux sendfile(2) implementation.]) AC_MSG_RESULT(yes) ],

  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------
  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------

@@ -1278,7 +1285,7 @@ dnl * test for BSD sendfile(2)
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for sendfile in sys/socket.h)
 AC_EGREP_HEADER(sendfile, sys/socket.h,
 dnl --------------------------------------------------
 AC_MSG_CHECKING(for sendfile in sys/socket.h)
 AC_EGREP_HEADER(sendfile, sys/socket.h,

- [ AC_DEFINE(HAVE_BSD_SENDFILE) AC_MSG_RESULT(yes) ],
+ [ AC_DEFINE([HAVE_BSD_SENDFILE], [1], [Define to 1 if you have a BSDish sendfile(2) implementation.]) AC_MSG_RESULT(yes) ],

  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------
  AC_MSG_RESULT(no))
 
 dnl --------------------------------------------------

@@ -1341,7 +1348,7 @@ AC_EGREP_CPP(we_have_sigpoll,
 #ifdef SIGPOLL
 we_have_sigpoll
 #endif
 #ifdef SIGPOLL
 we_have_sigpoll
 #endif

-], AC_DEFINE(HAVE_SIGPOLL) haveSIGPOLL=yes, haveSIGPOLL=no)
+], AC_DEFINE([HAVE_SIGPOLL], [1], [Define to 1 if you have the sigpoll() function.]) haveSIGPOLL=yes, haveSIGPOLL=no)

 AC_MSG_RESULT([$haveSIGPOLL])
 
 AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX])
 AC_MSG_RESULT([$haveSIGPOLL])
 
 AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX])

@@ -1353,7 +1360,7 @@ we_have_that_sysconf_thing
 #endif
 ],
 [AC_MSG_RESULT([yes])
 #endif
 ],
 [AC_MSG_RESULT([yes])

-AC_DEFINE(HAVE_SC_GETGR_R_SIZE_MAX)],
+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_MSG_RESULT([no])])
 
 AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX])

@@ -1365,7 +1372,7 @@ we_have_that_sysconf_thing
 #endif
 ],
 [AC_MSG_RESULT([yes])
 #endif
 ],
 [AC_MSG_RESULT([yes])

-AC_DEFINE(HAVE_SC_GETPW_R_SIZE_MAX)],
+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])])
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
 [AC_MSG_RESULT([no])])
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )