diff options
Diffstat (limited to 'm4/vala.m4')
-rw-r--r-- | m4/vala.m4 | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/m4/vala.m4 b/m4/vala.m4 index 5dad452bf..2355c85d2 100644 --- a/m4/vala.m4 +++ b/m4/vala.m4 @@ -6,22 +6,32 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# Check whether the Vala compiler exists in $PATH. If it is found, the -# variable VALAC is set. Optionally a minimum release number of the -# compiler can be requested. +# Check whether the Vala compiler exists in $PATH. If it is found, the +# variable VALAC is set pointing to its absolute path. Otherwise, it is +# simply set to 'valac'. +# Optionally a minimum release number of the compiler can be requested. +# If the ACTION-IF-FOUND parameter is given, it will be run if a proper +# Vala compiler is found. +# Similarly, if the ACTION-IF-FOUND is given, it will be run if no proper +# Vala compiler is found. It defaults to simply print a warning about the +# situation, but otherwise proceeding with the configuration. # -# AM_PROG_VALAC([MINIMUM-VERSION]) -# -------------------------------- +# AM_PROG_VALAC([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------------------------------- AC_DEFUN([AM_PROG_VALAC], -[AC_PATH_PROG([VALAC], [valac], []) - AS_IF([test -z "$VALAC"], - [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])], - [AS_IF([test -n "$1"], - [AC_MSG_CHECKING([$VALAC is at least version $1]) + [AC_PATH_PROG([VALAC], [valac], [valac]) + AS_IF([test "$VALAC" != valac && test -n "$1"], + [AC_MSG_CHECKING([whether $VALAC is at least version $1]) am__vala_version=`$VALAC --version | sed 's/Vala *//'` AS_VERSION_COMPARE([$1], ["$am__vala_version"], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Vala $1 not found.], [77])])])]) -]) + VALAC=valac])]) + if test "$VALAC" = valac; then + m4_default([$3], + [AC_MSG_WARN([no proper vala compiler found]) + AC_MSG_WARN([you will not be able to compile vala source files])]) + else + m4_default([$2], [:]) + fi]) |