X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=baa2f7db432c70eacdfe134d348db179bccdac3b;hb=7ff3d6a07f27b854e0d4b54ba8aa0b3c5ffc81a5;hp=def4085fab335af68fe36fa628f3e2ce7b4898ad;hpb=6628972212cd1837f4c6957eec886214325bb1cc;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index def4085..baa2f7d 100644 --- a/configure.ac +++ b/configure.ac @@ -105,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 @@ -215,6 +233,15 @@ x86_64-*-linux*) 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' @@ -245,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*) @@ -263,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 @@ -305,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 @@ -360,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) @@ -664,7 +716,7 @@ dnl ** figure out how to do context diffs 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 @@ -727,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) ] ) @@ -809,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 @@ -829,7 +884,7 @@ 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 ? @@ -931,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 @@ -950,7 +1006,8 @@ FPTOOLS_CHECK_HTYPE(GLdouble) FPTOOLS_CHECK_HTYPE(GLclampd) 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 ]) +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? FP_CHECK_CONST([O_BINARY], [#include ], [0]) @@ -1029,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 @@ -1070,8 +1127,8 @@ if test $HaveLibMingwEx = YES ; then 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; @@ -1081,7 +1138,11 @@ AC_CHECK_LIB(iberty, xmalloc) AC_CHECK_LIB(bfd, bfd_init) dnl ** check for wide-char classifications -AC_CHECK_HEADERS(wctype.h) +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,