Commit 99fd2469 authored by Simon Marlow's avatar Simon Marlow

Merge remote-tracking branch 'origin/master' into newcg

* origin/master: (756 commits)
  don't crash if argv[0] == NULL (#7037)
  -package P was loading all versions of P in GHCi (#7030)
  Add a Note, copying text from #2437
  improve the --help docs a bit (#7008)
  Copy Data.HashTable's hashString into our Util module
  Build fix
  Build fixes
  Parse error: suggest brackets and indentation.
  Don't build the ghc DLL on Windows; works around trac #5987
  On Windows, detect if DLLs have too many symbols; trac #5987
  Add some more Integer rules; fixes #6111
  Fix PA dfun construction with silent superclass args
  Add silent superclass parameters to the vectoriser
  Add silent superclass parameters (again)
  Mention Generic1 in the user's guide
  Make the GHC API a little more powerful.
  tweak llvm version warning message
  New version of the patch for #5461.
  Fix Word64ToInteger conversion rule.
  Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)
  ...

Conflicts:
	compiler/basicTypes/UniqSupply.lhs
	compiler/cmm/CmmBuildInfoTables.hs
	compiler/cmm/CmmLint.hs
	compiler/cmm/CmmOpt.hs
	compiler/cmm/CmmPipeline.hs
	compiler/cmm/CmmStackLayout.hs
	compiler/cmm/MkGraph.hs
	compiler/cmm/OldPprCmm.hs
	compiler/codeGen/CodeGen.lhs
	compiler/codeGen/StgCmm.hs
	compiler/codeGen/StgCmmBind.hs
	compiler/codeGen/StgCmmLayout.hs
	compiler/codeGen/StgCmmUtils.hs
	compiler/main/CodeOutput.lhs
	compiler/main/HscMain.hs
	compiler/nativeGen/AsmCodeGen.lhs
	compiler/simplStg/SimplStg.lhs
parents d260d919 0d19922a
Simon Marlow <marlowsd@gmail.com>, simonmar, simonmar@microsoft.com, simonm
Ross Paterson <ross@soi.city.ac.uk>, ross
Sven Panne <sven.panne@aedion.de>, panne
Malcolm Wallace <Malcolm.Wallace@cs.york.ac.uk>, malcolm
Simon Peyton Jones <simonpj@microsoft.com>, simonpj
Don Stewart <dons@galois.com>, dons
Tim Harris <tharris@microsoft.com>, tharris
Lennart Augustsson <lennart@augustsson.net>, lennart.augustsson@credit-suisse.com
Duncan Coutts <duncan@haskell.org>, duncan.coutts@worc.ox.ac.uk, duncan@well-typed.com
Ben Lippmeier <benl@ouroborus.net>, benl@cse.unsw.edu.au, Ben.Lippmeier@anu.edu.au, Ben.Lippmeier.anu.edu.au
Manuel M T Chakravarty <chak@cse.unsw.edu.au>, chak
Jose Pedro Magalhaes <jpm@cs.uu.nl>, jpm@cs.uu.nl
Sigbjorn Finne <sof@galois.com>, sof
Wolfgang Thaller <wolfgang.thaller@gmx.net>, wolfgang
Julian Seward <jseward@acm.org>, sewardj
Ian Lynagh <igloo@earth.li>, igloo
Roman Leshchinskiy <rl@cse.unsw.edu.au>, rl@cse.unsw.edu.au
John Dias <dias@cs.tufts.edu>, dias@eecs.tufts.edu, dias@eecs.harvard.edu
Norman Ramsey <nr@eecs.harvard.edu>, nr@eecs.harvard.edu
Andy Gill <andygill@ku.edu>, andy
Will Partain <partain@dcs.gla.ac.uk>, partain
Don Syme <dsyme@microsoft.com>, dsyme
Pepe Iborra <mnislaih@gmail.com>, pepe
Neil Mitchell <ndmitchell@gmail.com>, Neil Mitchell
Gabriele Keller <keller@cse.unsw.edu.au>, keller
Daan Leijen <daan@microsoft.com>, daan
Audrey Tang <audreyt@audreyt.org>, audreyt@audreyt.org
Hans-Wolfgang Loidl <hwloidl@macs.hw.ac.uk>, hwloidl
Bernie Pope <bjpop@csse.unimelb.edu.au>, bjpop@csse.unimelb.edu.au
#Top-level dirs:
^alex/
^common-rts/
^CONTRIB/
^dll/
^greencard/
^green-card/
^haddock/
^haggis/
^happy/
^hdirect/
^hood/
^hslibs/
^hws/
^hx/
^literate/
^mhms/
^mkworld/
^nofib(/|$)
^lib/
^misc/
^mkworld/
^runtime/
^testsuite(/|$)
# bindists
^ghc-
^bin-manifest-
#Packages:
^libraries/Cabal(/|$)
^libraries/ALUT(/|$)
^libraries/GLUT(/|$)
^libraries/HGL(/|$)
^libraries/HUnit(/|$)
^libraries/HaXml(/|$)
^libraries/Japi(/|$)
^libraries/OpenAL(/|$)
^libraries/OpenGL(/|$)
^libraries/QuickCheck(/|$)
^libraries/Win32(/|$)
^libraries/X11(/|$)
^libraries/array(/|$)
^libraries/arrows(/|$)
^libraries/base(/|$)
^libraries/base3-compat(/|$)
^libraries/binary(/|$)
^libraries/bytestring(/|$)
^libraries/cgi(/|$)
^libraries/concurrent(/|$)
^libraries/containers(/|$)
^libraries/directory(/|$)
^libraries/editline(/|$)
^libraries/fgl(/|$)
^libraries/filepath(/|$)
^libraries/getopt(/|$)
^libraries/ghc-prim(/|$)
^libraries/haskell-src(/|$)
^libraries/haskell98(/|$)
^libraries/hpc(/|$)
^libraries/html(/|$)
^libraries/integer-.*(/|$)
^libraries/old-locale(/|$)
^libraries/old-time(/|$)
^libraries/monads(/|$)
^libraries/mtl(/|$)
^libraries/ndp(/|$)
^libraries/network(/|$)
^libraries/packedstring(/|$)
^libraries/parsec(/|$)
^libraries/parallel(/|$)
^libraries/pretty(/|$)
^libraries/process(/|$)
^libraries/random(/|$)
^libraries/readline(/|$)
^libraries/regex-base(/|$)
^libraries/regex-compat(/|$)
^libraries/regex-posix(/|$)
^libraries/st(/|$)
^libraries/stm(/|$)
^libraries/syb(/|$)
^libraries/template-haskell(/|$)
^libraries/time(/|$)
^libraries/timeout(/|$)
^libraries/unique(/|$)
^libraries/unix(/|$)
^libraries/xhtml(/|$)
^libraries/dph(/|$)
^libraries/utf8-string(/|$)
^libraries/terminfo(/|$)
^libraries/haskeline(/|$)
^libraries/extensible-exceptions(/|$)
# Other library bits that get generated:
^libraries/bootstrapping/
^libraries/stamp/
^libraries/ifBuildable(/|$)
^libraries/installPackage(/|$)
^libraries/index.html
^libraries/doc-index.*\.html
^libraries/haddock-util.js
^libraries/haddock.css
^libraries/haskell_icon.gif
^libraries/minus.gif
^libraries/plus.gif
^libraries/libraries.txt
# It's often useful to have somewhere in the build tree to install to
^inst(/|$)
# Boring file regexps:
\.hi$
\.hi-boot$
\.o-boot$
\.p_o$
\.t_o$
\.debug_o$
\.thr_o$
\.thr_p_o$
\.thr_debug_o$
\.o$
\.a$
\.o\.cmd$
# *.ko files aren't boring by default because they might
# be Korean translations rather than kernel modules.
# \.ko$
\.ko\.cmd$
\.mod\.c$
(^|/)\.tmp_versions($|/)
(^|/)CVS($|/)
(^|/)RCS($|/)
~$
#(^|/)\.[^/]
(^|/)_darcs($|/)
\.bak$
\.BAK$
\.orig$
(^|/)vssver\.scc$
\.swp$
(^|/)MT($|/)
(^|/)\{arch\}($|/)
(^|/).arch-ids($|/)
(^|/),
\.class$
\.prof$
(^|/)\.DS_Store$
(^|/)BitKeeper($|/)
(^|/)ChangeSet($|/)
(^|/)\.svn($|/)
(^|/)\.git($|/)
\.git-ignore$
\.py[co]$
\#
\.cvsignore$
(^|/)Thumbs\.db$
\.depend$
\.depend-.*$
^compiler/primop-
^compiler/cmm/CmmLex.hs$
^compiler/cmm/CmmParse.hs$
^compiler/ghci/LibFFI.hs$
^compiler/ghci/LibFFI_hsc.c$
^compiler/main/Config.hs$
^compiler/main/ParsePkgConf.hs$
^compiler/parser/Parser.y$
^compiler/parser/Parser.hs$
^compiler/parser/Lexer.hs$
^compiler/parser/ParserCore.hs$
^compiler/parser/HaddockLex.hs
^compiler/parser/HaddockParse.hs
^compiler/prelude/primops.txt$
^compiler/stage1($|/)
^compiler/stage2($|/)
^compiler/stage3($|/)
^compiler/utils/Fingerprint.hs$
^compiler/utils/Fingerprint_hsc.c$
^mk/build.mk$
^mk/validate.mk$
^mk/are-validating.mk$
^mk/config.h.in$
^mk/config.h$
^mk/config.mk$
^mk/stamp-h$
^stage3.package.conf$
^inplace-datadir(/|$)
(^|/)autom4te.cache($|/)
^rts/AutoApply.*cmm$
^rts/sm/Evac_thr.c$
^rts/sm/Scav_thr.c$
package.conf.inplace$
package.conf.installed$
(^|/)config.log$
(^|/)config.status$
(^|/)configure$
^ghc.spec$
^docs/users_guide/ug-book.xml$
^docs/man/flags.xml$
^docs/man/flags.xsl$
^docs/man/ghc.1$
^extra-gcc-opts$
# ignore scripts like push-monk
^push-
^pull-
# Common log file names; testlog is made by validate
^testlog
^log
^utils/[a-zA-Z0-9-]+/dist-install(/|$)
^utils/[a-zA-Z0-9-]+/dist-inplace(/|$)
^utils/[a-zA-Z0-9-]+/install-inplace(/|$)
^compiler/Makefile-stage[1-3](/|$)
^compiler/dist-stage[1-3](/|$)
^ghc/dist-stage[1-3](/|$)
^ghc/stage[1-3]-inplace(/|$)
^utils/ext-core/Driver$
^utils/ext-core/PrimEnv.hs$
^utils/genapply/genapply$
^utils/genprimopcode/Lexer.hs$
^utils/genprimopcode/Parser.hs$
^utils/genprimopcode/genprimopcode$
^utils/ghc-pkg/Version.hs$
^utils/ghc-pkg/ghc-pkg-inplace$
^utils/ghc-pkg/ghc-pkg-inplace.bin$
^utils/ghc-pkg/ghc-pkg-inplace.hs$
^utils/ghc-pkg/ghc-pkg.bin$
^utils/hasktags/hasktags$
^utils/hasktags/hasktags-inplace$
^utils/hp2ps/hp2ps$
^utils/hpc/HpcParser.hs$
^utils/hsc2hs(/|$)
^utils/haddock(/|$)
^utils/lndir/lndir$
^utils/mkdependC/mkdependC$
^utils/mkdirhier/mkdirhier$
^utils/prof/cgprof/cgprof$
^utils/prof/ghcprof-inplace$
^utils/pwd/pwd$
^utils/pwd/pwd-inplace$
^utils/runghc/runghc$
^utils/runghc/runghc-inplace$
^utils/runghc/runhaskell$
^utils/runstdtest/runstdtest$
^utils/unlit/unlit$
^driver/ghci/ghc-pkg-inplace$
^driver/ghci/ghci-inplace$
^driver/mangler/ghc-asm$
^driver/mangler/ghc-asm.prl$
^driver/package.conf$
^driver/package.conf.inplace.old$
^driver/split/ghc-split$
^driver/split/ghc-split.prl$
^driver/stamp-pkg-conf-rts$
^includes/DerivedConstants.h$
^includes/GHCConstants.h$
^includes/ghcautoconf.h$
^includes/ghcplatform.h$
^includes/mkDerivedConstantsHdr$
^includes/mkGHCConstants$
^libffi/build($|/)
^libffi/ffi.h$
^libffi/stamp.ffi.static$
......@@ -74,6 +74,7 @@ _darcs/
/libraries/stm/
/libraries/template-haskell/
/libraries/terminfo/
/libraries/transformers
/libraries/unix/
/libraries/utf8-string/
/libraries/vector/
......
......@@ -50,12 +50,12 @@ For full information on building GHC, see the GHC Building Guide [3].
Here follows a summary - if you get into trouble, the Building Guide
has all the answers.
NB. you need GHC installed in order to build GHC, because the compiler
is itself written in Haskell. For instructions on how to port GHC to a
new platform, see the Building Guide.
Before building GHC you may need to install some other tools and
libraries. See "Setting up your system for building GHC" [8].
If you're building from git sources (as opposed to a source
distribution) then you also need to install Happy [4] and Alex [5].
NB. in particular you need GHC installed in order to build GHC,
because the compiler is itself written in Haskell. For instructions
on how to port GHC to a new platform, see the Building Guide [3].
For building library documentation, you'll need Haddock [6]. To build
the compiler documentation, you need a good DocBook XML toolchain and
......@@ -93,6 +93,7 @@ References
[5] http://www.haskell.org/alex/ Alex
[6] http://www.haskell.org/haddock/ Haddock
[7] http://hackage.haskell.org/trac/ghc/wiki/Building/SyncAll
[8] http://hackage.haskell.org/trac/ghc/wiki/Building/Preparation
Contributors
......
......@@ -171,7 +171,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
;;
arm)
GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT}\""
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
;;
alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
test -z "[$]2" || eval "[$]2=ArchUnknown"
......@@ -223,7 +223,10 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
netbsd)
test -z "[$]2" || eval "[$]2=OSNetBSD"
;;
dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
haiku)
test -z "[$]2" || eval "[$]2=OSHaiku"
;;
dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
test -z "[$]2" || eval "[$]2=OSUnknown"
;;
*)
......@@ -296,7 +299,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
# GET_ARM_ISA
# ----------------------------------
# Get info about the ISA on the Arm arch
# Get info about the ISA on the ARM arch
AC_DEFUN([GET_ARM_ISA],
[
AC_COMPILE_IFELSE([
......@@ -360,12 +363,13 @@ AC_DEFUN([FP_SETTINGS],
[
if test "$windows" = YES
then
SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe'
mingw_bin_prefix=mingw/bin/
SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe"
SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2"
SettingsArCommand='$topdir/../mingw/bin/ar.exe'
SettingsArCommand="\$topdir/../${mingw_bin_prefix}ar.exe"
SettingsPerlCommand='$topdir/../perl/perl.exe'
SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe'
SettingsWindresCommand='$topdir/../mingw/bin/windres.exe'
SettingsDllWrapCommand="\$topdir/../${mingw_bin_prefix}dllwrap.exe"
SettingsWindresCommand="\$topdir/../${mingw_bin_prefix}windres.exe"
SettingsTouchCommand='$topdir/touchy.exe'
else
SettingsCCompilerCommand="$WhatGccIsCalled"
......@@ -466,6 +470,21 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
])
AC_DEFUN([FP_PATH_PROG],[
AC_PATH_PROG($1,$2,$3,$4,$5,$6)
# If we have a cygwin path for something, and we try to run it
# from cabal or python, then it'll fail. So we convert to a
# native path.
if test "$HostOS" = "mingw32" && \
test "${OSTYPE}" != "msys" && \
test "${$1}" != ""
then
# Canonicalise to <drive>:/path/to/gcc
$1=`cygpath -m "${$1}"`
fi
])
# FP_VISIBILITY_HIDDEN
# ----------------------------------
# Is the visibility hidden attribute supported?
......@@ -486,7 +505,7 @@ AC_DEFUN([FP_VISIBILITY_HIDDEN],
# FPTOOLS_FLOAT_WORD_ORDER_BIGENDIAN
# ----------------------------------
# Little endian Arm on Linux with some ABIs has big endian word order
# Little endian ARM on Linux with some ABIs has big endian word order
# in doubles. Define FLOAT_WORDS_BIGENDIAN if this is the case.
AC_DEFUN([FPTOOLS_FLOAT_WORD_ORDER_BIGENDIAN],
[AC_CACHE_CHECK([whether float word order is big endian], [fptools_cv_float_word_order_bigendian],
......@@ -683,7 +702,8 @@ case $HostPlatform in
esac ;;
alpha-dec-osf*) fptools_cv_leading_underscore=no;;
*cygwin32) fptools_cv_leading_underscore=yes;;
*mingw32) fptools_cv_leading_underscore=yes;;
i386-unknown-mingw32) fptools_cv_leading_underscore=yes;;
x86_64-unknown-mingw32) fptools_cv_leading_underscore=no;;
# HACK: Apple doesn't seem to provide nlist in the 64-bit-libraries
x86_64-apple-darwin*) fptools_cv_leading_underscore=yes;;
......@@ -771,16 +791,7 @@ dnl at least Happy version 1.14. If there's no installed Happy, we look
dnl for a happy source tree and point the build system at that instead.
dnl
AC_DEFUN([FPTOOLS_HAPPY],
[AC_PATH_PROG(HappyCmd,happy,)
# Happy is passed to Cabal, so we need a native path
if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
test "${OSTYPE}" != "msys" && \
test "${HappyCmd}" != ""
then
# Canonicalise to <drive>:/path/to/gcc
HappyCmd=`cygpath -m "${HappyCmd}"`
AC_MSG_NOTICE([normalized happy command to $HappyCmd])
fi
[FP_PATH_PROG(HappyCmd,happy,)
AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
changequote(, )dnl
......@@ -807,15 +818,7 @@ dnl at least Alex version 2.0.1.
dnl
AC_DEFUN([FPTOOLS_ALEX],
[
AC_PATH_PROG(AlexCmd,alex,)
# Alex is passed to Cabal, so we need a native path
if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
test "${OSTYPE}" != "msys" && \
test "${AlexCmd}" != ""
then
# Canonicalise to <drive>:/path/to/gcc
AlexCmd=`cygpath -m "${AlexCmd}"`
fi
FP_PATH_PROG(AlexCmd,alex,)
AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version,
changequote(, )dnl
......@@ -959,21 +962,12 @@ AC_SUBST([LdHasNoCompactUnwind])
# FP_PROG_AR
# ----------
# Sets fp_prog_ar_raw to the full path of ar and fp_prog_ar to a non-Cygwin
# version of it. Exits if no ar can be found
# Sets fp_prog_ar to a (non-Cygwin) path to ar. Exits if no ar can be found
AC_DEFUN([FP_PROG_AR],
[AC_PATH_PROG([fp_prog_ar_raw], [ar])
if test -z "$fp_prog_ar_raw"; then
[FP_PATH_PROG([fp_prog_ar], [ar])
if test -z "$fp_prog_ar"; then
AC_MSG_ERROR([cannot find ar in your PATH, no idea how to make a library])
fi
fp_prog_ar="$fp_prog_ar_raw"
case $HostPlatform in
*mingw32) if test x${OSTYPE} != xmsys; then
fp_prog_ar="`cygpath -w "${fp_prog_ar_raw}" | sed -e 's@\\\\@/@g'`"
AC_MSG_NOTICE([normalized ar command to $fp_prog_ar])
fi
;;
esac
])# FP_PROG_AR
......@@ -982,8 +976,8 @@ esac
# Sets fp_prog_ar_is_gnu to yes or no, depending on whether it is GNU ar or not.
AC_DEFUN([FP_PROG_AR_IS_GNU],
[AC_REQUIRE([FP_PROG_AR])
AC_CACHE_CHECK([whether $fp_prog_ar_raw is GNU ar], [fp_cv_prog_ar_is_gnu],
[if "$fp_prog_ar_raw" --version 2> /dev/null | grep "GNU" > /dev/null 2>&1; then
AC_CACHE_CHECK([whether $fp_prog_ar is GNU ar], [fp_cv_prog_ar_is_gnu],
[if "$fp_prog_ar" --version 2> /dev/null | grep "GNU" > /dev/null 2>&1; then
fp_cv_prog_ar_is_gnu=yes
else
fp_cv_prog_ar_is_gnu=no
......@@ -1000,14 +994,14 @@ AC_SUBST([ArIsGNUAr], [`echo $fp_prog_ar_is_gnu | tr 'a-z' 'A-Z'`])
AC_DEFUN([FP_PROG_AR_SUPPORTS_ATFILE],
[AC_REQUIRE([FP_PROG_AR])
AC_REQUIRE([FP_PROG_AR_ARGS])
AC_CACHE_CHECK([whether $fp_prog_ar_raw supports @file], [fp_cv_prog_ar_supports_atfile],
AC_CACHE_CHECK([whether $fp_prog_ar supports @file], [fp_cv_prog_ar_supports_atfile],
[
rm -f conftest*
touch conftest.file
echo conftest.file > conftest.atfile
echo conftest.file >> conftest.atfile
"$fp_prog_ar_raw" $fp_prog_ar_args conftest.a @conftest.atfile > /dev/null 2>&1
fp_prog_ar_supports_atfile_tmp=`"$fp_prog_ar_raw" t conftest.a 2> /dev/null | grep -c conftest.file`
"$fp_prog_ar" $fp_prog_ar_args conftest.a @conftest.atfile > /dev/null 2>&1
fp_prog_ar_supports_atfile_tmp=`"$fp_prog_ar" t conftest.a 2> /dev/null | grep -c conftest.file`
rm -f conftest*
if test "$fp_prog_ar_supports_atfile_tmp" -eq 2
then
......@@ -1036,14 +1030,14 @@ else
touch conftest.dummy
for fp_var in clqsZ clqs cqs clq cq ; do
rm -f conftest.a
if "$fp_prog_ar_raw" $fp_var conftest.a conftest.dummy > /dev/null 2> /dev/null; then
if "$fp_prog_ar" $fp_var conftest.a conftest.dummy > /dev/null 2> /dev/null; then
fp_cv_prog_ar_args=$fp_var
break
fi
done
rm -f conftest*
if test -z "$fp_cv_prog_ar_args"; then
AC_MSG_ERROR([cannot figure out how to use your $fp_prog_ar_raw])
AC_MSG_ERROR([cannot figure out how to use your $fp_prog_ar])
fi
fi])
fp_prog_ar_args=$fp_cv_prog_ar_args
......@@ -1344,7 +1338,7 @@ EOF
# which we use for building PDF and PS docs.
# DblatexCmd is empty if dblatex could not be found.
AC_DEFUN([FP_PROG_DBLATEX],
[AC_PATH_PROG([DblatexCmd], [dblatex])
[FP_PATH_PROG([DblatexCmd], [dblatex])
if test -z "$DblatexCmd"; then
AC_MSG_WARN([cannot find dblatex in your PATH, you will not be able to build the PDF and PS documentation])
fi
......@@ -1356,7 +1350,7 @@ fi
# Sets the output variable XsltprocCmd to the full path of the XSLT processor
# xsltproc. XsltprocCmd is empty if xsltproc could not be found.
AC_DEFUN([FP_PROG_XSLTPROC],
[AC_PATH_PROG([XsltprocCmd], [xsltproc])
[FP_PATH_PROG([XsltprocCmd], [xsltproc])
if test -z "$XsltprocCmd"; then
AC_MSG_WARN([cannot find xsltproc in your PATH, you will not be able to build the HTML documentation])
fi
......@@ -1392,7 +1386,7 @@ AC_SUBST([HAVE_DOCBOOK_XSL])
# Sets the output variable XmllintCmd to the full path of the XSLT processor
# xmllint. XmllintCmd is empty if xmllint could not be found.
AC_DEFUN([FP_PROG_XMLLINT],
[AC_PATH_PROG([XmllintCmd], [xmllint])
[FP_PATH_PROG([XmllintCmd], [xmllint])
if test -z "$XmllintCmd"; then
AC_MSG_WARN([cannot find xmllint in your PATH, you will not be able to validate your documentation])
fi
......@@ -1798,7 +1792,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd)
dnl except we don't want to have to know what make is called. Sigh.
rm -rf utils/ghc-pwd/dist-boot
mkdir utils/ghc-pwd/dist-boot
if ! "$WithGhc" -v0 -no-user-package-conf -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
if ! "$WithGhc" -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
then
AC_MSG_ERROR([Building ghc-pwd failed])
fi
......
......@@ -48,8 +48,8 @@ endif