autoconf fixes for --with/--without options (#3820)

* configure.ac fixes for --with/--without of core modules

Rewrite the module name for the --with/--without test so that it matches the
mangling performed by autoconf.

Declare AC_ARG_WITH for the module name to avoid spurious warnings about
invalid --with/--without options.

* configure.ac fixes for --with/--without of rlms

Declare AC_ARG_WITH for the module name to avoid spurious warnings about
invalid --with/--without options.

diff --git a/src/lib/curl/configure b/src/lib/curl/configure
index e3c1d68b5a070504b492660c764da91b4a8643fb..b7c3f0406a37db59e25d592b8d35d245487b1350 100755 (executable)
--- a/src/lib/curl/configure
+++ b/src/lib/curl/configure
@@ -642,6 +642,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_libfreeradius_curl
 with_libcurl
 '
       ac_precious_vars='build_alias
@@ -1259,6 +1260,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-libfreeradius-curl
+                          build without libcurl support
+
   --with-libcurl=PREFIX   look for the curl library in PREFIX/lib and headers
                           in PREFIX/include
 
@@ -1934,7 +1938,14 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-if test x$with_libfreeradius-curl != xno; then
+
+# Check whether --with-libfreeradius-curl was given.
+if test "${with_libfreeradius_curl+set}" = set; then :
+  withval=$with_libfreeradius_curl;
+fi
+
+
+if test x$with_libfreeradius_curl != xno; then
 
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4576,3 +4587,4 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
+

diff --git a/src/lib/curl/configure.ac b/src/lib/curl/configure.ac
index 21c8132dacbee9a0b8fcff727384a6782bd9fc0f..4fced24f69bbc1b74180acc91a9342172a135c67 100644 (file)
--- a/src/lib/curl/configure.ac
+++ b/src/lib/curl/configure.ac
@@ -2,10 +2,16 @@ AC_PREREQ([2.53])
 AC_INIT(base.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[libfreeradius-curl])
+AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
+
 AC_CONFIG_HEADER(config.h)
 m4_include([m4/libcurl_check_config.m4])
 
-if test x$with_[]modname != xno; then
+AC_ARG_WITH([]modname,
+[AS_HELP_STRING([--without-[]modname],[build without libcurl support])]
+)
+
+if test x$with_[]modname_useropt != xno; then
 
        AC_PROG_CC
        AC_PROG_CPP

diff --git a/src/lib/json/configure b/src/lib/json/configure
index efb4b21ff8a98af1fb4cf30569343b4e55f7dbab..303ecd581f8cf4c3a53866e16e54ea1dcc9488c8 100755 (executable)
--- a/src/lib/json/configure
+++ b/src/lib/json/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_libfreeradius_json
 with_jsonc_include_dir
 with_jsonc_lib_dir
 with_jsonc_dir
@@ -1256,6 +1257,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-libfreeradius-json
+                          build without JSON support from json-c
+
   --with-jsonc-include-dir=DIR
                           Directory where the json-c includes may be found
   --with-jsonc-lib-dir=DIR
@@ -1896,7 +1900,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
-if test x$with_libfreeradius-json != xno; then
+
+# Check whether --with-libfreeradius-json was given.
+if test "${with_libfreeradius_json+set}" = set; then :
+  withval=$with_libfreeradius_json;
+fi
+
+
+if test x$with_libfreeradius_json != xno; then
 
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

diff --git a/src/lib/json/configure.ac b/src/lib/json/configure.ac
index 7df9258e2f77e7b1c804b2b25eea376240be65ff..d222491f68334b7957812770cf33fcf3f7f830df 100644 (file)
--- a/src/lib/json/configure.ac
+++ b/src/lib/json/configure.ac
@@ -2,9 +2,14 @@ AC_PREREQ([2.53])
 AC_INIT(json.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[libfreeradius-json])
+AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
 AC_CONFIG_HEADER(config.h)
 
-if test x$with_[]modname != xno; then
+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
        AC_PROG_CPP

diff --git a/src/lib/ldap/configure b/src/lib/ldap/configure
index 1f2b06c617aa5c1343b4a564ba0459ee07c28422..94b13662c3a9ad6f4eb9b3fbdf9f511fb3f0f858 100755 (executable)
--- a/src/lib/ldap/configure
+++ b/src/lib/ldap/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_libfreeradius_ldap
 with_libfreeradius_ldap_lib_dir
 with_libfreeradius_ldap_include_dir
 '
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-libfreeradius-ldap
+                          build without LDAP support
+
   --with-libfreeradius-ldap-lib-dir=DIR           directory for LDAP library files
   --with-libfreeradius-ldap-include-dir=DIR   directory for LDAP include files
 
@@ -1897,6 +1901,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+# Check whether --with-libfreeradius-ldap was given.
+if test "${with_libfreeradius_ldap+set}" = set; then :
+  withval=$with_libfreeradius_ldap;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/lib/ldap/configure.ac b/src/lib/ldap/configure.ac
index 5d7176a798ac646e462c3523a6cb6bd355206485..79dfd44ee8112957f195069bde244e4c6d7574b9 100644 (file)
--- a/src/lib/ldap/configure.ac
+++ b/src/lib/ldap/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.53])
 AC_INIT(base.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[libfreeradius-ldap])
-AC_DEFUN(modname_useropt,[libfreeradius_ldap])
+AC_DEFUN(modname_useropt,[m4_bpatsubst([]modname,[[-+.]],[_])])
+
+AC_ARG_WITH([]modname,
+[AS_HELP_STRING([--without-[]modname],[build without LDAP support])]
+)
 
 fail=
 SMART_LIBS=

diff --git a/src/lib/redis/configure b/src/lib/redis/configure
index 57b1a9177745e08942b7d6462a0307d4087fb51c..272ab0c8b14ad8e72887a77d18a3459a3adc1b05 100755 (executable)
--- a/src/lib/redis/configure
+++ b/src/lib/redis/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_libfreeradius_redis
 with_redis_include_dir
 with_redis_lib_dir
 with_redis_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-libfreeradius-redis
+                          build without redis support
+
   --with-redis-include-dir=DIR
                           Directory where the redis includes may be found
   --with-redis-lib-dir=DIR
@@ -1787,10 +1791,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+# Check whether --with-libfreeradius-redis was given.
+if test "${with_libfreeradius_redis+set}" = set; then :
+  withval=$with_libfreeradius_redis;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=
-if test x$with_libfreeradius-redis != xno; then
+if test x$with_libfreeradius_redis != xno; then
 
         redis_include_dir=
 

diff --git a/src/lib/redis/configure.ac b/src/lib/redis/configure.ac
index 67c0f5ac10f8d65c1dcf8143be6e5f42ec9436c9..23626af951130af13d75c810eadd1acc811901b1 100644 (file)
--- a/src/lib/redis/configure.ac
+++ b/src/lib/redis/configure.ac
@@ -2,11 +2,16 @@ AC_PREREQ([2.61])
 AC_INIT(redis.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[libfreeradius-redis])
+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 != xno; then
+if test x$with_[]modname_useropt != xno; then
     dnl ############################################################
     dnl # Check for command line options
     dnl ############################################################

diff --git a/src/modules/rlm_cache/configure b/src/modules/rlm_cache/configure
index ec5331c0019475f055c8d3623a73eced55f8ce40..8b50d01133d73c2c4aa0ab1bd2d4e3995186ac4f 100755 (executable)
--- a/src/modules/rlm_cache/configure
+++ b/src/modules/rlm_cache/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_cache
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1248,6 +1249,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_cache     build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1729,6 +1736,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_cache was given.
+if test "${with_rlm_cache+set}" = set; then :
+  withval=$with_rlm_cache;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_cache/configure.ac b/src/modules/rlm_cache/configure.ac
index b88a8ab328a34978ae9add331035d269fb83729c..979d8d6b961482d159e434dec24e8aeb613e5857 100644 (file)
--- a/src/modules/rlm_cache/configure.ac
+++ b/src/modules/rlm_cache/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure
index 531719ec2f99cdd68d66f6371eda53f4c92d30ea..2c48afb8c78e181bbde11a82e63bb14a2d97bea5 100755 (executable)
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_cache_memcached
 with_libmemcached_include_dir
 with_libmemcached_lib_dir
 with_libmemcached_dir
@@ -1256,6 +1257,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_cache_memcached
+                          build without module
+
   --with-libmemcached-include-dir=DIR
                           Directory where the libmemcached includes may be
                           found
@@ -1897,6 +1901,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_cache_memcached was given.
+if test "${with_rlm_cache_memcached+set}" = set; then :
+  withval=$with_rlm_cache_memcached;
+fi
+
+
 if test x$with_rlm_cache_memcached != xno; then
 
        ac_ext=c

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 5fe56bd7f0ce320ed928074a226b31a3f9a0de32..af107025f117edbd995cc403d3fdecae448a95db 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_couchbase/configure b/src/modules/rlm_couchbase/configure
index ca0c844cf25c1d358f9259acfa4418478058f7ad..2ad88af0d6ddbcb79c3a9f19843d444c49252254 100755 (executable)
--- a/src/modules/rlm_couchbase/configure
+++ b/src/modules/rlm_couchbase/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_couchbase
 with_libcouchbase_include_dir
 with_libcouchbase_lib_dir
 with_libcouchbase_dir
@@ -1256,6 +1257,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_couchbase build without module
+
   --with-libcouchbase-include-dir=DIR
                           Directory where the libcouchbase includes may be
                           found
@@ -1832,6 +1835,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
+
+# Check whether --with-rlm_couchbase was given.
+if test "${with_rlm_couchbase+set}" = set; then :
+  withval=$with_rlm_couchbase;
+fi
+
+
 if test x$with_rlm_couchbase != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index b4bc184100bbff113e78dc8e1e9d78c659dd5be0..f3dc1df4f43a9715b80b4fd96bfe8a823fd2b819 100644 (file)
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -4,6 +4,10 @@ AC_REVISION($Revision$)
 AC_DEFUN(modname,[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 b/src/modules/rlm_eap/configure
index 943a0402b6b22378ab95fb345dba336572c1cbe6..adf979dd580790f98249bc56f0df97bc2894f9b6 100755 (executable)
--- a/src/modules/rlm_eap/configure
+++ b/src/modules/rlm_eap/configure
@@ -639,6 +639,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_eap
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1251,6 +1252,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_eap       build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1732,6 +1739,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_eap was given.
+if test "${with_rlm_eap+set}" = set; then :
+  withval=$with_rlm_eap;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_eap/configure.ac b/src/modules/rlm_eap/configure.ac
index 4fa52b8518228162e76500bea798fe1dba97b91f..19134729e70c19f9645863dd86dc20bbe3a5e201 100644 (file)
--- a/src/modules/rlm_eap/configure.ac
+++ b/src/modules/rlm_eap/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_idn/configure b/src/modules/rlm_idn/configure
index ffabba44c6774484f743b08c0c9374ffb5ceba05..5c05e967f121247a5eea8f7884e1d9036482cf5f 100755 (executable)
--- a/src/modules/rlm_idn/configure
+++ b/src/modules/rlm_idn/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_idn
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1250,6 +1251,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_idn       build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1815,6 +1822,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_idn was given.
+if test "${with_rlm_idn+set}" = set; then :
+  withval=$with_rlm_idn;
+fi
+
+
 if test x$with_rlm_idn != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_idn/configure.ac b/src/modules/rlm_idn/configure.ac
index bfc2ae2b51a2560fc37aa0f32c5a11bc522b6f4b..070a1e504c555a34b6bfbc8c9602f6b0d0dcaa0b 100644 (file)
--- a/src/modules/rlm_idn/configure.ac
+++ b/src/modules/rlm_idn/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_krb5/configure b/src/modules/rlm_krb5/configure
index 0e67132d50046f2cf02941b140a936ee54638a28..d62c833164892a95348dd2455c6078b429aef8e5 100755 (executable)
--- a/src/modules/rlm_krb5/configure
+++ b/src/modules/rlm_krb5/configure
@@ -638,6 +638,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_krb5
 with_rlm_krb5_dir
 '
       ac_precious_vars='build_alias
@@ -1255,6 +1256,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_krb5      build without module
+
   --with-rlm-krb5-dir=DIR       Directory for krb5 files
 
 Some influential environment variables:
@@ -1931,6 +1934,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_krb5 was given.
+if test "${with_rlm_krb5+set}" = set; then :
+  withval=$with_rlm_krb5;
+fi
+
+
 if test x$with_rlm_krb5 != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index 8153b32515288cbc6357c6220d90c5a69a13ca5b..2f2b257100a7c8e609a73902385070ddf38a9b1c 100644 (file)
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_lua/configure b/src/modules/rlm_lua/configure
index 9a756ee2372f1680ef46f9677d7e160004a8079f..988deddffecf46123fb3ab50f59365c30bd1d709 100755 (executable)
--- a/src/modules/rlm_lua/configure
+++ b/src/modules/rlm_lua/configure
@@ -678,6 +678,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_lua
 with_lua_include_dir
 with_lua_lib_dir
 '
@@ -1298,6 +1299,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_lua       build without module
+
   --with-lua-include-dir=DIR
                           Directory where the lua includes may be found
   --with-lua-lib-dir=DIR  Directory where the lua libraries may be found
@@ -2259,6 +2262,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+# Check whether --with-rlm_lua was given.
+if test "${with_rlm_lua+set}" = set; then :
+  withval=$with_rlm_lua;
+fi
 
 
 if test x$with_rlm_lua != xno; then

diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac
index 1884c39189f775965b1cf234b245daa5a2bfe058..a5f305dee6238b87ca5c838cfae0cdd77165e73d 100644 (file)
--- a/src/modules/rlm_lua/configure.ac
+++ b/src/modules/rlm_lua/configure.ac
@@ -4,6 +4,10 @@ AC_REVISION($Revision$)
 AC_DEFUN(modname,[rlm_lua])
 m4_include([m4/ax_lua.m4])
 
+AC_ARG_WITH([]modname,
+[AS_HELP_STRING([--without-[]modname],[build without module])]
+)
+
 if test x$with_[]modname != xno; then
        AC_PROG_CC
        AC_PROG_CPP

diff --git a/src/modules/rlm_mruby/configure b/src/modules/rlm_mruby/configure
index 63b15ea3e59904cbec60230132d023a3c358e3e4..f044e4263a7ead1eff98ef57e3b1e51f80529c54 100755 (executable)
--- a/src/modules/rlm_mruby/configure
+++ b/src/modules/rlm_mruby/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_mruby
 with_mruby_incude_dir
 with_mruby_lib_dir
 with_mruby_dir
@@ -1256,6 +1257,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_mruby     build without module
+
   --with-mruby-include-dir=DIR
                           Directory where the mruby includes may be found
   --with-mruby-lib-dir=DIR
@@ -1827,6 +1830,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_mruby was given.
+if test "${with_rlm_mruby+set}" = set; then :
+  withval=$with_rlm_mruby;
+fi
+
+
 if test x$with_rlm_mruby != xno; then
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

diff --git a/src/modules/rlm_mruby/configure.ac b/src/modules/rlm_mruby/configure.ac
index 2e4ca2a76077ad90a83b3cab0559a98a285ada7b..d915d8d1ba14bc8ad97bdd36c25b6270f9ec83cc 100644 (file)
--- a/src/modules/rlm_mruby/configure.ac
+++ b/src/modules/rlm_mruby/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
        AC_PROG_CC
        AC_PROG_CPP
@@ -25,7 +29,7 @@ if test x$with_[]modname != xno; then
                                mruby_include_dir="$withval"
                                ;;
                esac])
-       
+
        dnl extra argument: --with-mruby-lib-dir=DIR
        mruby_lib_dir=
        AC_ARG_WITH(mruby-lib-dir,
@@ -100,7 +104,7 @@ if test x$with_[]modname != xno; then
                AC_MSG_WARN([m library not found.])
                fail="$fail libm"
        fi
-       
+
        targetname=modname
 else
        targetname=

diff --git a/src/modules/rlm_mschap/configure b/src/modules/rlm_mschap/configure
index 49fcd4f27322aa86b7231a3f5c832e3f878fe2d8..44b201f37f997add4504cee12814c085abaa9a2b 100755 (executable)
--- a/src/modules/rlm_mschap/configure
+++ b/src/modules/rlm_mschap/configure
@@ -638,6 +638,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_mschap
 with_winbind_include_dir
 with_winbind_lib_dir
 with_winbind_dir
@@ -1257,6 +1258,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_mschap    build without module
+
   --with-winbind-include-dir=DIR
                           Directory where the winbind includes may be found
   --with-winbind-lib-dir=DIR
@@ -1828,6 +1831,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_mschap was given.
+if test "${with_rlm_mschap+set}" = set; then :
+  withval=$with_rlm_mschap;
+fi
+
+
 if test x$with_rlm_mschap != xno; then
 
     ac_ext=c

diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac
index f4b40d72f47b972ab1d14f11e245a14152b47fd5..eb9dcdf689503434c762ae1a69ab020a2642525c 100644 (file)
--- a/src/modules/rlm_mschap/configure.ac
+++ b/src/modules/rlm_mschap/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
     AC_PROG_CC

diff --git a/src/modules/rlm_opendirectory/configure b/src/modules/rlm_opendirectory/configure
index b7f91382dcceed8313e6687f5005f56011c28e15..ca2776d9b41944b28f826d8dba43894fdf817e24 100755 (executable)
--- a/src/modules/rlm_opendirectory/configure
+++ b/src/modules/rlm_opendirectory/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_opendirectory
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1250,6 +1251,13 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_opendirectory
+                          build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1815,6 +1823,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_opendirectory was given.
+if test "${with_rlm_opendirectory+set}" = set; then :
+  withval=$with_rlm_opendirectory;
+fi
+
+
 if test x$with_rlm_opendirectory != xno; then
 
        ac_ext=c
@@ -3020,7 +3035,7 @@ if test x"$fail" != x""; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_opendirectory." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_opendirectory." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_opendirectory requires: $fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_opendirectory requires: $fail." >&2;};
+$as_echo "$as_me: WARNING: FAILURE: rlm_opendirectory requires: $fail." >&2;}
                targetname=""
        fi
 fi

diff --git a/src/modules/rlm_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac
index a094ffb5f75f31af927894729381a19cc05e020c..0273c86a6e3520f4edd4294ab592a8268ac558e6 100644 (file)
--- a/src/modules/rlm_opendirectory/configure.ac
+++ b/src/modules/rlm_opendirectory/configure.ac
@@ -2,13 +2,17 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC
        AC_PROG_CPP
 
-       mod_ldflags="${mod_ldflags} -framework DirectoryService" 
-       
+       mod_ldflags="${mod_ldflags} -framework DirectoryService"
+
        FR_SMART_CHECK_INCLUDE(membership.h)
        if test "$ac_cv_header_membership_h" != "yes"; then
          fail="$fail membership.h"
@@ -31,7 +35,7 @@ if test x"$fail" != x""; then
                AC_MSG_ERROR([set --without-]modname[ to disable it explicitly.])
        else
                AC_MSG_WARN([silently not building ]modname[.])
-               AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]); 
+               AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.])
                targetname=""
        fi
 fi

diff --git a/src/modules/rlm_pam/configure b/src/modules/rlm_pam/configure
index 510807b0227a03424ab83589fbe0d055423e31a5..997f9690c23cd9325bb24639c21a12fa00147a4d 100755 (executable)
--- a/src/modules/rlm_pam/configure
+++ b/src/modules/rlm_pam/configure
@@ -676,6 +676,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_pam
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1289,6 +1290,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_pam       build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2014,6 +2021,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+# Check whether --with-rlm_pam was given.
+if test "${with_rlm_pam+set}" = set; then :
+  withval=$with_rlm_pam;
+fi
+
+
 if test x$with_rlm_pam != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_pam/configure.ac b/src/modules/rlm_pam/configure.ac
index 4bac89eb3ccf9e0f7d04dd8763c85e3fe654e216..ea48054b0d8a0332f7381777e9638f51cf99f0a3 100644 (file)
--- a/src/modules/rlm_pam/configure.ac
+++ b/src/modules/rlm_pam/configure.ac
@@ -2,6 +2,11 @@ AC_PREREQ([2.53])
 AC_INIT(rlm_pam.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[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
 

diff --git a/src/modules/rlm_perl/configure b/src/modules/rlm_perl/configure
index 981bb6df4325fa42da36ca2924d85593acf1df8e..2a94d89cb50aa9973c2abca260b5ea3cf918b684 100755 (executable)
--- a/src/modules/rlm_perl/configure
+++ b/src/modules/rlm_perl/configure
@@ -638,6 +638,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_perl
 with_perl
 '
       ac_precious_vars='build_alias
@@ -1256,6 +1257,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_perl      build without module
+
   --with-perl=[PATH]    absolute path to perl executable
 
 Some influential environment variables:
@@ -1824,6 +1827,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_perl was given.
+if test "${with_rlm_perl+set}" = set; then :
+  withval=$with_rlm_perl;
+fi
+
+
 # ===========================================================================
 #       http://www.gnu.org/software/autoconf-archive/ax_with_prog.html
 # ===========================================================================

diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
index 1783c249fa7fde05aa4ba63253f6dc262c7e36f6..c5dc92bedf548191ca8c64d2fa8058d53c29f6c2 100644 (file)
--- a/src/modules/rlm_perl/configure.ac
+++ b/src/modules/rlm_perl/configure.ac
@@ -3,6 +3,10 @@ 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])
 
 if test x$with_[]modname != xno; then

diff --git a/src/modules/rlm_python/configure b/src/modules/rlm_python/configure
index 93a531e30257b7d65d5b7b12ce5154d50b164125..869e7d794b8ce455e9da569e1faae377c783b57d 100755 (executable)
--- a/src/modules/rlm_python/configure
+++ b/src/modules/rlm_python/configure
@@ -638,6 +638,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_python
 with_rlm_python_config_bin
 '
       ac_precious_vars='build_alias
@@ -1255,6 +1256,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_python    build without module
+
   --with-rlm-python-config-bin=PATH   Path to python-config binary
 
 Some influential environment variables:
@@ -1776,6 +1779,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_python was given.
+if test "${with_rlm_python+set}" = set; then :
+  withval=$with_rlm_python;
+fi
+
+
 if test x$with_rlm_python != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac
index a1c8a3cf1aa0fa81ed042484c1813cf81354d0a5..0a4f1f38ac8ecf2c78bac27915eeaff9ce92c551 100644 (file)
--- a/src/modules/rlm_python/configure.ac
+++ b/src/modules/rlm_python/configure.ac
@@ -3,6 +3,10 @@ AC_INIT(rlm_python.c)
 AC_REVISION($Revision$)
 AC_DEFUN(modname,[rlm_python])
 
+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_radutmp/configure b/src/modules/rlm_radutmp/configure
index 554510967ded7dde3cc5608890f033d4b8b4e46c..07f3205ee407f6fadc3feeb3945cb2e5bd0abf48 100755 (executable)
--- a/src/modules/rlm_radutmp/configure
+++ b/src/modules/rlm_radutmp/configure
@@ -676,6 +676,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_radutmp
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1289,6 +1290,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_radutmp   build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1968,6 +1975,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_radutmp was given.
+if test "${with_rlm_radutmp+set}" = set; then :
+  withval=$with_rlm_radutmp;
+fi
+
+
 if test x$with_rlm_radutmp != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_radutmp/configure.ac b/src/modules/rlm_radutmp/configure.ac
index 214b0abcc1462883f5234da7eb1498231a9338a2..88adc328e2b4265bd2f585cb03623e484a155884 100644 (file)
--- a/src/modules/rlm_radutmp/configure.ac
+++ b/src/modules/rlm_radutmp/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_CHECK_HEADERS(sys/mman.h)

diff --git a/src/modules/rlm_securid/configure b/src/modules/rlm_securid/configure
index ef3b85584f57d55201bd39b51635c8ddfbcbec86..301db56c96a524891f3c2eab629d1e33250ae133 100755 (executable)
--- a/src/modules/rlm_securid/configure
+++ b/src/modules/rlm_securid/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_securid
 with_rlm_securid_include_dir
 with_rlm_securid_lib_dir
 with_rlm_securid_dir
@@ -1254,6 +1255,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_securid   build without module
+
   --with-rlm-securid-include-dir=DIR
                           Directory where the securid includes may be found
   --with-rlm-securid-lib-dir=DIR
@@ -1788,6 +1791,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_securid was given.
+if test "${with_rlm_securid+set}" = set; then :
+  withval=$with_rlm_securid;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_securid/configure.ac b/src/modules/rlm_securid/configure.ac
index fb8031e194b5216a575c108fd0edac88ba858728..01c0d48c4e2864e755c072a61369974b00a8d627 100644 (file)
--- a/src/modules/rlm_securid/configure.ac
+++ b/src/modules/rlm_securid/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sigtran/configure b/src/modules/rlm_sigtran/configure
index f1bda2514e03a93951ee84a1d6ba816c915b40a4..6b110f846b0ce8c771fd63ff1797f6945452bae2 100755 (executable)
--- a/src/modules/rlm_sigtran/configure
+++ b/src/modules/rlm_sigtran/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sigtran
 with_sigtran_include_dir
 with_sigtran_dir
 '
@@ -1253,6 +1254,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sigtran   build without module
+
   --with-sigtran-include-dir=DIR
                           Directory where osmocore and osmosccp may be found
   --with-sigtran-dir=DIR  Base directory where osmocore and osmosccp are
@@ -1785,6 +1788,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sigtran was given.
+if test "${with_rlm_sigtran+set}" = set; then :
+  withval=$with_rlm_sigtran;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sigtran/configure.ac b/src/modules/rlm_sigtran/configure.ac
index 6051d5d79499701c4c1e27fe45eb210470e40cbb..6bbe1722aef580d97f84adc4bf23755f0a70426d 100644 (file)
--- a/src/modules/rlm_sigtran/configure.ac
+++ b/src/modules/rlm_sigtran/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/configure b/src/modules/rlm_sql/configure
index 3bdd9452651d8457571b291bc21e596fecbef76e..f5117442b93e09bc56a152e8b33d321d1c9f16f5 100755 (executable)
--- a/src/modules/rlm_sql/configure
+++ b/src/modules/rlm_sql/configure
@@ -638,6 +638,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1250,6 +1251,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql       build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1731,6 +1738,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql was given.
+if test "${with_rlm_sql+set}" = set; then :
+  withval=$with_rlm_sql;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/configure.ac b/src/modules/rlm_sql/configure.ac
index aa20f8f34bf9f38929ab5e33abc27640a644571d..f50943367d7b9f0ecd569575ae74ffaad7aa4a26 100644 (file)
--- a/src/modules/rlm_sql/configure.ac
+++ b/src/modules/rlm_sql/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure
index 6656592657ca8d027eeab27b93a4a46457ead534..e33aedbdb0a4469a38724d3a8341833959bcff36 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_cassandra
 with_cassandra_include_dir
 with_cassandra_lib_dir
 with_cassandra_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_cassandra
+                          build without module
+
   --with-cassandra-include-dir=DIR
                           Directory where the cassandra includes may be found
   --with-cassandra-lib-dir=DIR
@@ -1788,6 +1792,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_cassandra was given.
+if test "${with_rlm_sql_cassandra+set}" = set; then :
+  withval=$with_rlm_sql_cassandra;
+fi
+
+
 fail=
 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 c52f6e6c0c2e7807c2e02b1a858f2c99fe39ff82..0377675ed0e69b3f0cabb8ae28faac332250800e 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure
index c6f815fdeaabbdddd9437cc0003686b81cef9833..e839ab5a85d7e858158786a14c0967e4a896f734 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_db2
 with_ibmdb2_include_dir
 with_ibmdb2_lib_dir
 with_ibmdb2_dir
@@ -1254,6 +1255,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_db2   build without module
+
   --with-ibmdb2-include-dir=DIR
                           Directory where the IBM-DB2 includes may be found
   --with-ibmdb2-lib-dir=DIR
@@ -1787,6 +1790,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_db2 was given.
+if test "${with_rlm_sql_db2+set}" = set; then :
+  withval=$with_rlm_sql_db2;
+fi
+
+
 fail=
 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 75c851a1358cccaf947f50312999f02bca32758e..6931e4d2b5501a8c025614faf2517aa7a34dc2e9 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure
index 125f2740383c18b5e28c51afe402fcb08f223ac2..42094ab03e1381a52778af4103de89a9e35b7f9a 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_firebird
 with_firebird_include_dir
 with_firebird_lib_dir
 with_firebird_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_firebird
+                          build without module
+
   --with-firebird-include-dir=DIR
                           Directory where the firebird includes may be found
   --with-firebird-lib-dir=DIR
@@ -1787,6 +1791,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_firebird was given.
+if test "${with_rlm_sql_firebird+set}" = set; then :
+  withval=$with_rlm_sql_firebird;
+fi
+
+
 fail=
 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 4da57b308e9618a525d3ca1b79889dff6a8b7b0d..5d6d3c42e6ac568a275831f45b9c7cbe48154d0b 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure
index 0a5ba55c2cb4bed1da14e4fb4b9b7f40d568284c..6aa20ba2124475a922872b6507fbb23175261724 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_freetds
 with_freetds_include_dir
 with_freetds_lib_dir
 with_freetds_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_freetds
+                          build without module
+
   --with-freetds-include-dir=DIR
                           Directory where the freetds includes may be found
   --with-freetds-lib-dir=DIR
@@ -1787,6 +1791,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_freetds was given.
+if test "${with_rlm_sql_freetds+set}" = set; then :
+  withval=$with_rlm_sql_freetds;
+fi
+
+
 fail=
 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 29a63bab2f47f54780c2da82a495a14e62fed8f2..005565983ecaf69910f5c9cad11f8202eb8fb5a1 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
index 924eb3bbdc0a761f55ac664539ec117feb53ff2a..972ff88eeacd99f192d0ffeef6cf947abfcc077e 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_mysql
 with_mysql_include_dir
 with_mysql_lib_dir
 with_mysql_dir
@@ -1256,6 +1257,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_mysql build without module
+
   --with-mysql-include-dir=DIR
                           Directory where the mysql includes may be found
   --with-mysql-lib-dir=DIR
@@ -1792,6 +1795,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
+
+# Check whether --with-rlm_sql_mysql was given.
+if test "${with_rlm_sql_mysql+set}" = set; then :
+  withval=$with_rlm_sql_mysql;
+fi
+
+
 fail=
 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 1401677a860a87e25557797c92e296de0046855a..2ff86feefb5133c65c03653b24141f5a8a6cd875 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
@@ -4,6 +4,10 @@ AC_REVISION($Revision$)
 AC_DEFUN(modname,[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=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
index dadf8eb4e4544766cfbd6b84247810fcceeac11b..0d63fe767dcbd8b3e6ba4e2f3e20c8f2cefbea39 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_oracle
 with_oracle_include_dir
 with_oracle_lib_dir
 with_oracle_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_oracle
+                          build without module
+
   --with-oracle-include-dir=DIR
                           Directory where the oracle includes may be found
   --with-oracle-lib-dir=DIR
@@ -1787,6 +1791,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_oracle was given.
+if test "${with_rlm_sql_oracle+set}" = set; then :
+  withval=$with_rlm_sql_oracle;
+fi
+
+
 oracle_supported_versions="19 18 12 11"
 fail=
 mod_ldflags=

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 71166e933e284f7eaf4727c3f6616e5a55547016..dc864ddbfb1cb11a8d613d743a15af84a89037c3 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 oracle_supported_versions="19 18 12 11"
 fail=
 mod_ldflags=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure
index 4b220d0d386572d7e37ed3255c4f3b5e0cd5304e..0680092b8ef04221aed50833e9596c2a7d604f00 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_postgresql
 with_rlm_sql_postgresql_lib_dir
 with_rlm_sql_postgresql_include_dir
 '
@@ -1253,6 +1254,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_postgresql
+                          build without module
+
   --with-rlm-sql-postgresql-lib-dir=DIR       Directory for PostgreSQL library files
   --with-rlm-sql-postgresql-include-dir=DIR   Directory for PostgreSQL include files
 
@@ -1850,6 +1854,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_postgresql was given.
+if test "${with_rlm_sql_postgresql+set}" = set; then :
+  withval=$with_rlm_sql_postgresql;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

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 4f9a890ba0ddbc6ade39bf775a16ca7d4b7eb42f..6f74c23cf5b2f02866945e14b2afe779e4e4e774 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure
index 2c6f34bb42c891ffff0eaf4333cd32fc0c551bfc..a9727634ce8c0600af6d11a6f7f9180a2c126aab 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_sqlite
 with_sqlite_include_dir
 with_sqlite_lib_dir
 with_sqlite_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_sqlite
+                          build without module
+
   --with-sqlite-include-dir=DIR
                           Directory where the sqlite includes may be found
   --with-sqlite-lib-dir=DIR
@@ -1908,6 +1912,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_sqlite was given.
+if test "${with_rlm_sql_sqlite+set}" = set; then :
+  withval=$with_rlm_sql_sqlite;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

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 d441459c30b42fe60213511bda1fecad156ff77d..0c0df798454c29f8dee229a37ecaeb968a907466 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure
index f32d485ef33203da2540853c977e190ce71da7b5..0d030f667fc9991e3217c8f7691d9591cb2904c9 100755 (executable)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_sql_unixodbc
 with_unixodbc_include_dir
 with_unixodbc_lib_dir
 with_unixodbc_dir
@@ -1254,6 +1255,9 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_sql_unixodbc
+                          build without module
+
   --with-unixodbc-include-dir=DIR
                           Directory where the unixODBC includes may be found
   --with-unixodbc-lib-dir=DIR
@@ -1787,6 +1791,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_sql_unixodbc was given.
+if test "${with_rlm_sql_unixodbc+set}" = set; then :
+  withval=$with_rlm_sql_unixodbc;
+fi
+
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

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 35453879e31231dc935e58d985b5fc5f0c7d08ff..bf398479849e657874b8079b371612c8a68aad0d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 fail=
 SMART_LIBS=
 SMART_CLFAGS=

diff --git a/src/modules/rlm_unbound/configure b/src/modules/rlm_unbound/configure
index 880b60112db149deda6465b3e39b6ac55205ac94..137aa7e96f91e8af0795bfc95afa346e39b90e5c 100755 (executable)
--- a/src/modules/rlm_unbound/configure
+++ b/src/modules/rlm_unbound/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_unbound
 with_rlm_unbound_lib_dir
 with_rlm_unbound_include_dir
 '
@@ -1253,6 +1254,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_unbound   build without module
+
   --with-rlm-unbound-lib-dir=DIR       directory for libunbound library files
   --with-rlm-unbound-include-dir=DIR   directory for libunbound include files
 
@@ -1783,6 +1786,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_unbound was given.
+if test "${with_rlm_unbound+set}" = set; then :
+  withval=$with_rlm_unbound;
+fi
+
+
 if test x$with_rlm_unbound != xno; then
                rlm_unbound_lib_dir=
 

diff --git a/src/modules/rlm_unbound/configure.ac b/src/modules/rlm_unbound/configure.ac
index 1f24b058669585933aec99c41279ac77c902ca86..edca9c4c6f2437b96a5d4ba00127399c06a0d0d3 100644 (file)
--- a/src/modules/rlm_unbound/configure.ac
+++ b/src/modules/rlm_unbound/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
        dnl extra argument: --with-rlm-unbound-lib-dir
        rlm_unbound_lib_dir=

diff --git a/src/modules/rlm_unix/configure b/src/modules/rlm_unix/configure
index ace15f99fb703038a300623419f9f9efe3419ca1..e719e39e95b4fc079a4e52c79ee70bb903e436ad 100755 (executable)
--- a/src/modules/rlm_unix/configure
+++ b/src/modules/rlm_unix/configure
@@ -676,6 +676,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_unix
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1289,6 +1290,12 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_unix      build without module
+
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2081,6 +2088,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_unix was given.
+if test "${with_rlm_unix+set}" = set; then :
+  withval=$with_rlm_unix;
+fi
+
+
 if test x$with_rlm_unix != xno; then
 
        ac_ext=c

diff --git a/src/modules/rlm_unix/configure.ac b/src/modules/rlm_unix/configure.ac
index 25f47365f54ccb9f97ad2d5eaecf02c5e60129c5..640b2e842de649de3d4a11e5ddffdad8ed0feeab 100644 (file)
--- a/src/modules/rlm_unix/configure.ac
+++ b/src/modules/rlm_unix/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
        AC_PROG_CC

diff --git a/src/modules/rlm_winbind/configure b/src/modules/rlm_winbind/configure
index c900c26dff996415db8810d6349d0743d179a7f6..9f572b0ff472126716bb3c061e115c3179186453 100755 (executable)
--- a/src/modules/rlm_winbind/configure
+++ b/src/modules/rlm_winbind/configure
@@ -637,6 +637,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_winbind
 with_winbind_include_dir
 with_winbind_lib_dir
 with_winbind_dir
@@ -1256,6 +1257,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_winbind   build without module
+
   --with-winbind-include-dir=DIR
                           Directory where the winbind includes may be found
   --with-winbind-lib-dir=DIR
@@ -1827,6 +1830,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_winbind was given.
+if test "${with_rlm_winbind+set}" = set; then :
+  withval=$with_rlm_winbind;
+fi
+
+
 if test x$with_rlm_winbind != xno; then
 
     ac_ext=c

diff --git a/src/modules/rlm_winbind/configure.ac b/src/modules/rlm_winbind/configure.ac
index be84512de4192419fe1b8dac88c338e30b108fc8..9ed6de29dacc877fab6d15dafb4a9f5f8d7b68c1 100644 (file)
--- a/src/modules/rlm_winbind/configure.ac
+++ b/src/modules/rlm_winbind/configure.ac
@@ -2,6 +2,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
 
     AC_PROG_CC

diff --git a/src/modules/rlm_yubikey/configure b/src/modules/rlm_yubikey/configure
index ac8a508695fc1c3f35c888aaaddf05158a89249b..b81301bccf81a3374024192c9b8301e49ac0af2e 100755 (executable)
--- a/src/modules/rlm_yubikey/configure
+++ b/src/modules/rlm_yubikey/configure
@@ -636,6 +636,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_rlm_yubikey
 with_yubikey_include_dir
 with_yubikey_lib_dir
 with_yubikey_dir
@@ -1257,6 +1258,8 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rlm_yubikey   build without module
+
   --with-yubikey-include-dir=DIR
                           Directory where the yubikey includes may be found
   --with-yubikey-lib-dir=DIR
@@ -1795,6 +1798,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+# Check whether --with-rlm_yubikey was given.
+if test "${with_rlm_yubikey+set}" = set; then :
+  withval=$with_rlm_yubikey;
+fi
+
+
 if test x$with_rlm_yubikey != xno; then
 
 

diff --git a/src/modules/rlm_yubikey/configure.ac b/src/modules/rlm_yubikey/configure.ac
index d21703c73cb203c447f86994254037f81d0fff1a..f086d002819175942eb1e2c98120215aa914877c 100644 (file)
--- a/src/modules/rlm_yubikey/configure.ac
+++ b/src/modules/rlm_yubikey/configure.ac
@@ -3,6 +3,10 @@ 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])]
+)
+
 if test x$with_[]modname != xno; then
     dnl ############################################################
     dnl # Check for command line options