X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=28debbc33ca3e1b8e1a9acad67196c539ecbf836;hb=0d52a0a134871d317b5f8b53a952c882ce5ae5b6;hp=2430e419af61474a81f84ded4cd9e9eec5a375ff;hpb=cf6b632dc583846042f38bacefcb5aa4aa1f9305;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 2430e41..28debbc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ dnl (run "grep '^dnl \*' configure.ac | sed -e 's/dnl / /g; s/\*\*/ +/g;'" dnl (or some such) to see the outline of this file) dnl # -# (c) The AQUA Project, Glasgow University, 1994-1998 +# (c) The AQUA Project, Glasgow University, 1994-2004 # # Configure script template for the Glasgow functional programming tools # -# Process with 'autoconf' to get a working configure script. +# Process with 'autoreconf' to get a working configure script. # # For the generated configure script, do "./configure --help" to # see what flags are available. (Better yet, read the documentation!) @@ -406,6 +406,16 @@ powerpc-unknown-openbsd*) HostVendor_CPP='unknown' HostOS_CPP='openbsd' ;; +powerpc64-unknown-linux*) + HostPlatform=powerpc64-unknown-linux + TargetPlatform=powerpc64-unknown-linux + BuildPlatform=powerpc64-unknown-linux + HostPlatform_CPP='powerpc64_unknown_linux' + HostArch_CPP='powerpc64' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; + s390-ibm-linux*) HostPlatform=s390-ibm-linux TargetPlatform=s390-ibm-linux #hack @@ -1041,45 +1051,6 @@ fi FP_CHECK_ALIGNMENT(unsigned short) FP_CHECK_ALIGNMENT(void *) -dnl ** map standard C types and ISO types to Haskell types -FPTOOLS_CHECK_HTYPE(char) -FPTOOLS_CHECK_HTYPE(signed char) -FPTOOLS_CHECK_HTYPE(unsigned char) -FPTOOLS_CHECK_HTYPE(short) -FPTOOLS_CHECK_HTYPE(unsigned short) -FPTOOLS_CHECK_HTYPE(int) -FPTOOLS_CHECK_HTYPE(unsigned int) -FPTOOLS_CHECK_HTYPE(long) -FPTOOLS_CHECK_HTYPE(unsigned long) -if test "$ac_cv_type_long_long" = yes; then -FPTOOLS_CHECK_HTYPE(long long) -FPTOOLS_CHECK_HTYPE(unsigned long long) -fi -FPTOOLS_CHECK_HTYPE(float) -FPTOOLS_CHECK_HTYPE(double) -FPTOOLS_CHECK_HTYPE(ptrdiff_t) -FPTOOLS_CHECK_HTYPE(size_t) -FPTOOLS_CHECK_HTYPE(wchar_t) -dnl Int32 is a HACK for non-ISO C compilers -FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32) -FPTOOLS_CHECK_HTYPE(clock_t) -FPTOOLS_CHECK_HTYPE(time_t) -FPTOOLS_CHECK_HTYPE(dev_t, Word32) -FPTOOLS_CHECK_HTYPE(ino_t) -FPTOOLS_CHECK_HTYPE(mode_t) -FPTOOLS_CHECK_HTYPE(off_t) -FPTOOLS_CHECK_HTYPE(pid_t) -FPTOOLS_CHECK_HTYPE(gid_t) -FPTOOLS_CHECK_HTYPE(uid_t) -FPTOOLS_CHECK_HTYPE(cc_t) -FPTOOLS_CHECK_HTYPE(speed_t) -FPTOOLS_CHECK_HTYPE(tcflag_t) -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 $GhcLibsWithOpenGL = YES ; then FPTOOLS_CHECK_HTYPE(GLboolean) @@ -1098,9 +1069,6 @@ FPTOOLS_CHECK_HTYPE(GLdouble) FPTOOLS_CHECK_HTYPE(GLclampd) fi -dnl ** can we open files in binary mode? -FP_CHECK_CONST([O_BINARY], [#include ], [0]) - FP_CHECK_FUNC([WinExec], [@%:@include ], [WinExec("",0)]) @@ -1132,15 +1100,7 @@ if test "$ac_cv_type_signal" = void; then fi dnl ** check for more functions -AC_CHECK_FUNCS([ftime getclock getgrgid_r getgrnam_r getpagesize getpwnam_r getpwuid_r getpwnam getpwuid getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv]) - -dnl ** Solaris2 needs additionl flag for getpw*_r() -case "$TargetPlatform" in - *-solaris2*) - unix_SRC_HSC2HS_OPTS="-D_POSIX_PTHREAD_SEMANTICS" - AC_SUBST(unix_SRC_HSC2HS_OPTS) - ;; -esac +AC_CHECK_FUNCS([ftime getclock getpagesize getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv]) dnl ** check whether this machine has gmp3 installed AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, @@ -1183,11 +1143,6 @@ 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... @@ -1340,23 +1295,6 @@ else AC_SUBST(HaveRtldNow) fi -dnl ---------- usleep ---------- -dnl --- stolen from guile configure --- -dnl --- FIXME: /usr/include/unistd.h can't be right? - -### On some systems usleep has no return value. If it does have one, -### we'd like to return it; otherwise, we'll fake it. -AC_CACHE_CHECK([return type of usleep], cv_func_usleep_return_type, - [AC_EGREP_HEADER(changequote(<, >)changequote([, ]), - /usr/include/unistd.h, - [cv_func_usleep_return_type=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.]) - ;; -esac - dnl -------------------------------------------------- dnl * test for GTK+ dnl -------------------------------------------------- @@ -1407,8 +1345,6 @@ esac AC_SUBST(LdCmd) FPTOOLS_LD_X -FP_EMPTY_STRUCTS - AC_CONFIG_FILES([mk/config.mk]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT