diff options
| -rw-r--r-- | macros/mm-pkg.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/macros/mm-pkg.m4 b/macros/mm-pkg.m4 index 86f94d2..f1f49ca 100644 --- a/macros/mm-pkg.m4 +++ b/macros/mm-pkg.m4 @@ -1,4 +1,5 @@ ## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/> +## Copyright (c) 2012 Krzesimir Nowak <qdlacz@gmail.com> ## ## This file is part of mm-common. ## @@ -15,7 +16,7 @@ ## You should have received a copy of the GNU General Public License ## along with mm-common. If not, see <http://www.gnu.org/licenses/>. -#serial 20090822 +#serial 20120702 ## _MM_CHECK_GNU_MAKE ## @@ -35,8 +36,8 @@ AS_IF([[$]{MAKE-make} -f conftest.make >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD] [mm_gnu_make=yes], [mm_gnu_make=no]) rm -f conftest.make AC_MSG_RESULT([$mm_gnu_make]) -AS_IF([test "x$mm_gnu_make" != xyes], - [AC_MSG_FAILURE([[The GNU make program is required to build $PACKAGE_NAME.]])])[]dnl +AS_VAR_IF([mm_gnu_make], ['yes'],, + [AC_MSG_FAILURE([[The GNU make program is required to build $PACKAGE_NAME.]])])[]dnl ]) ## MM_CHECK_GNU_MAKE @@ -89,14 +90,14 @@ AS_IF([$PERL -e "require v$1; exit 0;" >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD] ## Run MM_PATH_PERL and then check whether the Perl interpreter can be ## executed and whether it meets the version requirement of <min-version> ## or later. Execute <action-if-found> on success, otherwise execute -## <action-if-not-found>. The default value of <min-version> is 5.6.0 +## <action-if-not-found>. The default value of <min-version> is 5.12.0 ## if the argument is empty. ## AC_DEFUN([MM_CHECK_PERL], [dnl AC_REQUIRE([_MM_PRE_INIT])[]dnl AC_REQUIRE([_MM_PATH_PERL])[]dnl -_MM_CHECK_PERL(m4_ifval([$1], [[$1]], [[5.6.0]]), [$2], [$3])[]dnl +_MM_CHECK_PERL(m4_ifval([$1], [[$1]], [[5.12.0]]), [$2], [$3])[]dnl ]) ## MM_PKG_CONFIG_SUBST(variable, arguments, [action-if-found], [action-if-not-found]) |