Commit 18abe9c0 authored by simonmar's avatar simonmar
Browse files

[project @ 2003-12-18 10:46:49 by simonmar]

- make --disable-foo work for each of the --enable options
- tidyup: use AC_HELP_STRING everywhere
parent 2a1a5f73
...@@ -478,24 +478,21 @@ dnl ** What command to use to compile compiler sources ? ...@@ -478,24 +478,21 @@ dnl ** What command to use to compile compiler sources ?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_WITH(ghc, AC_ARG_WITH(ghc,
[ --with-ghc=<haskell compiler> [AC_HELP_STRING([--with-ghc=ARG],
Use a command different from 'ghc' to compile GHC-specific Haskell code [Use ARG as the path to GHC [default=autodetect]])],
(including GHC itself).
],
[ WithGhc="$withval" ], [ WithGhc="$withval" ],
[ [
if test "$GHC" = ""; then if test "$GHC" = ""; then
AC_PATH_PROG(GHC,ghc) AC_PATH_PROG(GHC,ghc)
fi fi
WithGhc=$GHC WithGhc=$GHC
] ])
)
AC_SUBST(WithGhc) AC_SUBST(WithGhc)
AC_ARG_WITH(hc, AC_ARG_WITH(hc,
[ --with-hc=<haskell compiler> [AC_HELP_STRING([--with-hc=ARG],
Use a command different from 'ghc' to compile generic Haskell code. [Use ARG as the path to the compiler for compiling ordinary
], Haskell code (default= value of --with-ghc)])],
[WithHc="$withval"], [WithHc="$withval"],
[WithHc=$WithGhc] [WithHc=$WithGhc]
) )
...@@ -515,9 +512,8 @@ AC_PATH_PROG(HBC,hbc) ...@@ -515,9 +512,8 @@ AC_PATH_PROG(HBC,hbc)
dnl ** Which gcc to use? dnl ** Which gcc to use?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_WITH(gcc, AC_ARG_WITH(gcc,
[ --with-gcc=<gcc command> [AC_HELP_STRING([--with-gcc=ARG],
Use a different command instead of 'gcc' for the GNU C compiler. [Use ARG as the path to GCC [default=autodetect]])],
],
[WhatGccIsCalled="$withval" [WhatGccIsCalled="$withval"
if test "x$HostPlatform" = "xi386-unknown-mingw32"; then if test "x$HostPlatform" = "xi386-unknown-mingw32"; then
# Canonicalise to <drive>:/path/to/gcc # Canonicalise to <drive>:/path/to/gcc
...@@ -531,11 +527,15 @@ AC_SUBST(WhatGccIsCalled) ...@@ -531,11 +527,15 @@ AC_SUBST(WhatGccIsCalled)
dnl ** Booting from .hc files? dnl ** Booting from .hc files?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(hc-boot, AC_ARG_ENABLE(hc-boot,
[ --enable-hc-boot [AC_HELP_STRING([--enable-hc-boot],
Boot the Glasgow Haskell Compiler from intermediate .hc files. [Boot the Glasgow Haskell Compiler from intermediate .hc files.
(This option is mostly of interest to porters.) (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] [BootingFromHc=NO]
) )
AC_SUBST(BootingFromHc) AC_SUBST(BootingFromHc)
...@@ -543,12 +543,16 @@ AC_SUBST(BootingFromHc) ...@@ -543,12 +543,16 @@ AC_SUBST(BootingFromHc)
dnl ** Booting from unregisterised .hc files? dnl ** Booting from unregisterised .hc files?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(hc-boot-unregisterised, AC_ARG_ENABLE(hc-boot-unregisterised,
[ --enable-hc-boot-unregisterised [AC_HELP_STRING([--enable-hc-boot-unregisterised],
With --enable-hc-boot, treat the intermediate .hc files as [ With --enable-hc-boot, treat the intermediate .hc files as
unregisterised rather than registerised code. unregisterised rather than registerised code.
(This option is mostly of interest to porters.) (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] [BootingFromUnregisterisedHc=NO]
) )
AC_SUBST(BootingFromUnregisterisedHc) AC_SUBST(BootingFromUnregisterisedHc)
...@@ -567,10 +571,14 @@ fi; ...@@ -567,10 +571,14 @@ fi;
dnl ** Enable multi-thread friendly RTS? dnl ** Enable multi-thread friendly RTS?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(threaded-rts, AC_ARG_ENABLE(threaded-rts,
[ --enable-threaded-rts [AC_HELP_STRING([--enable-threaded-rts],
Support better interop with OS threads. [Support better interop with OS threads. [default=no]])],
[ if test x"$enableval" = x"yes"; then
ThreadedRts=YES
else
ThreadedRts=NO
fi
], ],
[ThreadedRts=YES],
[ThreadedRts=NO] [ThreadedRts=NO]
) )
AC_SUBST(ThreadedRts) AC_SUBST(ThreadedRts)
...@@ -611,10 +619,14 @@ dnl fi ...@@ -611,10 +619,14 @@ dnl fi
dnl ** Enable the building of the ObjectIO? dnl ** Enable the building of the ObjectIO?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(objectio, AC_ARG_ENABLE(objectio,
[ --enable-objectio [AC_HELP_STRING([--enable-objectio],
Build ObjectIO, a portable GUI library for Haskell. [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] [GhcLibsWithObjectIO=NO]
) )
AC_SUBST(GhcLibsWithObjectIO) AC_SUBST(GhcLibsWithObjectIO)
...@@ -624,21 +636,26 @@ dnl -------------------------------------------------------------- ...@@ -624,21 +636,26 @@ dnl --------------------------------------------------------------
AC_ARG_ENABLE([openal], AC_ARG_ENABLE([openal],
AC_HELP_STRING([--enable-openal], AC_HELP_STRING([--enable-openal],
[Build OpenAL binding [[default=autodetect]]]), [Build OpenAL binding [[default=autodetect]]]),
[GhcLibsWithOpenAL=$enableval], [ if test x"$enableval" = x"yes"; then
GhcLibsWithOpenAL=YES
else
GhcLibsWithOpenAL=NO
fi
],
[GhcLibsWithOpenAL=yes]) [GhcLibsWithOpenAL=yes])
# This is silly! Alas, "YES" and "NO" are currently our standard...
GhcLibsWithOpenAL=`echo $GhcLibsWithOpenAL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
AC_SUBST([GhcLibsWithOpenAL]) AC_SUBST([GhcLibsWithOpenAL])
dnl ** .NET interop support? dnl ** .NET interop support?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(dotnet, AC_ARG_ENABLE(dotnet,
[ --enable-dotnet [AC_HELP_STRING([--enable-dotnet],
Build .NET interop layer. [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.])], 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] [DotnetSupport=NO]
) )
AC_SUBST(DotnetSupport) AC_SUBST(DotnetSupport)
...@@ -779,9 +796,8 @@ else ...@@ -779,9 +796,8 @@ else
fi fi
AC_ARG_WITH(greencard, AC_ARG_WITH(greencard,
[ --with-greencard=<greencard compiler> [AC_HELP_STRING([--with-greencard=ARG],
Use a command different from 'greencard' to compile GreenCard files [Use ARG as the path to greencard [default=autodetct]])],
],
[ [
GreenCardCmd=$withval; GreenCardCmd=$withval;
FPTOOLS_GREENCARD(3.00) FPTOOLS_GREENCARD(3.00)
...@@ -789,10 +805,15 @@ FPTOOLS_GREENCARD(3.00) ...@@ -789,10 +805,15 @@ FPTOOLS_GREENCARD(3.00)
) )
AC_ARG_ENABLE(src-tree-happy, AC_ARG_ENABLE(src-tree-happy,
[ --enable-src-tree-happy [AC_HELP_STRING([--enable-src-tree-happy],
Build and use source tree (fptools/happy) version of 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] [UseSrcTreeHappy=NO]
) )
dnl ** check for installed happy binary + version dnl ** check for installed happy binary + version
...@@ -802,20 +823,30 @@ FPTOOLS_HAPPY ...@@ -802,20 +823,30 @@ FPTOOLS_HAPPY
fi; fi;
AC_ARG_ENABLE(src-tree-haddock, AC_ARG_ENABLE(src-tree-haddock,
[ --enable-src-tree-haddock [AC_HELP_STRING([--enable-src-tree-haddock],
Build and use source tree (fptools/haddock) version of 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] [UseSrcTreeHaddock=NO]
) )
dnl ** check for installed haddock dnl ** check for installed haddock
FPTOOLS_HADDOCK FPTOOLS_HADDOCK
AC_ARG_ENABLE(src-tree-alex, AC_ARG_ENABLE(src-tree-alex,
[ --enable-src-tree-alex [AC_HELP_STRING([--enable-src-tree-alex],
Build and use source tree (fptools/alex) version of 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] [UseSrcTreeAlex=NO]
) )
dnl ** check for installed alex binary + version dnl ** check for installed alex binary + version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment