X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=7214401148f6655d3090d7dff51acbe9b939f11d;hb=9cad56b2f576fec272c3613612ee2749cc0d0ec0;hp=328d964a70f5cfc5f5fdf82885beae51a6c7c6da;hpb=2213195a06629b101764594c192bbc827f99bfc1;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index 328d964..7214401 100644 --- a/configure.in +++ b/configure.in @@ -183,7 +183,7 @@ i[[3456]]86-*-solaris2*) HostVendor_CPP='unknown' HostOS_CPP='solaris2' ;; -i[[3456]]86-*-cygwin32*) +i[[3456]]86-*-cygwin*) HostPlatform=i386-unknown-cygwin32 # hack again TargetPlatform=i386-unknown-cygwin32 BuildPlatform=i386-unknown-cygwin32 @@ -271,6 +271,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' + ;; sparc-sun-sunos4*) HostPlatform=sparc-sun-sunos4 TargetPlatform=sparc-sun-sunos4 #hack @@ -332,20 +341,6 @@ dnl AC_SUBST(TargetVendor_CPP) AC_SUBST(exeext) -if test "$GHC" = ""; then - AC_PATH_PROG(GHC,ghc) -fi -if test "$GHC" != ""; then - FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl - AC_SUBST(GhcVersion)dnl - AC_SUBST(GhcMajVersion)dnl - AC_SUBST(GhcMinVersion)dnl - AC_SUBST(GhcPatchLevel)dnl -fi - -AC_PATH_PROGS(NHC,nhc nhc98) -AC_PATH_PROG(HBC,hbc) - dnl -------------------------------------------------------------- dnl * Project specific configuration options dnl -------------------------------------------------------------- @@ -356,17 +351,40 @@ 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(hc, [ --with-hc= - Use a command different from 'ghc' to compile up Haskell code. - (no claims currently made that this will work with a compiler other than a - recent version of GHC, but you could always try...) + Use a command different from 'ghc' to compile generic Haskell code. ], [WithHc="$withval"], [WithHc=$GHC] ) AC_SUBST(WithHc) +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] +) +AC_SUBST(WithGhc) + +if test "$WithGhc" != ""; then + FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl + AC_SUBST(GhcVersion)dnl + AC_SUBST(GhcMajVersion)dnl + AC_SUBST(GhcMinVersion)dnl + AC_SUBST(GhcPatchLevel)dnl +fi + +AC_PATH_PROGS(NHC,nhc nhc98) +AC_PATH_PROG(HBC,hbc) + dnl ** Which gcc to use? dnl -------------------------------------------------------------- AC_ARG_WITH(gcc, @@ -575,7 +593,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 assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.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 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/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 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 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/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) @@ -593,9 +611,7 @@ dnl ** check for DOS include files AC_CHECK_HEADERS(dos.h conio.h io.h std.h) dnl ** check for Windows include files -if test $GhcLibsWithHOpenGL = YES ; then AC_CHECK_HEADERS(windows.h) -fi dnl ** check for OpenGL include files AC_CHECK_HEADERS(GL/gl.h) @@ -709,6 +725,8 @@ 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 @@ -833,6 +851,30 @@ FPTOOLS_CHECK_LIB_NOWARN(dld, shl_load) FPTOOLS_CHECK_LIB_NOWARN(m, atan) dnl -------------------------------------------------- +dnl * test for GTK+ +dnl -------------------------------------------------- + +AC_PATH_PROGS(GTK_CONFIG, gtk-config gtk12-config) +if test "$GTK_CONFIG" != ""; then + AC_CACHE_CHECK([for version of GTK+], fptools_cv_gtk_version, [ + fptools_cv_gtk_version=`$GTK_CONFIG --version` + ]) + GTK_VERSION=$fptools_cv_gtk_version +else + GTK_VERSION= +fi + +case $fptools_cv_gtk_version in + 1.[[23]].*) ;; + *) AC_MSG_WARN([GTK+ not usable; need at least version 1.2]) + GTK_CONFIG= + ;; +esac + +AC_SUBST(GTK_CONFIG) +AC_SUBST(GTK_VERSION) + +dnl -------------------------------------------------- dnl * Miscellaneous feature tests dnl --------------------------------------------------