X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=af910e2e2c843dc5ed65c217a7ebe1c2f2bf334d;hb=a7cfd56bf3da3f942dadf314115ee97ce317e1a4;hp=bb7748c30be594910db9f03cb7ff88cca4a58304;hpb=13c670c3b50b0e2613458a73a1e05bb4a326f721;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index bb7748c..af910e2 100644 --- a/configure.in +++ b/configure.in @@ -44,7 +44,7 @@ hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mn echo '' echo "*** The top of your build tree is: $hardtop" -AC_SUBST(hardtop) +# subst of hardtop is done below after we've computed hardtop_plat. dnl-------------------------------------------------------------------- dnl * Choose host(/target/build) platform @@ -75,7 +75,7 @@ exeext='' # We also record the architecture, vendor, and operating system (OS) # separately. case $HostPlatform in -alpha-dec-osf[[12]]*) +alpha*-dec-osf[[12]]*) HostPlatform=alpha-dec-osf1 # canonicalise for our purposes TargetPlatform=alpha-dec-osf1 # this will work for now... (hack) BuildPlatform=alpha-dec-osf1 # hack @@ -84,7 +84,7 @@ alpha-dec-osf[[12]]*) HostVendor_CPP='dec' HostOS_CPP='osf1' ;; -alpha-dec-osf[[34]]*) +alpha*-dec-osf[[345]]*) HostPlatform=alpha-dec-osf3 # canonicalise for our purposes TargetPlatform=alpha-dec-osf3 # this will work for now... (hack) BuildPlatform=alpha-dec-osf3 # hack @@ -93,7 +93,7 @@ alpha-dec-osf[[34]]*) HostVendor_CPP='dec' HostOS_CPP='osf3' ;; -alpha-unknown-linux) +alpha*-unknown-linux) HostPlatform=alpha-unknown-linux TargetPlatform=alpha-unknown-linux BuildPlatform=alpha-unknown-linux @@ -102,7 +102,7 @@ alpha-unknown-linux) HostVendor_CPP='unknown' HostOS_CPP='linux' ;; -alpha-unknown-freebsd*) +alpha*-unknown-freebsd*) HostPlatform=alpha-unknown-freebsd TargetPlatform=alpha-unknown-freebsd BuildPlatform=alpha-unknown-freebsd @@ -202,11 +202,6 @@ i[[3456]]86-*-mingw32*) HostVendor_CPP='unknown' HostOS_CPP='mingw32' exeext='.exe' - # We assume you're using mingw32 via the gcc that comes - # with cygwin, and not the native port, so let's augment - # the gcc command-line used here with -mno-cygwin -mwin32 - # to arrange for good things to happen. - CFLAGS="-mno-cygwin -mwin32 $CFLAGS" ;; m68k-next-nextstep2) HostPlatform_CPP='m68k_next_nextstep2' @@ -271,15 +266,15 @@ powerpc-ibm-aix*) HostVendor_CPP='ibm' HostOS_CPP='aix' ;; -powerpc-apple-macosx*) - HostPlatform=powerpc-apple-macosx - TargetPlatform=powerpc-apple-macosx #hack - BuildPlatform=powerpc-apple-macosx #hack - HostPlatform_CPP='powerpc_apple_macosx' - HostArch_CPP='powerpc' - HostVendor_CPP='apple' - HostOS_CPP='macosx' - ;; +powerpc-apple-darwin*) + HostPlatform=powerpc-apple-darwin + TargetPlatform=powerpc-apple-darwin #hack + BuildPlatform=powerpc-apple-darwin #hack + HostPlatform_CPP='powerpc_apple_darwin' + HostArch_CPP='powerpc' + HostVendor_CPP='apple' + HostOS_CPP='darwin' + ;; sparc-sun-sunos4*) HostPlatform=sparc-sun-sunos4 TargetPlatform=sparc-sun-sunos4 #hack @@ -341,6 +336,22 @@ dnl AC_SUBST(TargetVendor_CPP) AC_SUBST(exeext) +# +# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box). +# (but with b-slashes being escaped). +case $HostPlatform in + i386-unknown-mingw32 | i386-unknown-cygwin32) + # get rid off /cygdrive/ prefix + hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' ` + hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' ` + ;; + *) + hardtop_plat=${hardtop} + ;; +esac +AC_SUBST(hardtop) +AC_SUBST(hardtop_plat) + dnl -------------------------------------------------------------- dnl * Project specific configuration options dnl -------------------------------------------------------------- @@ -351,17 +362,19 @@ dnl use either is considered a Feature. dnl ** What command to use to compile compiler sources ? dnl -------------------------------------------------------------- -if test "$GHC" = ""; then - AC_PATH_PROG(GHC,ghc) -fi AC_ARG_WITH(ghc, [ --with-ghc= Use a command different from 'ghc' to compile GHC-specific Haskell code (including GHC itself). ], -[WithGhc="$withval"], -[WithGhc=$GHC] +[ WithGhc="$withval" ], +[ + if test "$GHC" = ""; then + AC_PATH_PROG(GHC,ghc) + fi + WithGhc=$GHC +] ) AC_SUBST(WithGhc) @@ -391,7 +404,8 @@ AC_ARG_WITH(gcc, [ --with-gcc= Use a different command instead of 'gcc' for the GNU C compiler. ], -[WhatGccIsCalled="$withval"], +[WhatGccIsCalled="$withval" + CC="$withval"], [WhatGccIsCalled="gcc"] ) AC_SUBST(WhatGccIsCalled) @@ -408,6 +422,25 @@ AC_ARG_ENABLE(hc-boot, ) AC_SUBST(BootingFromHc) +dnl ** Booting from unregisterised .hc files? +dnl -------------------------------------------------------------- +AC_ARG_ENABLE(hc-boot-unregisterised, +[ --enable-hc-boot-unregisterised + With --enable-hc-boot, treat the intermediate .hc files as + unregisterised rather than registerised code. + (This option is mostly of interest to porters.) +], +[BootingFromUnregisterisedHc=YES], +[BootingFromUnregisterisedHc=NO] +) +AC_SUBST(BootingFromUnregisterisedHc) + +if test "$BootingFromHc" = "NO"; then +if test "$BootingFromUnregisterisedHc" = "YES"; then +AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.]) +fi; +fi; + dnl ** Enable the construction of Win32 DLLs? dnl -------------------------------------------------------------- @@ -433,20 +466,6 @@ if test x"$EnableWin32DLLs" = "xYES" ; then AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) fi -dnl ** Building a Win32-friendlier compiler? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(minimal-unix-deps, -[ --enable-minimal-unix-deps - Build a compiler that minimizes dependencies on Unix-like tools - under Win32, allowing the user to operate the compiler without - having to install Cygwin toolchain (say). (You still need - that toolchain to build GHC from sources though). -], -[MinimalUnixDeps=YES], -[MinimalUnixDeps=NO] -) -AC_SUBST(MinimalUnixDeps) - dnl ** Enable the building of the OpenGL/GLUT binding in hslibs? dnl -------------------------------------------------------------- AC_ARG_ENABLE(hopengl, @@ -477,6 +496,8 @@ AC_ARG_WITH(glut-xlib, test -n "$with_glut_xlib" && CPPFLAGS="$CPPFLAGS -DGLUT_XLIB_IMPLEMENTATION=$with_glut_xlib" + + dnl -------------------------------------------------------------- dnl End of configure script option section dnl -------------------------------------------------------------- @@ -492,14 +513,12 @@ AC_SYS_INTERPRETER() dnl ** look for `perl', but only in /bin on Windows case $HostOS_CPP in cygwin32|mingw32) - if test x"$MinimalUnixDeps" = "xNO"; then AC_CHECK_PROG(PerlCmd,perl,/bin/perl,,/bin) if test -z "$PerlCmd"; then echo "You must install the version of Perl shipped with GHC" echo "(or a compatible one) in /bin." exit 1 fi - fi ;; *) AC_PATH_PROG(PerlCmd,perl) @@ -516,7 +535,6 @@ esac dnl ** does #! path/to/perl work? (sometimes it's too long...) FPTOOLS_SHEBANG_PERL - dnl ** look for GCC and find out which version dnl Figure out which C compiler to use. Gcc is preferred. dnl If gcc, make sure it's at least 2.1 @@ -526,17 +544,21 @@ FPTOOLS_HAVE_GCC dnl ** figure out how to invoke cpp directly (gcc -E is no good) AC_PROG_CPP -case $HostOS_CPP in -mingw32) - CPP="$CPP -mno-cygwin -mwin32" - ;; -esac + +dnl ** does the C compiler support the following options? +FPTOOLS_CC_FLAG(-mwin32,CC_SUPPORTS_MWIN32) +FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN) + +EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $CC_SUPPORTS_MWIN32" +SRC_CC_OPTS="-O $EXTRA_CC_OPTS" +CPPFLAGS="$EXTRA_CC_OPTS $CPPFLAGS" +AC_SUBST(SRC_CC_OPTS) dnl ** figure out how to do context diffs FPTOOLS_PROG_DIFF dnl ** Find find command (for Win32's benefit) -AC_PATH_PROG(FindCmd, find) +FPTOOLS_FIND_FIND dnl ** look for a decent parser generator (bison preferred) dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing @@ -557,7 +579,6 @@ AC_DEFINE(HAVE_BIN_SH) dnl ** how to invoke `ar' and `ranlib' FPTOOLS_PROG_AR_AND_RANLIB - dnl ** Check to see whether ln -s works AC_PROG_LN_S @@ -580,10 +601,21 @@ 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, - /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*) + /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl glafp-utils/docbook/CATALOG*) if test -z "$Catalog"; then AC_MSG_RESULT([Warning: You will not be able to build the documentation.]) fi +case $Catalog in + glafp*) + case $HostOS_CPP in + mingw32) + Catalog=`cygpath -w $hardtop/$Catalog` + ;; + *) Catalog=$hardtop/$Catalog + ;; + esac + ;; +esac AC_SUBST(Catalog) compress_nm=`basename $CompressCmd` @@ -596,6 +628,13 @@ fi AC_SUBST(CompressCmd) AC_SUBST(CompressSuffix) +AC_ARG_ENABLE(src-tree-happy, +[ --enable-src-tree-happy + Build and use source tree (fptools/happy) version of happy. +], +[UseSrcTreeHappy=YES], +[UseSrcTreeHappy=NO] +) dnl ** check for installed happy binary + version dnl (don't do it if we're booting from .hc files though.) if test "$BootingFromHc" = "NO"; then @@ -614,7 +653,7 @@ dnl ** check for full ANSI header (.h) files AC_HEADER_STDC 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 malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.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 vfork.h bfd.h winsock.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 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 vfork.h bfd.h winsock.h) AC_CHECK_HEADER(readline/readline.h, HaveReadlineReadlineH=YES, HaveReadlineReadlineH=NO) AC_CHECK_HEADER(readline/history.h, HaveReadlineHistoryH=YES, HaveReadlineHistoryH=NO) @@ -727,6 +766,19 @@ 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(size_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(nlink_t) +FPTOOLS_CHECK_HTYPE(ssize_t) dnl ** Map OpenGL data types to Haskell types if test $GhcLibsWithHOpenGL = YES ; then @@ -746,8 +798,6 @@ 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) - dnl ** can we open files in binary mode? FPTOOLS_O_BINARY @@ -824,7 +874,7 @@ AC_CHECK_FUNCS(pclose _pclose ) 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 symlink sysconf timelocal times vadvise vfork) +AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise vfork localtime_r gmtime_r readdir_r) dnl ** check whether this machine has gmp3 installed AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, @@ -879,6 +929,12 @@ dnl ** check for math library FPTOOLS_CHECK_LIBM() AC_SUBST(LIBM) +case $HostOS_CPP in +cygwin32) ;; +mingw32) ;; +*) AC_PATH_XTRA() ;; +esac + dnl ################################################################ dnl Check for libraries dnl ################################################################ @@ -933,7 +989,9 @@ AC_C_PROTOTYPES dnl ** are we big endian? AC_C_BIGENDIAN # Allay users' general fear of warnings of any kind. -errprint((fptools configure script wizard sez: "don't worry, the above warning is harmless (to us.)") +errprint(fptools configure script wizard sez: autoconf-2.50 or later should produce no warnings +) +errprint(if you are using 2.13 or earlier, you may get a (harmless) warning message. ) dnl ** check for leading underscores in symbol names @@ -948,4 +1006,15 @@ FPTOOLS_END_DATA_SECTION dnl ** code before data? FPTOOLS_CODE_BEFORE_DATA +dnl ** check for ld, and whether ld has -x option +AC_PATH_PROG(LdCmdRaw, ld) +case $HostOS_CPP in + mingw32) LdCmd=`cygpath -w ${LdCmdRaw} | sed -e 's@\\\\@/@g' ` + ;; + *) LdCmd=${LdCmdRaw} + ;; +esac +AC_SUBST(LdCmd) +FPTOOLS_LD_X + AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )