X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=c661c4ad7480b418a4253109b101a2c1cde46c7e;hb=2c010bc691c2ae07e36a7d0c9851f0094889b39b;hp=fea206c1e3c49b0aabb548aea7702ea1df87398e;hpb=282db6d5a472c41d1008269bdd580caf1dcb9828;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index fea206c..c661c4a 100644 --- a/configure.in +++ b/configure.in @@ -85,7 +85,7 @@ alpha*-dec-osf[[345]]*) HostVendor_CPP='dec' HostOS_CPP='osf3' ;; -alpha*-unknown-linux) +alpha*-unknown-linux*) HostPlatform=alpha-unknown-linux TargetPlatform=alpha-unknown-linux BuildPlatform=alpha-unknown-linux @@ -496,34 +496,42 @@ AC_SUBST(ThreadedRts) dnl ** Enable the construction of Win32 DLLs? dnl -------------------------------------------------------------- -AC_ARG_ENABLE(win32-dlls, -[ --enable-win32-dlls - If on a Win32 platform running mingw32/cygwin, enable the - construction of DLLs containing ghc-compiled code. -], -[ -case $HostOS_CPP in -cygwin32) ;; -mingw32) ;; -*) echo "Unrecognised win32 platform: $HostPlatform" - exit 1 - ;; -esac -EnableWin32DLLs=YES -], -[EnableWin32DLLs=NO] -) -AC_SUBST(EnableWin32DLLs) -if test x"$EnableWin32DLLs" = "xYES" ; then - AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) -fi +dnl +dnl [ The ability to build the RTS and libraries as separate DLLs used +dnl to be supported, but isn't currently (updates to the RTS, compiler +dnl and build system would be required to bring it back again.) +dnl Hence, exposing it as an option is false advertisement, so better +dnl disable it to avoid confusion (but leave it commented-out rather +dnl than removed in order to remind ourselves to bring back the +dnl feature at some stage.) ] +dnl +dnl AC_ARG_ENABLE(win32-dlls, +dnl [ --enable-win32-dlls +dnl If on a Win32 platform running mingw32/cygwin, enable the +dnl construction of DLLs containing ghc-compiled code. +dnl ], +dnl [ +dnl case $HostOS_CPP in +dnl cygwin32) ;; +dnl mingw32) ;; +dnl *) echo "Unrecognised win32 platform: $HostPlatform" +dnl exit 1 +dnl ;; +dnl esac +dnl EnableWin32DLLs=YES +dnl ], +dnl [EnableWin32DLLs=NO] +dnl ) +dnl AC_SUBST(EnableWin32DLLs) +dnl if test x"$EnableWin32DLLs" = "xYES" ; then +dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) +dnl fi dnl ** Enable the building of the ObjectIO? dnl -------------------------------------------------------------- AC_ARG_ENABLE(objectio, [ --enable-objectio Build ObjectIO, a portable GUI library for Haskell. - (This option is only relevant when libraries are built.) ], [GhcLibsWithObjectIO=YES], [GhcLibsWithObjectIO=NO] @@ -534,12 +542,21 @@ dnl ** Enable the building of the OpenGL/GLUT binding in hslibs? dnl -------------------------------------------------------------- AC_ARG_ENABLE(hopengl, [ --enable-hopengl - Build HOpenGL, a Haskell binding for OpenGL/GLUT, too. - (NOTE: Work in progress, currently only GLUT is supported!) + Build HOpenGL, a Haskell binding for OpenGL/GLUT. + On Mac OS X, use --enable-hopengl=x11 to use X11 instead + of the "native" libraries. ], [GhcLibsWithHOpenGL=YES], [GhcLibsWithHOpenGL=NO] ) +UseQuartzOpenGL=NO +if test x"$TargetOS_CPP" = x"darwin"; then + if test x"$enable_hopengl" != x"x11"; then + AC_DEFINE(USE_QUARTZ_OPENGL) + UseQuartzOpenGL=YES + fi +fi + AC_SUBST(GhcLibsWithHOpenGL) dnl ** .NET interop support? @@ -692,7 +709,15 @@ AC_SUBST(CompressCmd) AC_SUBST(CompressSuffix) dnl ** check for ghc-pkg command -AC_PATH_PROG(GhcPkgCmd,ghc-pkg) +changequote(, )dnl +ghc_pkg_guess=`echo $WithGhc | sed 's@ghc\([^/\\]*\)$@ghc-pkg\1@'` +changequote([, ])dnl +if $ghc_pkg_guess -l >/dev/null 2>/dev/null; then + GhcPkgCmd=$ghc_pkg_guess + AC_MSG_NOTICE([using $ghc_pkg_guess for ghc-pkg]) +else + AC_PATH_PROG(GhcPkgCmd,ghc-pkg) +fi AC_ARG_WITH(greencard, [ --with-greencard= @@ -743,7 +768,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 vfork.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 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]) @@ -765,7 +790,11 @@ dnl ** check for Windows include files AC_CHECK_HEADERS(windows.h) dnl ** check for OpenGL include files -AC_CHECK_HEADERS(GL/gl.h) +if test $UseQuartzOpenGL = YES ; then + AC_CHECK_HEADERS(OpenGL/gl.h) +else + AC_CHECK_HEADERS(GL/gl.h) +fi dnl ** check if it is safe to include both and AC_HEADER_TIME @@ -978,7 +1007,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 vfork 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 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 @@ -1075,7 +1104,18 @@ AC_PATH_XTRA() dnl ** check for OpenGL/GLUT/GLX include paths and libraries if test $GhcLibsWithHOpenGL = YES ; then -FPTOOLS_HAVE_OPENGL + if test $UseQuartzOpenGL = YES ; then + dnl Take a shortcut for Mac OS X native OpenGL: + dnl It's in a non-standard location, but it's always there + GL_CFLAGS= + GL_LIBS= + GLUT_LIBS= + AC_SUBST(GL_CFLAGS) + AC_SUBST(GL_LIBS) + AC_SUBST(GLUT_LIBS) + else + FPTOOLS_HAVE_OPENGL + fi fi dnl ################################################################ @@ -1258,6 +1298,9 @@ dnl -------------------------------------------------- dnl ** can we get alloca? AC_FUNC_ALLOCA +dnl ** Working vfork? +AC_FUNC_VFORK + dnl ** determine whether or not const works AC_C_CONST