From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Sat, 1 Oct 2022 15:29:55 +0000 (+0100)
Subject: use m4 macro to set module fail state
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a083ffedd596fc99a5f1d2760226817c240096cb;p=thirdparty%2Ffreeradius-server.git

use m4 macro to set module fail state
---

diff --git a/m4/fr_module_start_tests.m4 b/m4/fr_module_start_tests.m4
index b399b029211..3878fe5719c 100644
--- a/m4/fr_module_start_tests.m4
+++ b/m4/fr_module_start_tests.m4
@@ -21,6 +21,19 @@ fr_status="$1 ($2)"
 ])])
 
 
+dnl
+dnl FR_MODULE_FAIL
+dnl
+dnl Usage:
+dnl   FR_MODULE_FAIL([reason])
+dnl
+dnl Add a(nother) reason why the module will not be built.
+dnl
+AC_DEFUN([FR_MODULE_FAIL], [
+fail="$fail $1"
+])
+
+
 dnl
 dnl FR_MODULE_START_TESTS
 dnl
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
index 0244c3708c9..83ff082f763 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
@@ -70,7 +70,7 @@ smart_try_dir="$libmemcached_include_dir"
 FR_SMART_CHECK_INCLUDE([libmemcached/memcached.h])
 if test "x$ac_cv_header_libmemcached_memcached_h" != "xyes"; then
 	AC_MSG_WARN([libmemcached headers not found. Use --with-libmemcached-include-dir=<path>.])
-	fail='memcached.h'
+	FR_MODULE_FAIL([memcached.h])
 fi
 
 dnl ############################################################
@@ -88,7 +88,7 @@ FR_SMART_CHECK_LIB([memcached], [memcached])
 if test "x$ac_cv_lib_memcached_memcached" != "xyes"
 then
 	AC_MSG_WARN([libmemcached libraries not found. Use --with-libmemcached-lib-dir=<path>.])
-	fail="libmemcached $fail"
+	FR_MODULE_FAIL([libmemcached])
 else
 	AC_CHECK_FUNCS(\
 		memcached \
@@ -97,7 +97,9 @@ else
 		memcached_set \
 		memcached_delete \
 		libmemcached_check_configuration \
-	,, [fail="memcached functions"])
+	,[] , [
+		FR_MODULE_FAIL([memcached functions])
+	])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index 76b751dab34..2604e56fa26 100644
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -65,13 +65,11 @@ dnl ############################################################
 dnl # Check for libcouchbase header files
 dnl ############################################################
 
-have_couchbase="yes"
-
 smart_try_dir="$libcouchbase_include_dir"
 FR_SMART_CHECK_INCLUDE([libcouchbase/couchbase.h])
 if test "x$ac_cv_header_libcouchbase_couchbase_h" != "xyes"; then
-	have_couchbase="no"
 	AC_MSG_WARN([libcouchbase headers not found. Use --with-libcouchbase-include-dir=<path>.])
+        FR_MODULE_FAIL([couchbase.h])
 fi
 
 dnl ############################################################
@@ -81,12 +79,8 @@ dnl ############################################################
 smart_try_dir="$libcouchbase_lib_dir"
 FR_SMART_CHECK_LIB([couchbase], [lcb_get_version])
 if test "x$ac_cv_lib_couchbase_lcb_get_version" != "xyes"; then
-	have_couchbase="no"
 	AC_MSG_WARN([libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>.])
-fi
-
-if test x"$have_couchbase" != x"yes"; then
-	fail="$fail libcouchbase"
+        FR_MODULE_FAIL([libcouchbase])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_idn/configure.ac b/src/modules/rlm_idn/configure.ac
index 59306918ee0..cf244689e6e 100644
--- a/src/modules/rlm_idn/configure.ac
+++ b/src/modules/rlm_idn/configure.ac
@@ -11,12 +11,12 @@ AC_PROG_CPP
 
 FR_SMART_CHECK_LIB(idn, idna_to_ascii_8z)
 if test "x$ac_cv_lib_idn_idna_to_ascii_8z" != "xyes"; then
-	fail="$fail libidn"
+	FR_MODULE_FAIL([libidn])
 fi
 
 FR_SMART_CHECK_INCLUDE(idna.h)
 if test "$ac_cv_header_idna_h" != "yes"; then
-	fail="$fail idna.h"
+	FR_MODULE_FAIL([idna.h])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index 9243862df8c..9391d45858d 100644
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -66,7 +66,7 @@ else
 	smart_try_dir="$rlm_krb5_dir/include"
 	FR_SMART_CHECK_INCLUDE(krb5.h)
 	if test "$ac_cv_header_krb5_h" != "yes"; then
-		fail="$fail krb5.h"
+		FR_MODULE_FAIL([krb5.h])
 	fi
 
 	krb5libcrypto=
@@ -103,7 +103,7 @@ else
 
 		FR_SMART_CHECK_LIB(krb5, krb5_get_init_creds_password)
 		if test "x$ac_cv_lib_krb5_krb5_get_init_creds_password" != xyes; then
-			fail="$fail krb5"
+			FR_MODULE_FAIL([krb5])
 		fi
 	fi
 
@@ -153,7 +153,7 @@ if test "$krb5_api_type" = "mit"; then
 	if test "$ac_cv_header_com_err_h" != "yes"; then
 		FR_SMART_CHECK_INCLUDE([et/com_err.h])
 		if test "$ac_cv_header_et_com_err_h" != "yes"; then
-			fail="$fail com_err.h"
+			FR_MODULE_FAIL([com_err.h])
 		else
 			krb5mod_cflags="$krb5mod_cflags -DET_COMM_ERR "
 		fi
diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac
index 081b11ba2ce..ce207cea9fc 100644
--- a/src/modules/rlm_lua/configure.ac
+++ b/src/modules/rlm_lua/configure.ac
@@ -66,10 +66,10 @@ if test "x$ac_cv_header_lua_h" = "xno"; then
 fi
 
 if test "x$ac_cv_header_lua_h" = "xno"; then
-	fail="lua.h"
+	FR_MODULE_FAIL([lua.h])
 else
 	if test "x$ax_header_version_match" = "xno"; then
-		fail="lua.h version"
+		FR_MODULE_FAIL([correct header version])
 	else
 		AC_CACHE_CHECK([ldflags], [_cv_lua_ldflags],
 		[
@@ -91,7 +91,7 @@ else
 		fi
 
 		if test "x$_ax_found_lua_libs" != 'xyes'; then
-			fail="Lua libs"
+			FR_MODULE_FAIL([lua libraries])
 		fi
 		_cv_lua_ldflags="$LUA_LIB $LDFLAGS"
 		])
diff --git a/src/modules/rlm_mruby/configure.ac b/src/modules/rlm_mruby/configure.ac
index 6cd30d00b83..effcb3c2b71 100644
--- a/src/modules/rlm_mruby/configure.ac
+++ b/src/modules/rlm_mruby/configure.ac
@@ -69,19 +69,19 @@ smart_try_dir="$mruby_include_dir /usr/include"
 FR_SMART_CHECK_INCLUDE(mruby.h, [])
 if test "x$ac_cv_header_mruby_h" != "xyes"; then
 	AC_MSG_WARN([mruby.h not found. Use --with-mruby-include-dir=<path>.])
-	fail="$fail mruby.h"
+	FR_MODULE_FAIL([mruby.h])
 fi
 
 FR_SMART_CHECK_INCLUDE(mruby/compile.h, [#include <mruby.h>])
 if test "x$ac_cv_header_mruby_compile_h" != "xyes"; then
 	AC_MSG_WARN([mruby/compile.h not found. Use --with-mruby-include-dir=<path>.])
-	fail="$fail mruby/compile.h"
+	FR_MODULE_FAIL([mruby/compile.h])
 fi
 
 FR_SMART_CHECK_INCLUDE(mruby/array.h, [#include <mruby.h>])
 if test "x$ac_cv_header_mruby_array_h" != "xyes"; then
 	AC_MSG_WARN([mruby/array.h not found. Use --with-mruby-include-dir=<path>.])
-	fail="$fail mruby/array.h"
+	FR_MODULE_FAIL([mruby/array.h])
 fi
 
 old_LIBS=$LIBS
@@ -93,7 +93,7 @@ if test "x$ac_cv_lib_mruby_mrb_run" = "xyes"; then
 	mod_ldflags="${SMART_LIBS}"
 else
 	AC_MSG_WARN([mruby libraries not found. Use --with-mruby-lib-dir=<path>.])
-	fail="$fail libmruby"
+	FR_MODULE_FAIL([libmruby])
 fi
 
 FR_SMART_CHECK_LIB(m, fmod)
@@ -101,7 +101,7 @@ if test "x$ac_cv_lib_m_fmod" = "xyes"; then
 	mod_ldflags="${mod_ldflags} ${SMART_LIBS}"
 else
 	AC_MSG_WARN([m library not found.])
-	fail="$fail libm"
+	FR_MODULE_FAIL([libm])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac
index 98164a00c21..ad8cf988c4f 100644
--- a/src/modules/rlm_opendirectory/configure.ac
+++ b/src/modules/rlm_opendirectory/configure.ac
@@ -13,7 +13,7 @@ mod_ldflags="${mod_ldflags} -F /Library/Developer/CommandLineTools/SDKs/MacOSX.s
 
 FR_SMART_CHECK_INCLUDE(membership.h)
 if test "$ac_cv_header_membership_h" != "yes"; then
-	fail="$fail membership.h"
+	FR_MODULE_FAIL([membership.h])
 else
 	AC_CHECK_DECLS(mbr_check_service_membership,
 		[mod_cflags="${mod_cflags} -DHAVE_DECL_MBR_CHECK_SERVICE_MEMBERSHIP"],
diff --git a/src/modules/rlm_pam/configure.ac b/src/modules/rlm_pam/configure.ac
index ca141a0e1d2..5a2b9f11222 100644
--- a/src/modules/rlm_pam/configure.ac
+++ b/src/modules/rlm_pam/configure.ac
@@ -15,7 +15,7 @@ AC_CHECK_LIB(dl, dlopen,
 
 AC_CHECK_LIB(pam, pam_start,
 	[ mod_ldflags="-lpam $mod_ldflags" ],
-	[ fail=$fail" libpam" ],
+	[ FR_MODULE_FAIL([libpam]) ],
 	[ $mod_ldflags ]
 )
 
diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
index a6282f0b161..6b7f8ca7462 100644
--- a/src/modules/rlm_perl/configure.ac
+++ b/src/modules/rlm_perl/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_CPP
 
 AX_WITH_PROG([PERL],[perl],[not-found],[${PATH}:/usr/bin:/usr/local/bin])
 if test "$PERL" = "not-found" -o ! -x "$PERL"; then
-	fail=$fail" perl"
+	FR_MODULE_FAIL([perl])
 else
 	old_CFLAGS="${CFLAGS}"
 	old_LIBS="${LIBS}"
@@ -62,12 +62,12 @@ else
 	smart_try_dir=
 	FR_SMART_CHECK_INCLUDE(EXTERN.h)
 	if test "x$ac_cv_header_EXTERN_h" != "xyes"; then
-		fail="$fail EXTERN.h"
+		FR_MODULE_FAIL([EXTERN.h])
 	fi
 
 	FR_SMART_CHECK_INCLUDE(perl.h, [#include <EXTERN.h>])
 	if test "x$ac_cv_header_perl_h" != "xyes"; then
-		fail="$fail EXTERN.h"
+		FR_MODULE_FAIL([EXTERN.h])
 	fi
 
 	dnl ############################################################
@@ -81,7 +81,7 @@ else
 
 	AC_MSG_RESULT($LINKS)
 	if test "x$LINKS" = "xno"; then
-		fail="$fail libperl.so"
+		FR_MODULE_FAIL([libperl.so])
 	fi
 
 	AC_MSG_CHECKING([we can link to Perl_hv_store()])
@@ -92,7 +92,7 @@ else
 
 	AC_MSG_RESULT($LINKS)
 	if test "x$LINKS" = "xno"; then
-		fail="$fail libperl.so"
+		FR_MODULE_FAIL([libperl.so])
 	fi
 
 	CFLAGS="$old_CFLAGS"
diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac
index 99a97884ccc..d30532bda9f 100644
--- a/src/modules/rlm_python/configure.ac
+++ b/src/modules/rlm_python/configure.ac
@@ -30,7 +30,7 @@ if test "x$PYTHON_CONFIG_BIN" = x; then
 fi
 
 if test "x$PYTHON_CONFIG_BIN" = "xnot-found"; then
-	fail="python-config"
+	FR_MODULE_FAIL([python-config])
 else
 	dnl #
 	dnl # It is necessary due to a weird behavior with 'python-config'
@@ -119,7 +119,7 @@ else
 
 	AC_MSG_RESULT($LINKS)
 	if test "x$LINKS" = "xno"; then
-		fail="$fail working python libraries"
+		FR_MODULE_FAIL([working python libraries])
 	fi
 
 	CFLAGS=$old_CFLAGS
diff --git a/src/modules/rlm_securid/configure.ac b/src/modules/rlm_securid/configure.ac
index 4fcc9ee6bac..775b0200d8e 100644
--- a/src/modules/rlm_securid/configure.ac
+++ b/src/modules/rlm_securid/configure.ac
@@ -69,7 +69,7 @@ smart_try_dir="$securid_include_dir"
 FR_SMART_CHECK_INCLUDE(acexport.h)
 if test "x$ac_cv_header_acexport_h" != "xyes"; then
 	AC_MSG_WARN([securid headers not found. Use --with-rlm-securid-include-dir=<path>.])
-	fail="$fail acexport.h"
+	FR_MODULE_FAIL([acexport.h])
 fi
 
 dnl ############################################################
@@ -82,7 +82,7 @@ FR_SMART_CHECK_LIB(aceclnt, SD_Init)
 if test "x$ac_cv_lib_aceclnt_SD_Init" != "xyes"
 then
 	AC_MSG_WARN([securid libraries not found. Use --with-rlm-securid-lib-dir=<path>.])
-	fail="$fail libaceclnt"
+	FR_MODULE_FAIL([libaceclnt])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sigtran/configure.ac b/src/modules/rlm_sigtran/configure.ac
index c3b4a4375f6..160b74f1dd9 100644
--- a/src/modules/rlm_sigtran/configure.ac
+++ b/src/modules/rlm_sigtran/configure.ac
@@ -59,7 +59,7 @@ FR_SMART_PKGCONFIG_INCLUDE([libosmocore], "${sigtran_include_dir}")
 FR_SMART_CHECK_INCLUDE([osmocom/core/msgb.h])
 if test "x$ac_cv_header_osmocom_core_msgb_h" != "xyes"; then
 	AC_MSG_WARN([libosmocomcore headers not found. Use --with-sigtran-include-dir=<path>.])
-	fail="$fail osmocom/core/msgb.h"
+	FR_MODULE_FAIL([osmocom/core/msgb.h])
 fi
 
 FR_SMART_PKGCONFIG_INCLUDE([libosmo-sccp], "${sigtran_include_dir}")
@@ -68,7 +68,7 @@ CFLAGS="${CFLAGS} -include stdint.h -include osmocom/core/linuxlist.h"
 FR_SMART_CHECK_INCLUDE([osmocom/sccp/sccp.h])
 if test "x$ac_cv_header_osmocom_sccp_sccp_h" != "xyes"; then
 	AC_MSG_WARN([libosmocom-sccp headers not found. Use --with-sigtran-include-dir=<path>.])
-	fail="$fail osmocom/sccp/sccp.h"
+	FR_MODULE_FAIL([osmocom/sccp/sccp.h])
 fi
 CFLAGS="$old_cflags"
 
@@ -81,7 +81,7 @@ FR_SMART_CHECK_LIB([osmocore], msgb_alloc)
 if test "x$ac_cv_lib_osmocore_msgb_alloc" != "xyes"
 then
 	AC_MSG_WARN([libosmocore libraries not found. Use --with-sigtran-lib-dir=<path>.])
-	fail="$fail libosmocore"
+	FR_MODULE_FAIL([libosmocore])
 fi
 
 FR_SMART_PKGCONFIG_LIB([libosmo-sccp], "${sigtran_lib_dir}")
@@ -89,7 +89,7 @@ FR_SMART_CHECK_LIB([osmo-sccp], sccp_connection_connect)
 if test "x$ac_cv_lib_sccp_sccp_connection_connect" != "xyes" -a "x$ac_cv_lib_osmo_sccp_sccp_connection_connect" != "xyes"
 then
 	AC_MSG_WARN([libsccp libraries not found. Use --with-sigtran-lib-dir=<path>.])
-	fail="$fail libsccp"
+	FR_MODULE_FAIL([libsccp])
 fi
 
 FR_SMART_PKGCONFIG_LIB([libosmo-xua], "${sigtran_lib_dir}")
@@ -97,7 +97,7 @@ FR_SMART_CHECK_LIB([osmo-xua], xua_msg_alloc)
 if test "x$ac_cv_lib_xua_xua_msg_alloc" != "xyes" -a "x$ac_cv_lib_osmo_xua_xua_msg_alloc" != "xyes"
 then
 	AC_MSG_WARN([libxua libraries not found. Use --with-sigtran-lib-dir=<path>.])
-	fail="$fail libxua"
+	FR_MODULE_FAIL([libxua])
 fi
 
 FR_SMART_PKGCONFIG_LIB([libosmo-mtp], "${sigtran_lib_dir}")
@@ -105,7 +105,7 @@ FR_SMART_CHECK_LIB([osmo-mtp], mtp_pcap_write_header)
 if test "x$ac_cv_lib_mtp_mtp_pcap_write_header" != "xyes" -a "x$ac_cv_lib_osmo_mtp_mtp_pcap_write_header" != "xyes"
 then
 	AC_MSG_WARN([libmtp libraries not found. Use --with-sigtran-lib-dir=<path>.])
-	fail="$fail libmtp"
+	FR_MODULE_FAIL([libmtp])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
index 81582493842..319f3210d43 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
@@ -79,7 +79,7 @@ LDFLAGS="$SMART_LIBS"
 if test "x$ac_cv_lib_cassandra_cass_statement_new_n" != "xyes"
 then
 	AC_MSG_WARN([Cassandra libraries not found. Use --with-cassandra-lib-dir=<path>.])
-	fail="$fail libcassandra (>= 2.0)"
+	FR_MODULE_FAIL([libcassandra (>= 2.0)])
 fi
 
 dnl ############################################################
@@ -90,7 +90,7 @@ smart_try_dir="$cassandra_include_dir"
 FR_SMART_CHECK_INCLUDE(cassandra.h)
 if test "x$ac_cv_header_cassandra_h" != "xyes"; then
 	AC_MSG_WARN([Cassandra headers not found. Use --with-cassandra-include-dir=<path>.])
-	fail="$fail cassandra.h"
+	FR_MODULE_FAIL([cassandra.h])
 fi
 CFLAGS="$SMART_CPPFLAGS"
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
index fb95eae462f..e46dbff8571 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -61,14 +61,14 @@ dnl Check for SQLConnect in -ldb2
 smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib"
 FR_SMART_CHECK_LIB(db2, SQLConnect)
 if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then
-	fail="$fail libdb2"
+	FR_MODULE_FAIL([libdb2])
 fi
 
 dnl Check for sqlcli.h
 smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include"
 FR_SMART_CHECK_INCLUDE(sqlcli.h)
 if test "x$ac_cv_header_sqlcli_h" != xyes; then
-	fail="$fail sqlcli.h"
+	FR_MODULE_FAIL([sqlcli.h])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
index fe85a5925ac..09c09c149b8 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
@@ -61,14 +61,14 @@ dnl Check for isc_attach_database in -lfbclient
 smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib"
 FR_SMART_CHECK_LIB(fbclient, isc_attach_database)
 if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then
-	fail="$fail libfbclient"
+	FR_MODULE_FAIL([libfbclient])
 fi
 
 dnl Check for ibase.h
 smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include"
 FR_SMART_CHECK_INCLUDE(ibase.h)
 if test "x$ac_cv_header_ibase_h" != xyes; then
-	fail="$fail ibase.h"
+	FR_MODULE_FAIL([ibase.h])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
index 71962b0c406..4d1195bdee3 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
@@ -69,7 +69,7 @@ smart_try_dir="$freetds_include_dir"
 FR_SMART_CHECK_INCLUDE(ctpublic.h)
 if test "x$ac_cv_header_ctpublic_h" != "xyes"; then
 	AC_MSG_WARN([freetds headers not found. Use --with-freetds-include-dir=<path>.])
-	fail="$fail ctpublic.h"
+	FR_MODULE_FAIL([ctpublic.h])
 fi
 
 dnl ############################################################
@@ -82,7 +82,7 @@ FR_SMART_CHECK_LIB(ct, ct_command)
 if test "x$ac_cv_lib_ct_ct_command" != "xyes"
 then
 	AC_MSG_WARN([freetds libraries not found. Use --with-freetds-lib-dir=<path>.])
-	fail="$fail libct"
+	FR_MODULE_FAIL([libct])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
index 0771e6983f7..6b537798eb1 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
@@ -155,7 +155,7 @@ fi
 
 if test "x$have_a_libmysqlclient" != "xyes"; then
 	AC_MSG_WARN([MySQL libraries not found. Use --with-mysql-lib-dir=<path>.])
-	fail="$fail libmysqlclient || libmysqlclient_r"
+	FR_MODULE_FAIL([libmysqlclient || libmysqlclient_r])
 fi
 
 dnl ############################################################
@@ -196,7 +196,7 @@ if test "x$have_mysql_h" != "xyes"; then
 		AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>])
 	else
 		AC_MSG_WARN([MySQL headers not found. Use --with-mysql-include-dir=<path>.])
-		fail="$fail mysql.h"
+		FR_MODULE_FAIL([mysql.h])
 	fi
 fi
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
index 90bef99f2f0..4fb7916d064 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -76,7 +76,7 @@ fi
 FR_SMART_CHECK_INCLUDE(oci.h)
 if test "x$ac_cv_header_oci_h" != "xyes"; then
 	AC_MSG_WARN([oracle headers not found. Use --with-oracle-include-dir=<path> or set ORACLE_HOME.])
-	fail="$fail oci.h"
+	FR_MODULE_FAIL([oci.h])
 fi
 
 dnl ############################################################
@@ -143,7 +143,7 @@ LIBS="$old_LIBS"
 
 if test "x$mod_ldflags" = "x"; then
 	AC_MSG_WARN([oracle libraries not found.  Use --with-oracle-lib-dir=<path> or set ORACLE_HOME.])
-	fail=["$fail libclntsh libnnz[9-12]"]
+	FR_MODULE_FAIL([[libclntsh libnnz[9-12]]])]
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
index 2227ac78053..29e7c92caaa 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -46,7 +46,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir,
 smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql"
 FR_SMART_CHECK_INCLUDE(libpq-fe.h)
 if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
-	fail="$fail libpq-fe.h"
+	FR_MODULE_FAIL([libpq-fe.h])
 else
 	CPPFLAGS="$SMART_CPPFLAGS"
 	AC_MSG_CHECKING([for PGRES_SINGLE_TUPLE])
@@ -95,7 +95,7 @@ fi
 smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib"
 FR_SMART_CHECK_LIB(pq, PQconnectdb)
 if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then
-	fail="$fail libpq"
+	FR_MODULE_FAIL([libpq])
 fi
 AC_CHECK_FUNCS(\
 	PQinitOpenSSL \
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
index 8d757d225e2..2d9ecd27493 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
@@ -80,7 +80,7 @@ LDFLAGS="$SMART_LIBS"
 if test "x$ac_cv_lib_sqlite3_sqlite3_open" != "xyes"
 then
 	AC_MSG_WARN([Sqlite libraries not found. Use --with-sqlite-lib-dir=<path>.])
-	fail="$fail libsqlite3"
+	FR_MODULE_FAIL([libsqlite3])
 else
 	dnl # Add any v2 variants here
 	AC_CHECK_FUNCS(\
@@ -101,7 +101,7 @@ FR_SMART_CHECK_INCLUDE(sqlite3.h)
 
 if test "x$ac_cv_header_sqlite3_h" != "xyes"; then
 	AC_MSG_WARN([Sqlite headers not found. Use --with-sqlite-include-dir=<path>.])
-	fail="$fail sqlite.h"
+	FR_MODULE_FAIL([sqlite.h])
 fi
 
 CFLAGS="$SMART_CPPFLAGS"
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
index a588bed9262..219d8763554 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
@@ -61,14 +61,14 @@ dnl Check for SQLConnect in -lodbc
 smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib"
 FR_SMART_CHECK_LIB(odbc, SQLConnect)
 if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then
-	fail="$fail libodbc"
+	FR_MODULE_FAIL([libodbc])
 fi
 
 dnl Check for sql.h
 smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include"
 FR_SMART_CHECK_INCLUDE(sql.h)
 if test "x$ac_cv_header_sql_h" != xyes; then
-	fail="$fail sql.h"
+	FR_MODULE_FAIL([sql.h])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_unbound/configure.ac b/src/modules/rlm_unbound/configure.ac
index b414af4cc3f..2b9162ec9df 100644
--- a/src/modules/rlm_unbound/configure.ac
+++ b/src/modules/rlm_unbound/configure.ac
@@ -41,19 +41,19 @@ AC_ARG_WITH(rlm-unbound-include-dir,
 smart_try_dir=$rlm_unbound_lib_dir
 FR_SMART_CHECK_LIB(unbound, ub_ctx_create_ub_event)
 if test "x$ac_cv_lib_unbound_ub_ctx_create_ub_event" != "xyes"; then
-	fail="$fail libunbound"
+	FR_MODULE_FAIL([libunbound])
 fi
 
 smart_try_dir=$rlm_unbound_include_dir
 FR_SMART_CHECK_INCLUDE(unbound.h)
 if test "$ac_cv_header_unbound_h" != "yes"; then
-	fail="$fail unbound.h"
+	FR_MODULE_FAIL([unbound.h])
 fi
 
 smart_try_dir=$rlm_unbound_include_dir
 FR_SMART_CHECK_INCLUDE(unbound-event.h)
 if test "$ac_cv_header_unboundmevent_h" != "yes"; then
-	fail="$fail unbound-event.h"
+	FR_MODULE_FAIL([unbound-event.h])
 fi
 
 FR_MODULE_END_TESTS
diff --git a/src/modules/rlm_unix/configure.ac b/src/modules/rlm_unix/configure.ac
index db11a247189..16d8a506c1b 100644
--- a/src/modules/rlm_unix/configure.ac
+++ b/src/modules/rlm_unix/configure.ac
@@ -14,7 +14,7 @@ if test -f /etc/passwd; then
 	AC_MSG_RESULT(/etc/passwd)
 else
 	AC_MSG_RESULT(no /etc/passwd file.)
-	[ fail=$fail" /etc/passwd" ]
+	FR_MODULE_FAIL([/etc/passwd])
 fi
 
 dnl useless?
@@ -30,12 +30,12 @@ AC_CHECK_FUNCS(getspnam getusershell getpwnam)
 
 if test "$ac_cv_func_getpwnam" != "yes"; then
 	AC_MSG_RESULT(no getpwnam)
-	[ fail=$fail" getpwnam" ]
+	FR_MODULE_FAIL([getpwnam])
 fi
 
 if test "$ac_cv_header_pwd_h" != "yes"; then
 	AC_MSG_RESULT(no pwd.h)
-	[ fail=$fail" pwd.h" ]
+	FR_MODULE_FAIL([pwd.h])
 fi
 
 AC_CHECK_LIB(shadow, getspnam,
diff --git a/src/modules/rlm_winbind/configure.ac b/src/modules/rlm_winbind/configure.ac
index 93d8f996ccf..b165364e9ff 100644
--- a/src/modules/rlm_winbind/configure.ac
+++ b/src/modules/rlm_winbind/configure.ac
@@ -72,7 +72,7 @@ FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h>
 if test "x$ac_cv_header_wbclient_h" != "xyes"; then
 	AC_MSG_WARN([wbclient.h not found. Use --with-winbind-include-dir=<path>.])
 	AC_MSG_WARN([silently building without support for direct authentication via winbind. requires: libwbclient])
-	fail="$fail wbclient.h"
+	FR_MODULE_FAIL([wbclient.h])
 fi
 
 FR_SMART_CHECK_INCLUDE(core/ntstatus.h, [#include <stdint.h>
@@ -80,7 +80,7 @@ FR_SMART_CHECK_INCLUDE(core/ntstatus.h, [#include <stdint.h>
 if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then
 	AC_MSG_WARN([core/ntstatus.h not found. Use --with-winbind-include-dir=<path>.])
 	AC_MSG_WARN([silently building without support for direct authentication via winbind. requires: libwbclient])
-	fail="$fail core/ntstatus.h"
+	FR_MODULE_FAIL([core/ntstatus.h])
 fi
 
 dnl ############################################################
@@ -95,7 +95,7 @@ if test "x$ac_cv_header_wbclient_h" = "xyes" && \
 	if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then
 		AC_MSG_WARN([winbind libraries not found. Use --with-winbind-lib-dir=<path>.])
 		AC_MSG_WARN([Samba must be version 4.2.1 or higher to use this feature.])
-		fail="$fail libwbclient"
+		FR_MODULE_FAIL([libwbclient])
 	fi
 fi