From: Terry Burton Date: Sun, 27 Dec 2020 14:03:38 +0000 (+0000) Subject: autoconf fixes for --with/--without options (#3820) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcba9f8dfc16bbc6563032e2fe1d46c36862f0db;p=thirdparty%2Ffreeradius-server.git 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 e3c1d68b5a0..b7c3f0406a3 100755 --- 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 21c8132dacb..4fced24f69b 100644 --- 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 efb4b21ff8a..303ecd581f8 100755 --- 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 7df9258e2f7..d222491f683 100644 --- 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 1f2b06c617a..94b13662c3a 100755 --- 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 5d7176a798a..79dfd44ee81 100644 --- 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 57b1a917774..272ab0c8b14 100755 --- 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 67c0f5ac10f..23626af9511 100644 --- 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 ec5331c0019..8b50d01133d 100755 --- 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 b88a8ab328a..979d8d6b961 100644 --- 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 531719ec2f9..2c48afb8c78 100755 --- 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 5fe56bd7f0c..af107025f11 100644 --- 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 ca0c844cf25..2ad88af0d6d 100755 --- 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 b4bc184100b..f3dc1df4f43 100644 --- 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 943a0402b6b..adf979dd580 100755 --- 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 4fa52b85182..19134729e70 100644 --- 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 ffabba44c67..5c05e967f12 100755 --- 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 bfc2ae2b51a..070a1e504c5 100644 --- 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 0e67132d500..d62c8331648 100755 --- 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 8153b325152..2f2b257100a 100644 --- 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 9a756ee2372..988deddffec 100755 --- 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 1884c39189f..a5f305dee62 100644 --- 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 63b15ea3e59..f044e4263a7 100755 --- 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 2e4ca2a7607..d915d8d1ba1 100644 --- 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 49fcd4f2732..44b201f37f9 100755 --- 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 f4b40d72f47..eb9dcdf6895 100644 --- 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 b7f91382dcc..ca2776d9b41 100755 --- 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 a094ffb5f75..0273c86a6e3 100644 --- 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 510807b0227..997f9690c23 100755 --- 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 4bac89eb3cc..ea48054b0d8 100644 --- 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 981bb6df432..2a94d89cb50 100755 --- 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 1783c249fa7..c5dc92bedf5 100644 --- 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 93a531e3025..869e7d794b8 100755 --- 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 a1c8a3cf1aa..0a4f1f38ac8 100644 --- 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 554510967de..07f3205ee40 100755 --- 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 214b0abcc14..88adc328e2b 100644 --- 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 ef3b85584f5..301db56c96a 100755 --- 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 fb8031e194b..01c0d48c4e2 100644 --- 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 f1bda2514e0..6b110f846b0 100755 --- 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 6051d5d7949..6bbe1722aef 100644 --- 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 3bdd9452651..f5117442b93 100755 --- 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 aa20f8f34bf..f50943367d7 100644 --- 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 6656592657c..e33aedbdb0a 100755 --- 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 c52f6e6c0c2..0377675ed0e 100644 --- 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 c6f815fdeaa..e839ab5a85d 100755 --- 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 75c851a1358..6931e4d2b55 100644 --- 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 125f2740383..42094ab03e1 100755 --- 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 4da57b308e9..5d6d3c42e6a 100644 --- 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 0a5ba55c2cb..6aa20ba2124 100755 --- 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 29a63bab2f4..005565983ec 100644 --- 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 924eb3bbdc0..972ff88eeac 100755 --- 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 1401677a860..2ff86feefb5 100644 --- 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 dadf8eb4e45..0d63fe767dc 100755 --- 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 71166e933e2..dc864ddbfb1 100644 --- 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 4b220d0d386..0680092b8ef 100755 --- 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 4f9a890ba0d..6f74c23cf5b 100644 --- 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 2c6f34bb42c..a9727634ce8 100755 --- 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 d441459c30b..0c0df798454 100644 --- 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 f32d485ef33..0d030f667fc 100755 --- 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 35453879e31..bf398479849 100644 --- 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 880b60112db..137aa7e96f9 100755 --- 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 1f24b058669..edca9c4c6f2 100644 --- 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 ace15f99fb7..e719e39e95b 100755 --- 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 25f47365f54..640b2e842de 100644 --- 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 c900c26dff9..9f572b0ff47 100755 --- 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 be84512de41..9ed6de29dac 100644 --- 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 ac8a508695f..b81301bccf8 100755 --- 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 d21703c73cb..f086d002819 100644 --- 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