X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=9a02c1fcfff2525503f7735bea08400fc19ed613;hp=030e401cf038efc7a2fcdf6c9edc7d0161ee2eac;hb=f30908b63b7bda01ac4fc8a3a62ea2a23da01ae9;hpb=7bd8a0491055e7ca5709109400459556e870250a diff --git a/configure.ac b/configure.ac index 030e401..9a02c1f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,30 +1,34 @@ dnl == autoconf source for the Glasgow FP tools == -dnl (run "grep '^dnl \*' configure.in | sed -e 's/dnl / /g; s/\*\*/ +/g;'" +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!) # +AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools]) + # First off, a distrib sanity check.. -AC_INIT(mk/config.mk.in) +AC_CONFIG_SRCDIR([mk/config.mk.in]) -dnl * We require autoconf version 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE -AC_PREREQ(2.50) +dnl * We require autoconf version 2.52 +dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE. +dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH. +AC_PREREQ([2.52]) dnl * Declare subdirectories that have a private configure script dnl dnl After the toplevel configuration is complete, the script will recurse into -dnl these subdirectories (the use of cache values makes repeated checks cheap) -dnl (We probably have to add hslibs/{OpenGL,GLUT} here later...) -AC_CONFIG_SUBDIRS(ghc) +dnl these subdirectories if they exist. The use of a cache file makes repeated +dnl checks cheap. +AC_CONFIG_SUBDIRS([ghc libraries]) # ------------------------------------------------------------------------- # Prepare to generate the following header files @@ -43,7 +47,7 @@ dnl * Choose host(/target/build) platform dnl-------------------------------------------------------------------- dnl Guess host/target/build platform(s) if necessary. -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET # "$host" defaults to "$target" if test "x$host" = xNONE ; then @@ -103,6 +107,60 @@ alpha*-unknown-freebsd*) HostVendor_CPP='unknown' HostOS_CPP='freebsd' ;; +alpha*-unknown-openbsd*) + HostPlatform=alpha-unknown-openbsd + TargetPlatform=alpha-unknown-openbsd + BuildPlatform=alpha-unknown-openbsd + HostPlatform_CPP='alpha_unknown_openbsd' + HostArch_CPP='alpha' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; +amd64-*-openbsd*|x86_64-*-openbsd*) + HostPlatform=x86_64-unknown-openbsd + TargetPlatform=x86_64-unknown-openbsd + BuildPlatform=x86_64-unknown-openbsd + HostPlatform_CPP='x86_64_unknown_openbsd' + HostArch_CPP='x86_64' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; +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' + ;; +arm*-openbsd*) + HostPlatform=arm-unknown-openbsd + TargetPlatform=arm-unknown-openbsd + BuildPlatform=arm-unknown-openbsd + HostPlatform_CPP='arm_unknown_openbsd' + HostArch_CPP='arm' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; +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' + ;; +hppa*-*-openbsd*) + HostPlatform=hppa-unknown-openbsd # hack again + TargetPlatform=hppa-unknown-openbsd + BuildPlatform=hppa-unknown-openbsd + HostPlatform_CPP='hppa_unknown_openbsd' + HostArch_CPP='hppa' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; hppa1.1-hp-hpux*) HostPlatform=hppa1.1-hp-hpux # canonicalise for our purposes (hack) TargetPlatform=hppa1.1-hp-hpux @@ -204,6 +262,24 @@ ia64-*-linux*) HostVendor_CPP='unknown' HostOS_CPP='linux' ;; +x86_64-*-linux*) + HostPlatform=x86_64-unknown-linux + TargetPlatform=x86_64-unknown-linux + BuildPlatform=x86_64-unknown-linux + HostPlatform_CPP='x86_64_unknown_linux' + HostArch_CPP='x86_64' + 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' @@ -234,13 +310,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*) @@ -252,6 +328,24 @@ m68k-sun-sunos4*) HostVendor_CPP='sun' HostOS_CPP='sunos4' ;; +m88k-*-openbsd*) + HostPlatform=m88k-unknown-openbsd + TargetPlatform=m88k-unknown-openbsd + BuildPlatform=m88k-unknown-openbsd + HostPlatform_CPP='m88k_unknown_openbsd' + HostArch_CPP='m88k' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; +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 @@ -294,6 +388,43 @@ 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' + ;; +powerpc-unknown-openbsd*) + HostPlatform=powerpc-unknown-openbsd + TargetPlatform=powerpc-unknown-openbsd + BuildPlatform=powerpc-unknown-openbsd + HostPlatform_CPP='powerpc_unknown_openbsd' + HostArch_CPP='powerpc' + 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 + 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 @@ -330,6 +461,24 @@ sparc-*-openbsd*) HostVendor_CPP='unknown' HostOS_CPP='openbsd' ;; +sparc64-*-openbsd*) + HostPlatform=sparc64-unknown-openbsd + TargetPlatform=sparc64-unknown-openbsd + BuildPlatform=sparc64-unknown-openbsd + HostPlatform_CPP='sparc64_unknown_openbsd' + HostArch_CPP='sparc64' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; +vax-*-openbsd*) + HostPlatform=vax-unknown-openbsd + TargetPlatform=vax-unknown-openbsd + BuildPlatform=vax-unknown-openbsd + HostPlatform_CPP='vax_unknown_openbsd' + HostArch_CPP='vax' + HostVendor_CPP='unknown' + HostOS_CPP='openbsd' + ;; *) echo "Unrecognised platform: $HostPlatform" exit 1 @@ -349,27 +498,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) @@ -385,15 +532,32 @@ dnl Remove common automounter nonsense dnl hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' ` -dnl Find 'hardtop_plat', the native format for 'hardtop' (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped). +dnl Find 'hardtop_plat', the native format for 'hardtop' +dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped). +dnl +dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert /cygdrive/c/foo to c:/foo +dnl but we must not do that if we aren't building using Cygwin (notably msys), +dnl because cygpath doesn't exist. It seems that 'bash' sets OSTYPE to 'cygwin' +dnl or 'msys' respectively, but cygwin's 'sh' does not. So we hackily assume +dnl that if the shell hasn't set it to 'msys' then we must be in Cygwin. Sigh. +dnl +dnl The Right Thing is probably to test $BuildPlatform instead, but we are sloppy +dnl about setting that correctly at the moment, so we just work around for now. dnl +dnl The quotes round "$(OSTYPE)" are essential, for the Cygwin-sh case where OSTYPE +dnl is not set. case $HostPlatform in i386-unknown-mingw32 | i386-unknown-cygwin32) - # convert $hardtop to a path that mingw will understand too - cyghardtop=${hardtop} - hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'` - hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'` - ;; + if test "${OSTYPE}" != "msys" + then + # convert $hardtop to a path that mingw will understand too + cyghardtop=${hardtop} + hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'` + hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'` + else + hardtop_plat=${hardtop} + fi + ;; *) hardtop_plat=${hardtop} ;; @@ -414,25 +578,20 @@ dnl use either is considered a Feature. dnl ** What command to use to compile compiler sources ? dnl -------------------------------------------------------------- -AC_ARG_WITH(ghc, -[ --with-ghc= - Use a command different from 'ghc' to compile GHC-specific Haskell code - (including GHC itself). -], -[ WithGhc="$withval" ], -[ - if test "$GHC" = ""; then - AC_PATH_PROG(GHC,ghc) +AC_ARG_WITH([ghc], +[AC_HELP_STRING([--with-ghc=ARG], + [Use ARG as the path to GHC [default=autodetect]])], + [WithGhc="$withval"], + [if test "$GHC" = ""; then + AC_PATH_PROG([GHC], [ghc]) fi - WithGhc=$GHC -] -) -AC_SUBST(WithGhc) + WithGhc="$GHC"]) +AC_SUBST([WithGhc]) AC_ARG_WITH(hc, -[ --with-hc= - Use a command different from 'ghc' to compile generic Haskell code. -], +[AC_HELP_STRING([--with-hc=ARG], + [Use ARG as the path to the compiler for compiling ordinary + Haskell code (default= value of --with-ghc)])], [WithHc="$withval"], [WithHc=$WithGhc] ) @@ -452,13 +611,16 @@ AC_PATH_PROG(HBC,hbc) dnl ** Which gcc to use? dnl -------------------------------------------------------------- AC_ARG_WITH(gcc, -[ --with-gcc= - Use a different command instead of 'gcc' for the GNU C compiler. -], +[AC_HELP_STRING([--with-gcc=ARG], + [Use ARG as the path to GCC [default=autodetect]])], [WhatGccIsCalled="$withval" - if test "x$HostPlatform" = "xi386-unknown-mingw32"; then - # Canonicalise to :/path/to/gcc - withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` + if test "x$HostPlatform" = "xi386-unknown-mingw32" + then + if test "${OSTYPE}" != "msys" + then + # Canonicalise to :/path/to/gcc + withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` + fi fi; CC="$withval"], [WhatGccIsCalled="gcc"] @@ -468,11 +630,15 @@ AC_SUBST(WhatGccIsCalled) dnl ** Booting from .hc files? dnl -------------------------------------------------------------- AC_ARG_ENABLE(hc-boot, -[ --enable-hc-boot - Boot the Glasgow Haskell Compiler from intermediate .hc files. - (This option is mostly of interest to porters.) +[AC_HELP_STRING([--enable-hc-boot], +[Boot the Glasgow Haskell Compiler from intermediate .hc files. + (This option is mostly of interest to porters.) [default=no]])], +[ if test x"$enableval" = x"yes"; then + BootingFromHc=YES + else + BootingFromHc=NO + fi ], -[BootingFromHc=YES], [BootingFromHc=NO] ) AC_SUBST(BootingFromHc) @@ -480,12 +646,16 @@ 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.) +[AC_HELP_STRING([--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.) [default=no]])], +[ if test x"$enableval" = x"yes"; then + BootingFromUnregisterisedHc=YES + else + BootingFromUnregisterisedHc=NO + fi ], -[BootingFromUnregisterisedHc=YES], [BootingFromUnregisterisedHc=NO] ) AC_SUBST(BootingFromUnregisterisedHc) @@ -501,13 +671,17 @@ if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.]) fi; -dnl ** Enable multi-thread friendly RTS? +dnl ** --enable-threaded-rts (not used any more) dnl -------------------------------------------------------------- AC_ARG_ENABLE(threaded-rts, -[ --enable-threaded-rts - Support better interop with OS threads. +[AC_HELP_STRING([--enable-threaded-rts], +[DEPRECATED (backwards compatibility only). [default=no]])], +[ if test x"$enableval" = x"yes"; then + ThreadedRts=YES + else + ThreadedRts=NO + fi ], -[ThreadedRts=YES], [ThreadedRts=NO] ) AC_SUBST(ThreadedRts) @@ -548,42 +722,43 @@ dnl fi dnl ** Enable the building of the ObjectIO? dnl -------------------------------------------------------------- AC_ARG_ENABLE(objectio, -[ --enable-objectio - Build ObjectIO, a portable GUI library for Haskell. +[AC_HELP_STRING([--enable-objectio], +[Build ObjectIO, a portable GUI library for Haskell. [default=no]])], +[ if test x"$enableval" = x"yes"; then + GhcLibsWithObjectIO=YES + else + GhcLibsWithObjectIO=NO + fi ], -[GhcLibsWithObjectIO=YES], [GhcLibsWithObjectIO=NO] ) AC_SUBST(GhcLibsWithObjectIO) -dnl ** Enable the building of the OpenGL/GLUT binding in hslibs? +dnl ** Enable the building of the OpenAL binding? dnl -------------------------------------------------------------- -AC_ARG_ENABLE(hopengl, -[ --enable-hopengl - 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) +AC_ARG_ENABLE([openal], + AC_HELP_STRING([--enable-openal], + [Build OpenAL binding [[default=autodetect]]]), + [ if test x"$enableval" = x"yes"; then + GhcLibsWithOpenAL=YES + else + GhcLibsWithOpenAL=NO + fi + ], + [GhcLibsWithOpenAL=YES]) + +AC_SUBST([GhcLibsWithOpenAL]) dnl ** .NET interop support? dnl -------------------------------------------------------------- AC_ARG_ENABLE(dotnet, -[ --enable-dotnet - Build .NET interop layer. -], -[DotnetSupport=YES; AC_DEFINE(WANT_DOTNET_SUPPORT)], +[AC_HELP_STRING([--enable-dotnet], +[Build .NET interop layer. [default=no]])], +[ if test x"$enableval" = x"yes"; then + DotnetSupport=YES; AC_DEFINE([WANT_DOTNET_SUPPORT], [1], [Define to 1 if you want to include .NET interop support.]) + else + DotnetSupport=NO + fi], [DotnetSupport=NO] ) AC_SUBST(DotnetSupport) @@ -597,6 +772,16 @@ dnl -------------------------------------------------------------- dnl * General configuration checks dnl -------------------------------------------------------------- +dnl ** Can the unix package be built? +dnl -------------------------------------------------------------- + +if test x"$TargetPlatform" = x"i386-unknown-mingw32"; then + GhcLibsWithUnix=NO +else + GhcLibsWithUnix=YES +fi +AC_SUBST([GhcLibsWithUnix]) + dnl ** does #! work? AC_SYS_INTERPRETER() @@ -632,9 +817,7 @@ 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 dnl -AC_PROG_CC -FPTOOLS_HAVE_GCC -FPTOOLS_GCC_NEEDS_NO_OMIT_LFPTR +FP_HAVE_GCC dnl ** figure out how to invoke cpp directly (gcc -E is no good) AC_PROG_CPP @@ -642,38 +825,27 @@ AC_PROG_CPP dnl ** Without optimization some INLINE trickery fails for GHCi SRC_CC_OPTS="-O" -dnl ** Try to add -mno-cygwin to the C compiler options for mingw32 targets -if test x"$TargetOS_CPP" = x"mingw32"; then - FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN) - SRC_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $SRC_CC_OPTS" - CPPFLAGS="$CC_SUPPORTS_MNO_CYGWIN $CPPFLAGS" -fi +dnl ** Try to add -mno-cygwin to the C compiler options +FP_CHECK_FLAG([-mno-cygwin], [ +SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS" +CPPFLAGS="-mno-cygwin $CPPFLAGS"]) AC_SUBST(SRC_CC_OPTS) dnl ** figure out how to do context diffs -FPTOOLS_PROG_DIFF +FP_PROG_CONTEXT_DIFF dnl ** Find find command (for Win32's benefit) -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 -dnl on the suitability of the 'yacc' returned.) -FPTOOLS_PROG_YACCY - -dnl ** Find lex command (lex or flex) - *doesn't* use autoconf's -dnl AC_PROG_LEX, since it doesn't actually check whether 'lex' -dnl exists if 'flex' doesn't. -AC_PROG_LEX_STRICT +FP_PROG_FIND dnl ** figure out how to do a BSD-ish install AC_PROG_INSTALL dnl If you can run configure, you certainly have /bin/sh -AC_DEFINE(HAVE_BIN_SH) +AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.]) dnl ** how to invoke `ar' and `ranlib' -FPTOOLS_PROG_AR_AND_RANLIB +FP_PROG_AR_NEEDS_RANLIB +FP_PROG_AR_SUPPORTS_INPUT dnl ** Check to see whether ln -s works AC_PROG_LN_S @@ -690,68 +862,33 @@ dnl ** check for tar dnl if GNU tar is named gtar, look for it first. AC_PATH_PROGS(TarCmd,gtar tar,tar) -dnl ** check for gzip/compress -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 /usr/local/share/sgml/catalog 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 - yes) # assume it is provided by other means (e.g., SGML_CATALOG_FILES env var). - Catalog= - ;; - glafp*) - case $HostOS_CPP in - mingw32) - Catalog=`cygpath -w $hardtop/$Catalog` - ;; - *) Catalog=$hardtop/$Catalog - ;; - esac - ;; -esac -AC_SUBST(Catalog) - -compress_nm=`basename $CompressCmd` -if test x"$compress_nm" = xgzip; then - CompressCmd="$CompressCmd -d" - CompressSuffix="gz" -else - CompressSuffix="Z" -fi -AC_SUBST(CompressCmd) -AC_SUBST(CompressSuffix) +dnl ** check for DocBook toolchain +FP_CHECK_DOCBOOK_DTD +FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl]) +FP_PROG_FO_PROCESSOR dnl ** check for ghc-pkg command -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 +FP_PROG_GHC_PKG AC_ARG_WITH(greencard, -[ --with-greencard= - Use a command different from 'green-card' to compile GreenCard files -], +[AC_HELP_STRING([--with-greencard=ARG], + [Use ARG as the path to greencard [default=autodetct]])], [ -GreencardCmd=$withval; +GreenCardCmd=$withval; FPTOOLS_GREENCARD(3.00) ] ) AC_ARG_ENABLE(src-tree-happy, -[ --enable-src-tree-happy - Build and use source tree (fptools/happy) version of Happy. +[AC_HELP_STRING([--enable-src-tree-happy], + [Build and use source tree (fptools/happy) version of Happy. + [default=autodetect]])], +[ if test x"$enableval" = x"yes"; then + UseSrcTreeHappy=YES + else + UseSrcTreeHappy=NO + fi ], -[UseSrcTreeHappy=YES], [UseSrcTreeHappy=NO] ) dnl ** check for installed happy binary + version @@ -761,20 +898,30 @@ FPTOOLS_HAPPY fi; AC_ARG_ENABLE(src-tree-haddock, -[ --enable-src-tree-haddock - Build and use source tree (fptools/haddock) version of Haddock. +[AC_HELP_STRING([--enable-src-tree-haddock], + [Build and use source tree (fptools/haddock) version of Haddock. + [default=autodetect]])], +[ if test x"$enableval" = x"yes"; then + UseSrcTreeHaddock=YES + else + UseSrcTreeHaddock=NO + fi ], -[UseSrcTreeHaddock=YES], [UseSrcTreeHaddock=NO] ) dnl ** check for installed haddock FPTOOLS_HADDOCK AC_ARG_ENABLE(src-tree-alex, -[ --enable-src-tree-alex - Build and use source tree (fptools/alex) version of Alex. +[AC_HELP_STRING([--enable-src-tree-alex], + [Build and use source tree (fptools/alex) version of Alex. + [default=autodetect]])], +[ if test x"$enableval" = x"yes"; then + UseSrcTreeAlex=YES + else + UseSrcTreeAlex=NO + fi ], -[UseSrcTreeAlex=YES], [UseSrcTreeAlex=NO] ) dnl ** check for installed alex binary + version @@ -799,146 +946,104 @@ 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 bfd.h winsock.h pthread.h sys/uio.h) -AC_CHECK_HEADER(unistd.h,[AC_CHECK_FUNCS(lchown)]) +AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h]) -AC_CHECK_HEADER(readline/readline.h, [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) -AC_CHECK_HEADER(readline/history.h, [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) +AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) +AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then - HaveReadlineHeaders=YES - AC_DEFINE(HAVE_READLINE_HEADERS,1) + GhcLibsWithReadline=YES + AC_DEFINE([HAVE_READLINE_HEADERS], [1], [Define to 1 if readline/readline.h and readline/history.h exist.]) else - HaveReadlineHeaders=NO - AC_DEFINE(HAVE_READLINE_HEADERS,0) + GhcLibsWithReadline=NO + AC_DEFINE([HAVE_READLINE_HEADERS], [0], [Define to 1 if readline/readline.h and readline/history.h exist.]) fi -AC_SUBST(HaveReadlineHeaders) +AC_SUBST(GhcLibsWithReadline) + +dnl ** check for OpenGL/GLUT include paths and libraries +FP_CHECK_GLUT -dnl ** check for DOS include files -AC_CHECK_HEADERS(dos.h conio.h io.h std.h) +if test x"$no_GLU" = xyes; then + GhcLibsWithOpenGL=NO +else + GhcLibsWithOpenGL=YES +fi +AC_SUBST([GhcLibsWithOpenGL]) -dnl ** check for Windows include files -AC_CHECK_HEADERS(windows.h) +if test x"$no_GLUT" = xyes; then + GhcLibsWithGLUT=NO +else + GhcLibsWithGLUT=YES +fi +AC_SUBST([GhcLibsWithGLUT]) dnl ** check for OpenGL include files -if test $UseQuartzOpenGL = YES ; then - AC_CHECK_HEADERS(OpenGL/gl.h) +fp_save_cppflags="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +if test x"$use_quartz_opengl" = xyes; then + AC_CHECK_HEADERS([OpenGL/gl.h]) else - AC_CHECK_HEADERS(GL/gl.h) + AC_CHECK_HEADERS([GL/gl.h]) fi +CPPFLAGS="$fp_save_cppflags" dnl ** check if it is safe to include both and AC_HEADER_TIME -dnl dynamic loading include files -AC_CHECK_HEADERS(dlfcn.h dl.h) - -dnl ** check for farcalloc (in bcc) -AC_CHECK_HEADER(alloc.h,[AC_CHECK_FUNCS(farcalloc)]) - -dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix) -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_FUNCS(regcomp, [HavePosixRegex=YES])]) AC_SUBST(HavePosixRegex) dnl ** how do we get a timezone name, and UTC offset ? AC_STRUCT_TIMEZONE dnl ** do we have altzone? -FPTOOLS_ALTZONE - -dnl ** does struct stat contain st_blksize? -AC_STRUCT_ST_BLKSIZE +FP_DECL_ALTZONE dnl ** do we have long longs? -FPTOOLS_C_LONG_LONG - -dnl ** check what fields struct msghdr contains -FPTOOLS_MSGHDR_MSG_ACCRIGHTS -FPTOOLS_MSGHDR_MSG_CONTROL +AC_CHECK_TYPES([long long]) dnl ** what are the sizes of various types -dnl (these must come before GHC_CHECK_ALIGNMENT) AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(double, 8) AC_CHECK_SIZEOF(float, 4) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) -if test "$fptools_cv_have_long_long" = yes; then +if test "$ac_cv_type_long_long" = yes; then AC_CHECK_SIZEOF(long long, 8) fi AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(unsigned char, 1) AC_CHECK_SIZEOF(unsigned int, 4) AC_CHECK_SIZEOF(unsigned long, 4) -if test "$fptools_cv_have_long_long" = yes; then +if test "$ac_cv_type_long_long" = yes; then AC_CHECK_SIZEOF(unsigned long long, 8) fi AC_CHECK_SIZEOF(unsigned short, 2) AC_CHECK_SIZEOF(void *, 4) dnl ** what are alignment constraints on various types -FPTOOLS_CHECK_ALIGNMENT(char) -FPTOOLS_CHECK_ALIGNMENT(double) -FPTOOLS_CHECK_ALIGNMENT(float) -FPTOOLS_CHECK_ALIGNMENT(int) -FPTOOLS_CHECK_ALIGNMENT(long) -if test "$fptools_cv_have_long_long" = yes; then -FPTOOLS_CHECK_ALIGNMENT(long long) +FP_CHECK_ALIGNMENT(char) +FP_CHECK_ALIGNMENT(double) +FP_CHECK_ALIGNMENT(float) +FP_CHECK_ALIGNMENT(int) +FP_CHECK_ALIGNMENT(long) +if test "$ac_cv_type_long_long" = yes; then +FP_CHECK_ALIGNMENT(long long) fi -FPTOOLS_CHECK_ALIGNMENT(short) -FPTOOLS_CHECK_ALIGNMENT(unsigned char) -FPTOOLS_CHECK_ALIGNMENT(unsigned int) -FPTOOLS_CHECK_ALIGNMENT(unsigned long) -if test "$fptools_cv_have_long_long" = yes; then -FPTOOLS_CHECK_ALIGNMENT(unsigned long long) +FP_CHECK_ALIGNMENT(short) +FP_CHECK_ALIGNMENT(unsigned char) +FP_CHECK_ALIGNMENT(unsigned int) +FP_CHECK_ALIGNMENT(unsigned long) +if test "$ac_cv_type_long_long" = yes; then +FP_CHECK_ALIGNMENT(unsigned long long) fi -FPTOOLS_CHECK_ALIGNMENT(unsigned short) -FPTOOLS_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 "$fptools_cv_have_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) +FP_CHECK_ALIGNMENT(unsigned short) +FP_CHECK_ALIGNMENT(void *) dnl ** Map OpenGL data types to Haskell types -if test $GhcLibsWithHOpenGL = YES ; then +if test $GhcLibsWithOpenGL = YES ; then FPTOOLS_CHECK_HTYPE(GLboolean) FPTOOLS_CHECK_HTYPE(GLbyte) FPTOOLS_CHECK_HTYPE(GLubyte) @@ -955,61 +1060,26 @@ 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 - -dnl ** check for GetModuleFileName and WinExec (windows only) -dnl Old: AC_CHECK_FUNCS(WinExec GetModuleFileName) dnl Windows -dnl Doesn't work because the linker can't see the functions if -dnl you omit the #include . (I've no idea why not...) +FP_CHECK_FUNC([WinExec], + [@%:@include ], [WinExec("",0)]) -FPTOOLS_TRY_LINK_NOWARN(,[ -#if HAVE_WINDOWS_H -#include -#endif -main() { - WinExec("",0); - exit(0); -} -], -[have_winexec=1], -[have_winexec=0]) -if test "$have_winexec" = "1"; then -AC_DEFINE(HAVE_WINEXEC) -fi - -FPTOOLS_TRY_LINK_NOWARN(,[ -#if HAVE_WINDOWS_H -#include -#endif -main() { - char* dir; - GetModuleFileName((HMODULE)0,dir,0); - exit(0); -} -], -[have_getmodulefilename=1], -[have_getmodulefilename=0]) -if test "$have_getmodulefilename" = "1"; then -AC_DEFINE(HAVE_GETMODULEFILENAME) -fi +FP_CHECK_FUNC([GetModuleFileName], + [@%:@include ], [GetModuleFileName((HMODULE)0,(LPTSTR)0,0)]) dnl ** check return type of signal handlers dnl Foo: assumes we can use prototypes. dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)". dnl AC_CACHE_CHECK([type of signal handlers], ac_cv_type_signal_handler, -dnl [AC_TRY_COMPILE([#include +dnl [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include dnl #include dnl #ifdef signal dnl #undef signal dnl #endif dnl void (*signal (int, void (*)(int)))(int); -dnl ], -dnl [int i;], -dnl ac_cv_type_signal_handler=void_int, -dnl ac_cv_type_signal_handler=int_void)]) +dnl ]], +dnl [[int i;]])], +dnl [ac_cv_type_signal_handler=void_int], +dnl [ac_cv_type_signal_handler=int_void])]) dnl if test "$ac_cv_type_signal_handler" = void_int; then dnl AC_DEFINE(VOID_INT_SIGNALS) dnl fi @@ -1017,32 +1087,14 @@ dnl fi dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)". AC_TYPE_SIGNAL if test "$ac_cv_type_signal" = void; then -AC_DEFINE(VOID_INT_SIGNALS) + AC_DEFINE([VOID_INT_SIGNALS], [1], [Define to 1 if signal handlers have type void (*)(int). Otherwise, they're assumed to have type int (*)(void).]) fi dnl ** check for more functions -AC_CHECK_FUNCS(strcasecmp _stricmp stricmp strcmpi) -AC_CHECK_FUNCS(strcmp) -AC_CHECK_FUNCS(realpath _fullpath) -AC_CHECK_FUNCS(PBHSetVolSync macsystem) -AC_CHECK_FUNCS(fgetpos fsetpos fseek ftell) -AC_CHECK_FUNCS(vsnprintf _vsnprintf) -AC_CHECK_FUNCS(snprintf _snprintf ) -AC_CHECK_FUNCS(popen _popen ) -AC_CHECK_FUNCS(pclose _pclose ) -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) - -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 +dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too. +AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times]) +dnl ** For ghc/rts/gmp: +AC_CHECK_FUNCS([getpagesize]) dnl ** check whether this machine has gmp3 installed AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, @@ -1059,7 +1111,7 @@ if test $HostPlatform = "powerpc-apple-darwin"; then LIBS="-framework HaskellSupport" AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,) if test $HaveFrameworkHaskellSupport = YES; then - AC_DEFINE(HAVE_FRAMEWORK_HASKELLSUPPORT) + AC_DEFINE([HAVE_FRAMEWORK_HASKELLSUPPORT], [1], [Define to 1 if the HaskellSupport.framework is installed (Mac OS X only).]) fi; LIBS="$save_libs" AC_MSG_RESULT([$HaveFrameworkHaskellSupport]) @@ -1071,18 +1123,15 @@ AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO) AC_SUBST(HaveLibMingwEx) if test $HaveLibMingwEx = YES ; then - AC_DEFINE(HAVE_MINGWEX) + AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.]) 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; -dnl ** check whether this machine has GNU regex in libc. -FPTOOLS_REGEX_IN_LIBC - dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc) @@ -1102,48 +1151,39 @@ if test $HaveLibTermcap = YES ; then fi if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then - AC_DEFINE(HAVE_READLINE_LIBS,1) + AC_DEFINE([HAVE_READLINE_LIBS], [1], [Define to 1 if readline plus any additional libs needed for it exist.]) LibsReadline="readline $LibTermcap" else - AC_DEFINE(HAVE_READLINE_LIBS,0) + AC_DEFINE([HAVE_READLINE_LIBS], [0], [Define to 1 if readline plus any additional libs needed for it exist.]) LibsReadline= fi AC_SUBST(LibsReadline) if test "$HaveLibReadline"; then AC_CHECK_LIB(readline, rl_erase_empty_line, - [AC_DEFINE(HAVE_READLINE_4, 1)], - [AC_DEFINE(HAVE_READLINE_4, 0)]) + [AC_DEFINE([HAVE_READLINE_4], [1], [Define to 1 if readline has version >= 4.0.])], + [AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.])]) AC_CHECK_LIB(readline, rl_free_undo_list, - [AC_DEFINE(HAVE_READLINE_4_2, 1)], - [AC_DEFINE(HAVE_READLINE_4_2, 0)]) + [AC_DEFINE([HAVE_READLINE_4_2], [1], [Define to 1 if readline has version >= 4.2.])], + [AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.])]) else - AC_DEFINE(HAVE_READLINE_4, 0) - AC_DEFINE(HAVE_READLINE_4_2, 0) + AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.]) + AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.]) fi dnl ** check for math library -FPTOOLS_CHECK_LIBM() -AC_SUBST(LIBM) +AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"], [LIBM=]) +AC_SUBST([LIBM]) dnl ** check for X Window System AC_PATH_XTRA() -dnl ** check for OpenGL/GLUT/GLX include paths and libraries -if test $GhcLibsWithHOpenGL = YES ; then - 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 +if test "$no_x" = yes; then + GhcLibsWithX11=NO +else + GhcLibsWithX11=YES fi +AC_SUBST([GhcLibsWithX11]) dnl ################################################################ dnl Check for libraries @@ -1158,11 +1198,11 @@ if test $HaveFrameworkHaskellSupport = YES; then HaveLibDL=NO HaveRtldNext=NO HaveRtldLocal=YES - AC_DEFINE(HAVE_RTLDLOCAL) + AC_DEFINE([HAVE_RTLDLOCAL], [1], [Define to 1 if RTLD_LOCAL is available.]) HaveRtldGlobal=YES - AC_DEFINE(HAVE_RTLDGLOBAL) + AC_DEFINE([HAVE_RTLDGLOBAL], [1], [Define to 1 if RTLD_GLOBAL is available.]) HaveRtldNow=YES - AC_DEFINE(HAVE_RTLDNOW) + AC_DEFINE([HAVE_RTLDNOW], [1], [Define to 1 if we can see RTLD_NOW in dlfcn.h.]) AC_SUBST(HaveLibDL) AC_SUBST(HaveRtldNext) AC_SUBST(HaveRtldLocal) @@ -1171,10 +1211,9 @@ if test $HaveFrameworkHaskellSupport = YES; then else AC_CHECK_LIB(dl, dlopen, [HaveLibDL=YES - AC_DEFINE(HAVE_LIBDL) + AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().]) LIBS="$LIBS -ldl"], [HaveLibDL=NO]) - AC_CHECK_FUNCS(dlopen) AC_SUBST(HaveLibDL) dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set @@ -1187,7 +1226,7 @@ else #endif ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RTLDNEXT) + AC_DEFINE([HAVE_RTLDNEXT], [1], [Define to 1 if we can see RTLD_NEXT in dlfcn.h.]) HaveRtldNext=YES ], [ AC_MSG_RESULT(no) @@ -1250,73 +1289,19 @@ else AC_SUBST(HaveRtldNow) fi -FPTOOLS_CHECK_LIB_NOWARN(m, atan) - -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 in_addr_t -dnl -------------------------------------------------- -AC_MSG_CHECKING(for in_addr_t in netinet/in.h) -AC_EGREP_HEADER(in_addr_t, netinet/in.h, - [ AC_DEFINE(HAVE_IN_ADDR_T) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for Linux sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/sendfile.h) -AC_EGREP_HEADER(sendfile, sys/sendfile.h, - [ AC_DEFINE(HAVE_LINUX_SENDFILE) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for BSD sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/socket.h) -AC_EGREP_HEADER(sendfile, sys/socket.h, - [ AC_DEFINE(HAVE_BSD_SENDFILE) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - 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= +AC_PATH_PROGS([GTK_CONFIG], [gtk-config gtk12-config]) +if test -n "$GTK_CONFIG"; then + AC_CACHE_CHECK([for version of GTK+], [fp_cv_gtk_version], + [fp_cv_gtk_version=`$GTK_CONFIG --version`]) + FP_COMPARE_VERSIONS([$fp_cv_gtk_version], [-lt], [1.2], + [AC_MSG_WARN([GTK+ not usable, need at least version 1.2]) + GTK_CONFIG=]) 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) +AC_SUBST([GTK_CONFIG]) dnl -------------------------------------------------- dnl * Miscellaneous feature tests @@ -1326,24 +1311,27 @@ dnl ** can we get alloca? AC_FUNC_ALLOCA dnl ** Working vfork? -AC_FUNC_VFORK +AC_FUNC_FORK dnl ** determine whether or not const works AC_C_CONST -dnl ** determine whether ANSI-function prototypes work? -AC_C_PROTOTYPES - dnl ** are we big endian? AC_C_BIGENDIAN dnl ** check for leading underscores in symbol names -FPTOOLS_UNDERSCORE +FP_LEADING_UNDERSCORE 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' ` + mingw32) + if test "${OSTYPE}" == "msys" + then + LdCmd=${LdCmdRaw} + else + LdCmd=`cygpath -w ${LdCmdRaw} | sed -e 's@\\\\@/@g' ` + fi ;; *) LdCmd=${LdCmdRaw} ;; @@ -1351,37 +1339,6 @@ esac AC_SUBST(LdCmd) FPTOOLS_LD_X -AC_MSG_CHECKING([for SIGPOLL]) -AC_EGREP_CPP(we_have_sigpoll, -[#include -#ifdef SIGPOLL -we_have_sigpoll -#endif -], AC_DEFINE(HAVE_SIGPOLL) haveSIGPOLL=yes, haveSIGPOLL=no) -AC_MSG_RESULT([$haveSIGPOLL]) - -AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETGR_R_SIZE_MAX -we_have_that_sysconf_thing -#endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE(HAVE_SC_GETGR_R_SIZE_MAX)], -[AC_MSG_RESULT([no])]) - -AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETPW_R_SIZE_MAX -we_have_that_sysconf_thing -#endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE(HAVE_SC_GETPW_R_SIZE_MAX)], -[AC_MSG_RESULT([no])]) - -AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h ) +AC_CONFIG_FILES([mk/config.mk]) +AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) +AC_OUTPUT