add FR_INIT_MODULE autoconf macro

helps with consistency and saves duplication

diff --git a/m4/fr_init_module.m4 b/m4/fr_init_module.m4
new file mode 100644 (file)
index 0000000..36c43c2
--- /dev/null
+++ b/m4/fr_init_module.m4
@@ -0,0 +1,13 @@
+dnl Macro to set the module name and other useful common functions
+dnl
+dnl Usages:
+dnl   FR_INIT_MODULE([rlm_example])
+dnl   FR_INIT_MODULE([rlm_example], [the example module])
+dnl
+AC_DEFUN([FR_INIT_MODULE],
+[
+  AC_DEFUN([modname],$1)
+
+  AC_ARG_WITH([$1],
+    [AS_HELP_STRING([--without-$1],[build without ]ifelse([$2],[],[$1],[$2]))])
+])

diff --git a/src/lib/curl/configure.ac b/src/lib/curl/configure.ac
index ac01da3ff2b0eb997e46a16f8b1fee2d0ce8d623..fdbe204d54b737727f517a328bb5bb029107df64 100644 (file)
--- a/src/lib/curl/configure.ac
+++ b/src/lib/curl/configure.ac
@@ -2,15 +2,11 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([base.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[libfreeradius-curl])
-AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
+FR_INIT_MODULE([libfreeradius-curl], [libcurl support])
+AC_DEFUN([modname_useropt],[m4_bpatsubst([]modname,[[-+.]],[_])])
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without libcurl support])]
-)
-
 if test x$with_[]modname_useropt != xno; then
 
        AC_PROG_CC

diff --git a/src/lib/json/configure.ac b/src/lib/json/configure.ac
index 6a85f351a79b4fbded48077c3eec0a9ec44a51a5..bd50a787bd1af911951c6e027d3dee88fe156137 100644 (file)
--- a/src/lib/json/configure.ac
+++ b/src/lib/json/configure.ac
@@ -2,14 +2,10 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([json.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[libfreeradius-json])
-AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
+FR_INIT_MODULE([libfreeradius-json], [JSON support from json-c])
+AC_DEFUN([modname_useropt],[m4_bpatsubst([]modname,[[-+.]],[_])])
 AC_CONFIG_HEADERS([config.h])
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without JSON support from json-c])]
-)
-
 if test x$with_[]modname_useropt != xno; then
 
        AC_PROG_CC

diff --git a/src/lib/kafka/configure.ac b/src/lib/kafka/configure.ac
index 0924d4dbd22bae275b35735ca2dc0194ea1d6fe0..f51f68d1befc68c30192e6525ba7c44b67034dff 100644 (file)
--- a/src/lib/kafka/configure.ac
+++ b/src/lib/kafka/configure.ac
@@ -2,15 +2,12 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([base.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[libfreeradius-kafka])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without rdkafka support])]
-)
+FR_INIT_MODULE([libfreeradius-kafka], [rdkafka support])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname_useropt != xno; then
     dnl ############################################################
     dnl # Check for command line options

diff --git a/src/lib/ldap/configure.ac b/src/lib/ldap/configure.ac
index c2416ea3e3307a455885653754d5d83d0a719131..f09e88689aaa558582dbcc7e6fc278dfb462a92b 100644 (file)
--- a/src/lib/ldap/configure.ac
+++ b/src/lib/ldap/configure.ac
@@ -2,17 +2,14 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([base.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[libfreeradius-ldap])
+FR_INIT_MODULE([libfreeradius-ldap], [LDAP support])
 AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without LDAP support])]
-)
-
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
 SASL=
+
 if test x$with_[]modname_useropt != xno; then
 
        dnl ############################################################

diff --git a/src/lib/redis/configure.ac b/src/lib/redis/configure.ac
index ba925018f3496aeb4e0b54f97f15c8f2d8e02a96..22b47d98895fc20cd29d54e6b04a3a3f8ad921ef 100644 (file)
--- a/src/lib/redis/configure.ac
+++ b/src/lib/redis/configure.ac
@@ -2,16 +2,13 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([redis.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[libfreeradius-redis])
+FR_INIT_MODULE([libfreeradius-redis], [redis support])
 AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without redis support])]
-)
-
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname_useropt != xno; then
     dnl ############################################################
     dnl # Check for command line options

diff --git a/src/modules/rlm_cache/configure.ac b/src/modules/rlm_cache/configure.ac
index 979d8d6b961482d159e434dec24e8aeb613e5857..d6b951f6cccafbfedb9a31095c5845497a2d8d78 100644 (file)
--- a/src/modules/rlm_cache/configure.ac
+++ b/src/modules/rlm_cache/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_cache.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_cache])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_cache])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

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 af107025f117edbd995cc403d3fdecae448a95db..9845f8396dfe12fb23f409e9058b351f295832a1 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_cache_memcached.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_cache_memcached])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_cache_memcached])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index f3dc1df4f43a9715b80b4fd96bfe8a823fd2b819..3145d1f5106d57355dc94535378ebe2da87a92cc 100644 (file)
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -1,13 +1,9 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_couchbase.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_couchbase])
+FR_INIT_MODULE([rlm_couchbase])
 AC_CONFIG_HEADER(config.h)
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
-
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_eap/configure.ac b/src/modules/rlm_eap/configure.ac
index 19134729e70c19f9645863dd86dc20bbe3a5e201..0b96e1b60378db709846d8cc35bfa95a7c9cb51c 100644 (file)
--- a/src/modules/rlm_eap/configure.ac
+++ b/src/modules/rlm_eap/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_eap.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_eap])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_eap])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_idn/configure.ac b/src/modules/rlm_idn/configure.ac
index 070a1e504c555a34b6bfbc8c9602f6b0d0dcaa0b..832cb0b7524234b5e0cd8bd8f6231d6a99666e25 100644 (file)
--- a/src/modules/rlm_idn/configure.ac
+++ b/src/modules/rlm_idn/configure.ac
@@ -1,10 +1,6 @@
 AC_INIT(rlm_idn.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_idn])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_idn])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index c7fac3584f86086a017e5fd866c2544f0f6b5c51..173592719ff951de6a191c4dacf40613707419b3 100644 (file)
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_krb5.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_krb5])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_krb5])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac
index 591ff57b9b3833db48dea8f1967d63108fabc03f..1836f9a4c30d7bc71562917d227e474afb915111 100644 (file)
--- a/src/modules/rlm_lua/configure.ac
+++ b/src/modules/rlm_lua/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_lua.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_lua])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_lua], [lua support])
 
 if test x$with_[]modname != xno; then
        AC_PROG_CC

diff --git a/src/modules/rlm_mruby/configure.ac b/src/modules/rlm_mruby/configure.ac
index d915d8d1ba14bc8ad97bdd36c25b6270f9ec83cc..a96a4921709229cd4e35b986cee8d9bf611bf5aa 100644 (file)
--- a/src/modules/rlm_mruby/configure.ac
+++ b/src/modules/rlm_mruby/configure.ac
@@ -1,10 +1,6 @@
 AC_INIT(rlm_mruby.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_mruby])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_mruby])
 
 if test x$with_[]modname != xno; then
        AC_PROG_CC

diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac
index ed999eeb07dacb9635d2a6428f04b04ac879419a..a15953e09f95b8f49ae6488917952418489bcd4d 100644 (file)
--- a/src/modules/rlm_mschap/configure.ac
+++ b/src/modules/rlm_mschap/configure.ac
@@ -1,10 +1,6 @@
 AC_INIT(rlm_mschap.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_mschap])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_mschap])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac
index b68e6b1751518cda09a6bb0497689e96e2b8a5da..5ddb2f86fe31c472377c5346cf474b99603c72ed 100644 (file)
--- a/src/modules/rlm_opendirectory/configure.ac
+++ b/src/modules/rlm_opendirectory/configure.ac
@@ -1,10 +1,6 @@
 AC_INIT(rlm_opendirectory.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_opendirectory])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_opendirectory])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_pam/configure.ac b/src/modules/rlm_pam/configure.ac
index ea48054b0d8a0332f7381777e9638f51cf99f0a3..119624779819c3904bacde7280e07a299bf255bb 100644 (file)
--- a/src/modules/rlm_pam/configure.ac
+++ b/src/modules/rlm_pam/configure.ac
@@ -1,13 +1,9 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_pam.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_pam])
+FR_INIT_MODULE([rlm_pam])
 AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
-
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
index c5dc92bedf548191ca8c64d2fa8058d53c29f6c2..b2b7a7a8fd5a44dc89e987eb60d715080694ead6 100644 (file)
--- a/src/modules/rlm_perl/configure.ac
+++ b/src/modules/rlm_perl/configure.ac
@@ -1,13 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_perl.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_perl])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
-
-m4_include([m4/ax_with_prog.m4])
+FR_INIT_MODULE([rlm_perl])
 
 if test x$with_[]modname != xno; then
        AC_PROG_CC

diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac
index f3bac5f08edca5fe6d423e0d61e8e1dfec9e3d27..182ce86a0cdd2d91828f3d0f1ace9f11666af488 100644 (file)
--- a/src/modules/rlm_python/configure.ac
+++ b/src/modules/rlm_python/configure.ac
@@ -2,11 +2,7 @@ AC_PREREQ([2.71])
 AC_INIT
 AC_CONFIG_SRCDIR([rlm_python.c])
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_python])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_python])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_radutmp/configure.ac b/src/modules/rlm_radutmp/configure.ac
index 88adc328e2b4265bd2f585cb03623e484a155884..00b73942d089f39b71e05350ea8e437cc605f084 100644 (file)
--- a/src/modules/rlm_radutmp/configure.ac
+++ b/src/modules/rlm_radutmp/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_radutmp.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_radutmp])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_radutmp])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_securid/configure.ac b/src/modules/rlm_securid/configure.ac
index 01c0d48c4e2864e755c072a61369974b00a8d627..979951d0d27b0b216ef367302949344cfc9bd53c 100644 (file)
--- a/src/modules/rlm_securid/configure.ac
+++ b/src/modules/rlm_securid/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_securid.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_securid])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_securid])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
     dnl ############################################################

diff --git a/src/modules/rlm_sigtran/configure.ac b/src/modules/rlm_sigtran/configure.ac
index 6bbe1722aef580d97f84adc4bf23755f0a70426d..c61814ae0d2b177b29e87840bf153cfbfd6e3e38 100644 (file)
--- a/src/modules/rlm_sigtran/configure.ac
+++ b/src/modules/rlm_sigtran/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.61])
 AC_INIT(rlm_sigtran.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sigtran])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sigtran])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
     dnl ############################################################
     dnl # Check for command line options

diff --git a/src/modules/rlm_sql/configure.ac b/src/modules/rlm_sql/configure.ac
index f50943367d7b9f0ecd569575ae74ffaad7aa4a26..b9c64a2c06d830b145a57e5df9f5a137b7226cfe 100644 (file)
--- a/src/modules/rlm_sql/configure.ac
+++ b/src/modules/rlm_sql/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_sql.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

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 0377675ed0e69b3f0cabb8ae28faac332250800e..df537c4a6e10428135c57352b779765470b5ddb0 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_cassandra.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_cassandra])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_cassandra])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
     dnl ############################################################

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 6931e4d2b5501a8c025614faf2517aa7a34dc2e9..d8e85a941a9b527724c99f246fcc7c7c6b79c946 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_db2.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_db2])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_db2])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        dnl extra argument: --with-ibmdb2-include-dir

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 5d6d3c42e6ac568a275831f45b9c7cbe48154d0b..8a0aee5f33ebc25af84cd027c25e50cdd1e38d9c 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_firebird.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_firebird])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_firebird])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
        dnl extra argument: --with-firebird-include-dir
        firebird_include_dir=

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 005565983ecaf69910f5c9cad11f8202eb8fb5a1..7586984d1bb1acd34339f49189c694fdc00c2273 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_freetds.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_freetds])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_freetds])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
     dnl ############################################################

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 2ff86feefb5133c65c03653b24141f5a8a6cd875..3963ef05dfcfc2ccd9ce06cbddc83daa8f46f909 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
@@ -1,16 +1,13 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_mysql.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_mysql])
+FR_INIT_MODULE([rlm_sql_mysql])
 AC_CONFIG_HEADER(config.h)
 
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
-
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
        dnl ############################################################
        dnl # Check for command line options

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 dc864ddbfb1cb11a8d613d743a15af84a89037c3..bbbeab23973750934281cf03dc682a57ea1164d6 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -1,15 +1,12 @@
 AC_INIT(rlm_sql_oracle.c)
 AC_REVISION($Revision: 1.10 $)
-AC_DEFUN(modname,[rlm_sql_oracle])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_oracle])
 
 oracle_supported_versions="19 18 12 11"
 fail=
 mod_ldflags=
 mod_cflags=
+
 if test x$with_[]modname != xno; then
 
     dnl ############################################################

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 8fab1cfb9d4e50bea6f1854d44e94b8a1590d421..1b840e0484b2da44744e7e4e91351e0dd722382d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -1,14 +1,11 @@
 AC_INIT(rlm_sql_postgresql.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_postgresql])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_postgresql])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

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 0c0df798454c29f8dee229a37ecaeb968a907466..d761f728c743fd2973269098d9884b5107197fee 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_sqlite.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_sqlite])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_sqlite])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
     dnl ############################################################

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 bf398479849e657874b8079b371612c8a68aad0d..318cf7d9e4caf3dbcb0bf14106d89a599dff19d2 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
@@ -1,15 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT(rlm_sql_unixodbc.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_sql_unixodbc])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_sql_unixodbc])
 
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
+
 if test x$with_[]modname != xno; then
 
        dnl extra argument: --with-unixodbc-include-dir

diff --git a/src/modules/rlm_unbound/configure.ac b/src/modules/rlm_unbound/configure.ac
index edca9c4c6f2437b96a5d4ba00127399c06a0d0d3..4c0cb69cc4ff2c99b75b8183b857d137a7104e9c 100644 (file)
--- a/src/modules/rlm_unbound/configure.ac
+++ b/src/modules/rlm_unbound/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_unbound.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_unbound])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_unbound])
 
 if test x$with_[]modname != xno; then
        dnl extra argument: --with-rlm-unbound-lib-dir

diff --git a/src/modules/rlm_unix/configure.ac b/src/modules/rlm_unix/configure.ac
index 640b2e842de649de3d4a11e5ddffdad8ed0feeab..73d35fdb2dcf9c6a6dea870022891c59438f0c0b 100644 (file)
--- a/src/modules/rlm_unix/configure.ac
+++ b/src/modules/rlm_unix/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_unix.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_unix])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_unix])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_winbind/configure.ac b/src/modules/rlm_winbind/configure.ac
index 9ed6de29dacc877fab6d15dafb4a9f5f8d7b68c1..056747b430b30d4b927e8104082dd11ba933e24e 100644 (file)
--- a/src/modules/rlm_winbind/configure.ac
+++ b/src/modules/rlm_winbind/configure.ac
@@ -1,10 +1,6 @@
 AC_INIT(rlm_winbind.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_winbind])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_winbind])
 
 if test x$with_[]modname != xno; then
 

diff --git a/src/modules/rlm_yubikey/configure.ac b/src/modules/rlm_yubikey/configure.ac
index f086d002819175942eb1e2c98120215aa914877c..26eddb05859d11f2df1a9202e2509ddb4f19d308 100644 (file)
--- a/src/modules/rlm_yubikey/configure.ac
+++ b/src/modules/rlm_yubikey/configure.ac
@@ -1,11 +1,7 @@
 AC_PREREQ([2.53])
 AC_INIT(rlm_yubikey.c)
 AC_REVISION($Revision$)
-AC_DEFUN(modname,[rlm_yubikey])
-
-AC_ARG_WITH([]modname,
-[AS_HELP_STRING([--without-[]modname],[build without module])]
-)
+FR_INIT_MODULE([rlm_yubikey])
 
 if test x$with_[]modname != xno; then
     dnl ############################################################