From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Sat, 1 Oct 2022 10:43:50 +0000 (+0100)
Subject: tidy and standardise format of module configure.ac files
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=318372517cdca90a8fe4a9d0658207d86a438fc4;p=thirdparty%2Ffreeradius-server.git

tidy and standardise format of module configure.ac files
---

diff --git a/src/modules/rlm_cache/configure.ac b/src/modules/rlm_cache/configure.ac
index 800728333f9..fa5fcc8c11a 100644
--- a/src/modules/rlm_cache/configure.ac
+++ b/src/modules/rlm_cache/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_cache.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_cache])
+FR_INIT_MODULE([rlm_cache], [module to cache attributes])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 045ef40538d..0244c3708c9 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_cache_memcached.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_cache_memcached])
+FR_INIT_MODULE([rlm_cache_memcached], [memcached support for rlm_cache])
 
 FR_MODULE_START_TESTS
 
@@ -66,7 +66,6 @@ dnl ############################################################
 dnl # Check for libmemcached header files
 dnl ############################################################
 
-have_json="yes"
 smart_try_dir="$libmemcached_include_dir"
 FR_SMART_CHECK_INCLUDE([libmemcached/memcached.h])
 if test "x$ac_cv_header_libmemcached_memcached_h" != "xyes"; then
@@ -98,7 +97,7 @@ else
 		memcached_set \
 		memcached_delete \
 		libmemcached_check_configuration \
-	,, [fail="memached functions"])
+	,, [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 e52d9a4c48d..76b751dab34 100644
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_couchbase.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_couchbase])
+FR_INIT_MODULE([rlm_couchbase], [couchbase database support])
 
 FR_MODULE_START_TESTS
 
diff --git a/src/modules/rlm_eap/configure.ac b/src/modules/rlm_eap/configure.ac
index 9f29d328edc..1267b816003 100644
--- a/src/modules/rlm_eap/configure.ac
+++ b/src/modules/rlm_eap/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_eap.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_eap])
+FR_INIT_MODULE([rlm_eap], [EAP functionality])
 
 SMART_LIBS=
 SMART_CLFAGS=
diff --git a/src/modules/rlm_idn/configure.ac b/src/modules/rlm_idn/configure.ac
index 6dad024c3c9..59306918ee0 100644
--- a/src/modules/rlm_idn/configure.ac
+++ b/src/modules/rlm_idn/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_idn.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_idn])
+FR_INIT_MODULE([rlm_idn], [support for internationalized domain names])
 
 FR_MODULE_START_TESTS
 
diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index c520e8575d0..9243862df8c 100644
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_krb5.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_krb5])
+FR_INIT_MODULE([rlm_krb5], [Kerberos support])
 
 FR_MODULE_START_TESTS
 
@@ -12,8 +12,9 @@ AC_PROG_CPP
 dnl extra argument: --with-rlm-krb5-dir
 rlm_krb5_dir=
 AC_ARG_WITH(rlm-krb5-dir,
-	[ --with-rlm-krb5-dir=DIR       Directory for krb5 files []],
-	[ case "$withval" in
+	[AS_HELP_STRING([--with-rlm-krb5-dir=DIR],
+		[directory where krb5 files are installed])],
+	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-krb5-dir)
 		;;
@@ -22,8 +23,7 @@ AC_ARG_WITH(rlm-krb5-dir,
 	*)
 		rlm_krb5_dir="$withval"
 		;;
-	esac ]
-)
+	esac])
 
 AC_PATH_PROG(krb5_config, krb5-config, not-found, [${rlm_krb5_dir}/bin:${PATH}:/usr/bin:/usr/local/bin])
 dnl #
diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac
index 7c4f04dac53..081b11ba2ce 100644
--- a/src/modules/rlm_lua/configure.ac
+++ b/src/modules/rlm_lua/configure.ac
@@ -115,6 +115,6 @@ FR_MODULE_END_TESTS
 AC_SUBST(lua_cflags)
 AC_SUBST(lua_ldflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk rlm_lua.mk libfreeradius-lua.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_mruby/configure.ac b/src/modules/rlm_mruby/configure.ac
index 1288faa58c3..6cd30d00b83 100644
--- a/src/modules/rlm_mruby/configure.ac
+++ b/src/modules/rlm_mruby/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_mruby.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_mruby])
+FR_INIT_MODULE([rlm_mruby], [support for embedded mRuby scripts])
 
 FR_MODULE_START_TESTS
 
diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac
index 13bc5c5d29a..63c5fcc4251 100644
--- a/src/modules/rlm_mschap/configure.ac
+++ b/src/modules/rlm_mschap/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_mschap.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_mschap])
+FR_INIT_MODULE([rlm_mschap], [MS-CHAP and MS-CHAPv2 authentication])
 
 FR_MODULE_START_TESTS
 
diff --git a/src/modules/rlm_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac
index 7632b93d538..98164a00c21 100644
--- a/src/modules/rlm_opendirectory/configure.ac
+++ b/src/modules/rlm_opendirectory/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_opendirectory.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_opendirectory])
+FR_INIT_MODULE([rlm_opendirectory], [support for OpenDirectory])
 
 FR_MODULE_START_TESTS
 
diff --git a/src/modules/rlm_pam/configure.ac b/src/modules/rlm_pam/configure.ac
index 228c63a0e8c..ca141a0e1d2 100644
--- a/src/modules/rlm_pam/configure.ac
+++ b/src/modules/rlm_pam/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_pam.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_pam])
+FR_INIT_MODULE([rlm_pam], [PAM authentication])
 
 FR_MODULE_START_TESTS
 
@@ -34,6 +34,6 @@ FR_MODULE_END_TESTS
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
index 38e42083b7b..a6282f0b161 100644
--- a/src/modules/rlm_perl/configure.ac
+++ b/src/modules/rlm_perl/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_perl.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_perl])
+FR_INIT_MODULE([rlm_perl], [support for embedded Perl functions])
 
 FR_MODULE_START_TESTS
 
@@ -104,6 +104,6 @@ FR_MODULE_END_TESTS
 AC_SUBST(mod_cflags)
 AC_SUBST(mod_ldflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac
index 0294ab7536b..99a97884ccc 100644
--- a/src/modules/rlm_python/configure.ac
+++ b/src/modules/rlm_python/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_python.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_python])
+FR_INIT_MODULE([rlm_python], [support for embedded Python functions])
 
 FR_MODULE_START_TESTS
 
@@ -12,8 +12,9 @@ AC_PROG_CPP
 dnl extra argument: --with-rlm-python-config-bin
 PYHTON_BIN=
 AC_ARG_WITH(rlm-python-config-bin,
-	[ --with-rlm-python-config-bin=PATH   Path to python-config binary []],
-	[ case "$withval" in
+	[AS_HELP_STRING([--with-rlm-python-config-bin=PATH],
+		[path to python-config binary])],
+	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-python-config-bin)
 		;;
@@ -22,8 +23,7 @@ AC_ARG_WITH(rlm-python-config-bin,
 	*)
 		PYTHON_CONFIG_BIN="$withval"
 		;;
-	esac ]
-)
+	esac])
 
 if test "x$PYTHON_CONFIG_BIN" = x; then
 	AC_CHECK_PROGS(PYTHON_CONFIG_BIN, [ python3-config ], not-found, [${PATH}:/usr/bin:/usr/local/bin])
diff --git a/src/modules/rlm_radutmp/configure.ac b/src/modules/rlm_radutmp/configure.ac
index 0966c0f8569..1de83ae7912 100644
--- a/src/modules/rlm_radutmp/configure.ac
+++ b/src/modules/rlm_radutmp/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_radutmp.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_radutmp])
+FR_INIT_MODULE([rlm_radutmp], [ability to maintain utmp-style sessions])
 
 FR_MODULE_START_TESTS
 
@@ -13,6 +13,6 @@ FR_MODULE_END_TESTS([nostrict])
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_securid/configure.ac b/src/modules/rlm_securid/configure.ac
index d5f7dd963bf..4fcc9ee6bac 100644
--- a/src/modules/rlm_securid/configure.ac
+++ b/src/modules/rlm_securid/configure.ac
@@ -1,7 +1,8 @@
 AC_PREREQ([2.69])
-AC_INIT(rlm_securid.c)
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_securid.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_securid])
+FR_INIT_MODULE([rlm_securid], [support for RSA SecurID token checking])
 
 SMART_LIBS=
 SMART_CLFAGS=
@@ -92,4 +93,5 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_OUTPUT(all.mk)
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT
diff --git a/src/modules/rlm_sigtran/configure.ac b/src/modules/rlm_sigtran/configure.ac
index 696ce1876b4..c3b4a4375f6 100644
--- a/src/modules/rlm_sigtran/configure.ac
+++ b/src/modules/rlm_sigtran/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sigtran.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sigtran])
+FR_INIT_MODULE([rlm_sigtran], [Sigtran functionality for EAP-SIM and EAP-AKA])
 
 SMART_LIBS=
 SMART_CLFAGS=
diff --git a/src/modules/rlm_sql/configure.ac b/src/modules/rlm_sql/configure.ac
index 259a2e40ded..ba73b98b230 100644
--- a/src/modules/rlm_sql/configure.ac
+++ b/src/modules/rlm_sql/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql])
+FR_INIT_MODULE([rlm_sql], [SQL database functionality])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 347c7482efa..81582493842 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_cassandra.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_cassandra])
+FR_INIT_MODULE([rlm_sql_cassandra], [Cassandra database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 654f0faa8db..fb95eae462f 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_db2.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_db2])
+FR_INIT_MODULE([rlm_sql_db2], [IBM DB2 database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 c1aaa8121d3..fe85a5925ac 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_firebird.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_firebird])
+FR_INIT_MODULE([rlm_sql_firebird], [Firebird database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 902f1f5baef..71962b0c406 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_freetds.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_freetds])
+FR_INIT_MODULE([rlm_sql_freetds], [MS-SQL and Sybase database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
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 a2f80c73fe5..0771e6983f7 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_mysql.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_mysql])
+FR_INIT_MODULE([rlm_sql_mysql], [MySQL and MariaDB database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
@@ -208,6 +208,6 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
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 92de1e2f07b..90bef99f2f0 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_oracle.c])
 AC_REVISION($Revision: 1.10 $)
-FR_INIT_MODULE([rlm_sql_oracle])
+FR_INIT_MODULE([rlm_sql_oracle], [Oracle database support])
 
 oracle_supported_versions="19 18 12 11"
 
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 c67c21599cc..2227ac78053 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_postgresql.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_postgresql])
+FR_INIT_MODULE([rlm_sql_postgresql], [PostgreSQL database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
@@ -13,7 +14,8 @@ AC_PROG_CC
 dnl extra argument: --with-rlm-sql-postgresql-lib-dir
 rlm_sql_postgresql_lib_dir=
 AC_ARG_WITH(rlm-sql-postgresql-lib-dir,
-	[ --with-rlm-sql-postgresql-lib-dir=DIR	 Directory for PostgreSQL library files []],
+	[AS_HELP_STRING([--with-rlm-sql-postgresql-lib-dir=DIR],
+		[Directory for PostgreSQL library files])],
 	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-sql-postgresql-lib-dir)
@@ -28,7 +30,8 @@ AC_ARG_WITH(rlm-sql-postgresql-lib-dir,
 dnl extra argument: --with-rlm-sql-postgresql-include-dir
 rlm_sql_postgresql_include_dir=
 AC_ARG_WITH(rlm-sql-postgresql-include-dir,
-	[ --with-rlm-sql-postgresql-include-dir=DIR Directory for PostgreSQL include files []],
+	[AS_HELP_STRING([--with-rlm-sql-postgresql-include-dir=DIR],
+		[Directory for PostgreSQL include files])],
 	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-sql-postgresql-include-dir)
@@ -107,6 +110,6 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
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 85426ef5fd7..8d757d225e2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_sqlite.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_sqlite])
+FR_INIT_MODULE([rlm_sql_sqlite], [SQLite database support])
 
 SMART_LIBS=
 SMART_CLFAGS=
@@ -115,6 +115,6 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
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 145361bdeb0..a588bed9262 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_sql_unixodbc.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_sql_unixodbc])
+FR_INIT_MODULE([rlm_sql_unixodbc], [ODBC database connectivity])
 
 SMART_LIBS=
 SMART_CLFAGS=
diff --git a/src/modules/rlm_unbound/configure.ac b/src/modules/rlm_unbound/configure.ac
index 6c7a0e549a4..b414af4cc3f 100644
--- a/src/modules/rlm_unbound/configure.ac
+++ b/src/modules/rlm_unbound/configure.ac
@@ -2,15 +2,16 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_unbound.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_unbound])
+FR_INIT_MODULE([rlm_unbound], [DNS lookups with unbound])
 
 FR_MODULE_START_TESTS
 
 dnl extra argument: --with-rlm-unbound-lib-dir
 rlm_unbound_lib_dir=
 AC_ARG_WITH(rlm-unbound-lib-dir,
-	[ --with-rlm-unbound-lib-dir=DIR       directory for libunbound library files []],
-	[ case "$withval" in
+	[AS_HELP_STRING([--with-rlm-unbound-lib-dir=DIR],
+		[directory for libunbound library files])],
+	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-unbound-lib-dir)
 		;;
@@ -19,13 +20,14 @@ AC_ARG_WITH(rlm-unbound-lib-dir,
 	*)
 		rlm_unbound_lib_dir="$withval"
 		;;
-	esac ])
+	esac])
 
 dnl extra argument: --with-rlm-unbound-include-dir
 rlm_unbound_include_dir=
 AC_ARG_WITH(rlm-unbound-include-dir,
-	[ --with-rlm-unbound-include-dir=DIR   directory for libunbound include files []],
-	[ case "$withval" in
+	[AS_HELP_STRING([--with-rlm-unbound-include-dir=DIR],
+		[directory for libunbound include files])],
+	[case "$withval" in
 	no)
 		AC_MSG_ERROR(Need rlm-unbound-include-dir)
 		;;
@@ -34,7 +36,7 @@ AC_ARG_WITH(rlm-unbound-include-dir,
 	*)
 		rlm_unbound_include_dir="$withval"
 		;;
-	esac ])
+	esac])
 
 smart_try_dir=$rlm_unbound_lib_dir
 FR_SMART_CHECK_LIB(unbound, ub_ctx_create_ub_event)
@@ -62,6 +64,6 @@ mod_cflags="${SMART_CFLAGS}"
 AC_SUBST(mod_cflags)
 AC_SUBST(mod_ldflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_unix/configure.ac b/src/modules/rlm_unix/configure.ac
index cdcb9ebdb68..db11a247189 100644
--- a/src/modules/rlm_unix/configure.ac
+++ b/src/modules/rlm_unix/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_unix.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_unix])
+FR_INIT_MODULE([rlm_unix], [support for checking UNIX authentication methods])
 
 FR_MODULE_START_TESTS
 
@@ -50,6 +50,6 @@ FR_MODULE_END_TESTS
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
diff --git a/src/modules/rlm_winbind/configure.ac b/src/modules/rlm_winbind/configure.ac
index 232749471dc..93d8f996ccf 100644
--- a/src/modules/rlm_winbind/configure.ac
+++ b/src/modules/rlm_winbind/configure.ac
@@ -1,7 +1,8 @@
+AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_winbind.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_winbind])
+FR_INIT_MODULE([rlm_winbind], [support for password authentication with winbind])
 
 FR_MODULE_START_TESTS
 
@@ -106,7 +107,7 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT
 
diff --git a/src/modules/rlm_yubikey/configure.ac b/src/modules/rlm_yubikey/configure.ac
index 076faaded41..f2ff65f5812 100644
--- a/src/modules/rlm_yubikey/configure.ac
+++ b/src/modules/rlm_yubikey/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_yubikey.c])
 AC_REVISION($Revision$)
-FR_INIT_MODULE([rlm_yubikey])
+FR_INIT_MODULE([rlm_yubikey], [support for Yubikey token authentication])
 
 FR_MODULE_START_TESTS
 
@@ -186,6 +186,6 @@ mod_cflags="$SMART_CPPFLAGS"
 AC_SUBST(mod_cflags)
 AC_SUBST(mod_ldflags)
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([all.mk])
 AC_OUTPUT