From f4b2bada0ce41a4f3687c9624fa22f37c9392f0f Mon Sep 17 00:00:00 2001 From: gambas Date: Mon, 1 Oct 2018 11:27:04 +0200 Subject: [PATCH] Now configure should fail only if a component is actually disabled, not just because a library search fails. [CONFIGURATION] * BUG: Now configure should fail only if a component is actually disabled, not just because a library search fails. --- acinclude.m4 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 216ef875d..8fcb853d2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -55,6 +55,10 @@ AC_DEFUN([GB_PRINT_MESSAGES], echo "||" echo fi + + if test -e DISABLED.* && test "x${GAMBAS_CONFIG_FAILURE}" != "x"; then + AC_MSG_ERROR([Failed to configure $3]) + fi ]) ## --------------------------------------------------------------------------- @@ -945,10 +949,6 @@ AC_DEFUN([GB_COMPONENT_PKG_CONFIG], done - if test "$gb_enable_$1" = "yes" && test "x${GAMBAS_CONFIG_FAILURE}" != "x" && test "$gb_in_component_search" != "yes"; then - AC_MSG_ERROR([Failed to configure $3]) - fi - else AC_DEFINE(HAVE_$2_COMPONENT, 1, [Have $3 component]) @@ -1121,10 +1121,6 @@ AC_DEFUN([GB_COMPONENT], have_$1=no touch DISABLED.$3 - if test "$gb_enable_$1" = "yes" && test "x${GAMBAS_CONFIG_FAILURE}" != "x"; then - AC_MSG_ERROR([Failed to configure $3]) - fi - fi if test "$have_$1" = "no"; then