From ac498f75d5e4a4f18cfbcca22ded21c238348368 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Dec 2011 21:26:03 +0000 Subject: [PATCH] Generate a configure error if a dependency explicitly enabled with --with cannot be found Originally committed to SVN as r6105. --- aegisub/m4macros/ac_agi.m4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/aegisub/m4macros/ac_agi.m4 b/aegisub/m4macros/ac_agi.m4 index 772224243..c182ff406 100644 --- a/aegisub/m4macros/ac_agi.m4 +++ b/aegisub/m4macros/ac_agi.m4 @@ -33,10 +33,17 @@ AC_DEFUN([AC_AGI_LINK],[ AC_DEFUN([AGI_OPT_PKG], [ m4_define([varname], m4_bpatsubst([$1], [-.*], []))dnl m4_define([upper], m4_translit(varname, [a-z], [A-Z]))dnl + AC_ARG_WITH(varname, AS_HELP_STRING([--without-][varname], [$2])) AS_IF([test x$with_]varname[ = xno], varname[_disabled="(disabled)"], - [PKG_CHECK_MODULES(upper, $1 >= varname[]_required_version, [with_]varname[="yes"], [with_]varname[="no"])]) - AS_IF([test x$with_]varname[ = xyes], AC_DEFINE([WITH_]upper, 1, $3)) + [PKG_CHECK_MODULES(upper, $1 >= varname[]_required_version, [ + AC_DEFINE([WITH_]upper, 1, $3) + with_[]varname="yes" + ], [ + AS_IF([test x$with_]varname[ = xyes], + [AC_MSG_FAILURE([--with-]varname[ was specified, but ]varname[ could not be found])]) + with_[]varname="no" + ])]) AC_SUBST([with_]varname) ])