[commit: ghc] master: Unify interfae of both variants FP_ARG_WITH_PATH... in aclocal.m4 and (e705fb0)

[David Terei]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e705fb083cc00d9330bc13a6f011c80c6fc40c8f

>---------------------------------------------------------------

commit e705fb083cc00d9330bc13a6f011c80c6fc40c8f
Author: David Terei <davidterei at gmail.com>
Date:   Wed Feb 6 13:47:51 2013 -0800

    Unify interfae of both variants FP_ARG_WITH_PATH... in aclocal.m4 and
    document them.

>---------------------------------------------------------------

 aclocal.m4   |   16 ++++++++++++----
 configure.ac |    4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 0fe79cf..837eea0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -602,7 +602,11 @@ AC_DEFUN([FPTOOLS_FLOAT_WORD_ORDER_BIGENDIAN],
 
 # FP_ARG_WITH_PATH_GNU_PROG
 # --------------------
-# XXX
+# Find the specified command on the path or allow a user to set it manually
+# with a --with-<command> option. An error will be thrown if the command isn't
+# found.
+#
+# This is ignored on the mingw32 platform.
 #
 # $1 = the variable to set
 # $2 = the with option name
@@ -641,10 +645,14 @@ AC_ARG_WITH($2,
 
 # FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL
 # --------------------
-# XXX
+# Same as FP_ARG_WITH_PATH_GNU_PROG but no error will be thrown if the command
+# isn't found.
+#
+# This is ignored on the mingw32 platform.
 #
 # $1 = the variable to set
-# $2 = the command to look for
+# $2 = the with option name
+# $3 = the command to look for
 #
 AC_DEFUN([FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL],
 [
@@ -662,7 +670,7 @@ AC_ARG_WITH($2,
 [
     if test "$HostOS" != "mingw32"
     then
-        AC_PATH_PROG([$1], [$2])
+        AC_PATH_PROG([$1], [$3])
     fi
 ]
 )
diff --git a/configure.ac b/configure.ac
index b7cd351..1a0fa81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -502,13 +502,13 @@ esac
 
 dnl ** Which LLVM llc to use?
 dnl --------------------------------------------------------------
-FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([LLC], [llc])
+FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([LLC], [llc], [llc])
 LlcCmd="$LLC"
 AC_SUBST([LlcCmd])
 
 dnl ** Which LLVM opt to use?
 dnl --------------------------------------------------------------
-FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OPT], [opt])
+FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OPT], [opt], [opt])
 OptCmd="$OPT"
 AC_SUBST([OptCmd])