X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=baa2f7db432c70eacdfe134d348db179bccdac3b;hb=7ff3d6a07f27b854e0d4b54ba8aa0b3c5ffc81a5;hp=d56d0ca3fffd7e147a73daf24e476b265d401ddf;hpb=e8b241ace9b6fde6c76cc46b5d32ef8439d690a4;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index d56d0ca..baa2f7d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,15 +16,17 @@ dnl # 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 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 @@ -103,6 +105,24 @@ alpha*-unknown-freebsd*) HostVendor_CPP='unknown' HostOS_CPP='freebsd' ;; +arm*-linux*) + HostPlatform=arm-unknown-linux # hack again + TargetPlatform=arm-unknown-linux + BuildPlatform=arm-unknown-linux + HostPlatform_CPP='arm_unknown_linux' + HostArch_CPP='arm' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; +hppa*-*-linux*) + HostPlatform=hppa-unknown-linux # hack again + TargetPlatform=hppa-unknown-linux + BuildPlatform=hppa-unknown-linux + HostPlatform_CPP='hppa_unknown_linux' + HostArch_CPP='hppa' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; hppa1.1-hp-hpux*) HostPlatform=hppa1.1-hp-hpux # canonicalise for our purposes (hack) TargetPlatform=hppa1.1-hp-hpux @@ -204,6 +224,24 @@ ia64-*-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-*-linux*) + HostPlatform=m68k-unknown-linux # hack again + TargetPlatform=m68k-unknown-linux + BuildPlatform=m68k-unknown-linux + HostPlatform_CPP='m68k_unknown_linux' + HostArch_CPP='m68k' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; m68k-next-nextstep2) HostPlatform_CPP='m68k_next_nextstep2' HostArch_CPP='m68k' @@ -234,13 +272,13 @@ m68k-*-openbsd*) HostVendor_CPP='unknown' HostOS_CPP='openbsd' ;; -m68k-apple-netbsd*) - HostPlatform=m68k-apple-netbsd - TargetPlatform=m68k-apple-netbsd - BuildPlatform=m68k-apple-netbsd - HostPlatform_CPP='m68k_apple_netbsd' +m68k-*-netbsd*) + HostPlatform=m68k-unknown-netbsd + TargetPlatform=m68k-unknown-netbsd + BuildPlatform=m68k-unknown-netbsd + HostPlatform_CPP='m68k_unknown_netbsd' HostArch_CPP='m68k' - HostVendor_CPP='apple' + HostVendor_CPP='unknown' HostOS_CPP='netbsd' ;; m68k-sun-sunos4*) @@ -252,6 +290,15 @@ m68k-sun-sunos4*) HostVendor_CPP='sun' HostOS_CPP='sunos4' ;; +mips-*-linux*) + HostPlatform=mips-unknown-linux # hack again + TargetPlatform=mips-unknown-linux + BuildPlatform=mips-unknown-linux + HostPlatform_CPP='mips_unknown_linux' + HostArch_CPP='mips' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; mips-dec-ultrix*) HostPlatform_CPP='mips_dec_ultrix' HostArch_CPP='mipsel' # NB a little different @@ -294,6 +341,24 @@ powerpc-apple-darwin*) HostVendor_CPP='apple' HostOS_CPP='darwin' ;; +powerpc-unknown-linux*) + HostPlatform=powerpc-unknown-linux + TargetPlatform=powerpc-unknown-linux + BuildPlatform=powerpc-unknown-linux + HostPlatform_CPP='powerpc_unknown_linux' + HostArch_CPP='powerpc' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; +s390-ibm-linux*) + HostPlatform=s390-ibm-linux + TargetPlatform=s390-ibm-linux #hack + BuildPlatform=s390-ibm-linux #hack + HostPlatform_CPP='s390_ibm_linux' + HostArch_CPP='s390' + HostVendor_CPP='ibm' + HostOS_CPP='linux' + ;; sparc-sun-sunos4*) HostPlatform=sparc-sun-sunos4 TargetPlatform=sparc-sun-sunos4 #hack @@ -349,27 +414,25 @@ TargetOS_CPP=$HostOS_CPP BuildVendor_CPP=$HostVendor_CPP TargetVendor_CPP=$HostVendor_CPP -dnl Cannot afford all these SUBSTs (because of braindead seds w/ 99 cmd limits) -dnl AC_SUBST(BuildPlatform) - +AC_SUBST(BuildPlatform) AC_SUBST(HostPlatform) AC_SUBST(TargetPlatform) AC_SUBST(HostPlatform_CPP) -dnl AC_SUBST(BuildPlatform_CPP) -dnl AC_SUBST(TargetPlatform_CPP) +AC_SUBST(BuildPlatform_CPP) +AC_SUBST(TargetPlatform_CPP) AC_SUBST(HostArch_CPP) -dnl AC_SUBST(BuildArch_CPP) -dnl AC_SUBST(TargetArch_CPP) +AC_SUBST(BuildArch_CPP) +AC_SUBST(TargetArch_CPP) AC_SUBST(HostOS_CPP) AC_SUBST(HostOS_Full) -dnl AC_SUBST(BuildOS_CPP) -dnl AC_SUBST(TargetOS_CPP) +AC_SUBST(BuildOS_CPP) +AC_SUBST(TargetOS_CPP) AC_SUBST(HostVendor_CPP) -dnl AC_SUBST(BuildVendor_CPP) -dnl AC_SUBST(TargetVendor_CPP) +AC_SUBST(BuildVendor_CPP) +AC_SUBST(TargetVendor_CPP) AC_SUBST(exeext) @@ -570,7 +633,8 @@ AC_ARG_ENABLE(hopengl, UseQuartzOpenGL=NO if test x"$TargetOS_CPP" = x"darwin"; then if test x"$enable_hopengl" != x"x11"; then - AC_DEFINE(USE_QUARTZ_OPENGL) + AC_DEFINE([USE_QUARTZ_OPENGL], [1], + [Define to 1 if native OpenGL should be used on Mac OS X]) UseQuartzOpenGL=YES fi fi @@ -583,7 +647,7 @@ AC_ARG_ENABLE(dotnet, [ --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) @@ -642,25 +706,23 @@ AC_PROG_CPP 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 -FPTOOLS_PROG_DIFF +FP_PROG_CONTEXT_DIFF dnl ** Find find command (for Win32's benefit) -FPTOOLS_FIND_FIND +FP_PROG_FIND 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_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 @@ -680,9 +742,6 @@ dnl ** check for 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, @@ -706,15 +765,6 @@ case $Catalog in 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 @@ -729,10 +779,10 @@ fi AC_ARG_WITH(greencard, [ --with-greencard= - 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) ] ) @@ -789,7 +839,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_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]) @@ -797,10 +847,10 @@ AC_CHECK_HEADER(readline/history.h, [HaveReadlineHistoryH=YES], [HaveReadlineHis 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 - 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) @@ -811,11 +861,14 @@ dnl ** check for Windows include files AC_CHECK_HEADERS(windows.h) dnl ** check for OpenGL include files +fp_save_cppflags="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" if test $UseQuartzOpenGL = YES ; then AC_CHECK_HEADERS(OpenGL/gl.h) else AC_CHECK_HEADERS(GL/gl.h) fi +CPPFLAGS="$fp_save_cppflags" dnl ** check if it is safe to include both and AC_HEADER_TIME @@ -831,63 +884,70 @@ AC_CHECK_HEADER(malloc.h,[AC_CHECK_FUNCS(valloc)]) dnl ** check for POSIX regex HavePosixRegex=NO -AC_CHECK_HEADER(regex.h,[AC_CHECK_FUNC(regcomp, [HavePosixRegex=YES])]) +AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNC(regcomp, [HavePosixRegex=YES])]) AC_SUBST(HavePosixRegex) dnl ** how do we get a timezone name, and UTC offset ? AC_STRUCT_TIMEZONE dnl ** do we have altzone? -FP_ALTZONE +FP_DECL_ALTZONE dnl ** does struct stat contain st_blksize? AC_STRUCT_ST_BLKSIZE dnl ** do we have long longs? -FPTOOLS_C_LONG_LONG +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 +#endif +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_SYS_UIO_H +# include +#endif]) dnl ** what are the sizes of various types -dnl (these must come before GHC_CHECK_ALIGNMENT) AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(double, 8) AC_CHECK_SIZEOF(float, 4) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) -if test "$fptools_cv_have_long_long" = yes; then +if test "$ac_cv_type_long_long" = yes; then AC_CHECK_SIZEOF(long long, 8) fi AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(unsigned char, 1) AC_CHECK_SIZEOF(unsigned int, 4) AC_CHECK_SIZEOF(unsigned long, 4) -if test "$fptools_cv_have_long_long" = yes; then +if test "$ac_cv_type_long_long" = yes; then AC_CHECK_SIZEOF(unsigned long long, 8) fi AC_CHECK_SIZEOF(unsigned short, 2) AC_CHECK_SIZEOF(void *, 4) dnl ** what are alignment constraints on various types -FPTOOLS_CHECK_ALIGNMENT(char) -FPTOOLS_CHECK_ALIGNMENT(double) -FPTOOLS_CHECK_ALIGNMENT(float) -FPTOOLS_CHECK_ALIGNMENT(int) -FPTOOLS_CHECK_ALIGNMENT(long) -if test "$fptools_cv_have_long_long" = yes; then -FPTOOLS_CHECK_ALIGNMENT(long long) +FP_CHECK_ALIGNMENT(char) +FP_CHECK_ALIGNMENT(double) +FP_CHECK_ALIGNMENT(float) +FP_CHECK_ALIGNMENT(int) +FP_CHECK_ALIGNMENT(long) +if test "$ac_cv_type_long_long" = yes; then +FP_CHECK_ALIGNMENT(long long) fi -FPTOOLS_CHECK_ALIGNMENT(short) -FPTOOLS_CHECK_ALIGNMENT(unsigned char) -FPTOOLS_CHECK_ALIGNMENT(unsigned int) -FPTOOLS_CHECK_ALIGNMENT(unsigned long) -if test "$fptools_cv_have_long_long" = yes; then -FPTOOLS_CHECK_ALIGNMENT(unsigned long long) +FP_CHECK_ALIGNMENT(short) +FP_CHECK_ALIGNMENT(unsigned char) +FP_CHECK_ALIGNMENT(unsigned int) +FP_CHECK_ALIGNMENT(unsigned long) +if test "$ac_cv_type_long_long" = yes; then +FP_CHECK_ALIGNMENT(unsigned long long) fi -FPTOOLS_CHECK_ALIGNMENT(unsigned short) -FPTOOLS_CHECK_ALIGNMENT(void *) +FP_CHECK_ALIGNMENT(unsigned short) +FP_CHECK_ALIGNMENT(void *) dnl ** map standard C types and ISO types to Haskell types FPTOOLS_CHECK_HTYPE(char) @@ -899,7 +959,7 @@ FPTOOLS_CHECK_HTYPE(int) FPTOOLS_CHECK_HTYPE(unsigned int) FPTOOLS_CHECK_HTYPE(long) FPTOOLS_CHECK_HTYPE(unsigned long) -if test "$fptools_cv_have_long_long" = yes; then +if test "$ac_cv_type_long_long" = yes; then FPTOOLS_CHECK_HTYPE(long long) FPTOOLS_CHECK_HTYPE(unsigned long long) fi @@ -926,6 +986,7 @@ FPTOOLS_CHECK_HTYPE(blkcnt_t) FPTOOLS_CHECK_HTYPE(nlink_t) FPTOOLS_CHECK_HTYPE(ssize_t) FPTOOLS_CHECK_HTYPE(rlim_t) +FPTOOLS_CHECK_HTYPE(wint_t) dnl ** Map OpenGL data types to Haskell types if test $GhcLibsWithHOpenGL = YES ; then @@ -945,10 +1006,11 @@ FPTOOLS_CHECK_HTYPE(GLdouble) 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 +#include ]) dnl ** can we open files in binary mode? -FPTOOLS_O_BINARY +FP_CHECK_CONST([O_BINARY], [#include ], [0]) dnl ** check for GetModuleFileName and WinExec (windows only) dnl Old: AC_CHECK_FUNCS(WinExec GetModuleFileName) dnl Windows @@ -967,7 +1029,7 @@ main() { [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(,[ @@ -983,7 +1045,7 @@ main() { [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 @@ -1007,7 +1069,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 -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 @@ -1024,7 +1086,7 @@ AC_CHECK_FUNCS(setenv unsetenv) dnl ** check for specific library functions that we are interested in -AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r) +AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat siginterrupt symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r) dnl ** Solaris2 needs additionl flag for getpw*_r() case "$TargetPlatform" in @@ -1049,7 +1111,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 - 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]) @@ -1061,12 +1123,12 @@ AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO) 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 -if test "$HostArch_CPP" = "ia64"; then -AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64).]) +if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then +AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).]) fi; fi; @@ -1075,6 +1137,13 @@ dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc) AC_CHECK_LIB(bfd, bfd_init) +dnl ** check for wide-char classifications +dnl FreeBSD has an emtpy wctype.h, so test one of the affected +dnl functions if it's really there. +AC_CHECK_HEADERS(wctype.h, + [AC_CHECK_FUNCS(iswspace)] +) + 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 +1158,24 @@ if test $HaveLibTermcap = YES ; 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 - 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, - [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_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 - 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 @@ -1145,11 +1214,11 @@ if test $HaveFrameworkHaskellSupport = YES; then 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 - AC_DEFINE(HAVE_RTLDGLOBAL) + AC_DEFINE([HAVE_RTLDGLOBAL], [1], [Define to 1 if RTLD_GLOBAL is available.]) 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) @@ -1158,7 +1227,7 @@ if test $HaveFrameworkHaskellSupport = YES; then 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) @@ -1174,7 +1243,7 @@ else #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) @@ -1252,8 +1321,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" ) - 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 @@ -1262,7 +1330,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, - [ 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 -------------------------------------------------- @@ -1270,7 +1338,7 @@ dnl * test for Linux sendfile(2) 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 -------------------------------------------------- @@ -1278,7 +1346,7 @@ dnl * test for BSD sendfile(2) 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 -------------------------------------------------- @@ -1318,9 +1386,6 @@ AC_FUNC_VFORK dnl ** determine whether or not const works AC_C_CONST -dnl ** determine whether ANSI-function prototypes work? -AC_C_PROTOTYPES - dnl ** are we big endian? AC_C_BIGENDIAN @@ -1344,7 +1409,7 @@ AC_EGREP_CPP(we_have_sigpoll, #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]) @@ -1356,7 +1421,7 @@ we_have_that_sysconf_thing #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 defines _SC_GETGR_R_SIZE_MAX.])], [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX]) @@ -1368,7 +1433,7 @@ we_have_that_sysconf_thing #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 defines _SC_GETPW_R_SIZE_MAX.])], [AC_MSG_RESULT([no])]) AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )