@@ -44,6 +44,40 @@ AC_DEFUN([FP_EVAL_STDERR], ])# FP_EVAL_STDERR +# FP_ARG_WITH_PATH_GNU_PROG +# -------------------- +# XXX +# +# $1 = the command to look for +# $2 = the variable to set +# +AC_DEFUN([FP_ARG_WITH_PATH_GNU_PROG], +[ +AC_ARG_WITH($2, +[AC_HELP_STRING([--with-$2=ARG], + [Use ARG as the path to $2 [default=autodetect]])], +[ + if test "$HostOS" = "mingw32" + then + AC_MSG_WARN([Request to use $withval will be ignored]) + else + $1=$withval + fi +], +[ + if test "$HostOS" != "mingw32" + then + AC_PATH_PROG([$1], [$2]) + if test -z "$$1" + then + AC_MSG_ERROR([cannot find $2 in your PATH, no idea how to link]) + fi + fi +] +) +]) # FP_ARG_WITH_PATH_GNU_PROG + + # FP_PROG_CONTEXT_DIFF # -------------------- # Figure out how to do context diffs. Sets the output variable ContextDiffCmd. aclocal.m4 @@ -403,50 +403,14 @@ fi dnl ** Which gcc to use? dnl -------------------------------------------------------------- -AC_ARG_WITH(gcc, -[AC_HELP_STRING([--with-gcc=ARG], - [Use ARG as the path to GCC [default=autodetect]])], -[CC="$withval" - if test "$HostOS" = "mingw32" - then - AC_MSG_WARN([Request to use $WhatGccIsCalled will be ignored]) - fi -], -[ - if test "$HostOS" != "mingw32" - then - CC="gcc" - fi -] -) +FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) export CC WhatGccIsCalled="$CC" AC_SUBST(WhatGccIsCalled) dnl ** Which ld to use? dnl -------------------------------------------------------------- -AC_ARG_WITH(ld, -[AC_HELP_STRING([--with-ld=ARG], - [Use ARG as the path to LD [default=autodetect]])], -[ - if test "$HostOS" = "mingw32" - then - AC_MSG_WARN([Request to use $withval will be ignored]) - else - LD=$withval - fi -], -[ - if test "$HostOS" != "mingw32" - then - AC_PATH_PROG([LD], [ld]) - if test -z "$LD" - then - AC_MSG_ERROR([cannot find ld in your PATH, no idea how to link]) - fi - fi -] -) +FP_ARG_WITH_PATH_GNU_PROG([LD], [ld]) LdCmd="$LD" AC_SUBST([LdCmd]) configure.ac 1395742cf937bb749c92a424958635563b38431e Ian Lynagh igloo@earth.li http://github.com/ghc-hq/ghc/commit/20b15858622acaa671b84a974f698b1a8de558a4 20b15858622acaa671b84a974f698b1a8de558a4 2009-10-12T14:34:14-07:00 2009-10-12T14:34:14-07:00 Refactor some configure.ac stuff 3b74ff8280b6b09186f78a36f07db6fbad800940 Ian Lynagh igloo@earth.li