]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
refresh configure scripts
authorMatthew Newton <matthew-git@newtoncomputing.co.uk>
Sun, 2 Oct 2022 17:07:59 +0000 (18:07 +0100)
committerMatthew Newton <matthew-git@newtoncomputing.co.uk>
Sun, 2 Oct 2022 17:08:23 +0000 (18:08 +0100)
36 files changed:
configure
src/lib/curl/configure
src/lib/json/configure
src/lib/kafka/configure
src/lib/ldap/configure
src/lib/redis/configure
src/modules/rlm_cache/configure
src/modules/rlm_cache/drivers/rlm_cache_memcached/configure
src/modules/rlm_couchbase/configure
src/modules/rlm_eap/configure
src/modules/rlm_idn/configure
src/modules/rlm_krb5/configure
src/modules/rlm_lua/configure
src/modules/rlm_mruby/configure
src/modules/rlm_mschap/configure
src/modules/rlm_opendirectory/configure
src/modules/rlm_pam/configure
src/modules/rlm_perl/configure
src/modules/rlm_python/configure
src/modules/rlm_radutmp/configure
src/modules/rlm_securid/configure
src/modules/rlm_sigtran/configure
src/modules/rlm_sql/configure
src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure
src/modules/rlm_sql/drivers/rlm_sql_db2/configure
src/modules/rlm_sql/drivers/rlm_sql_firebird/configure
src/modules/rlm_sql/drivers/rlm_sql_freetds/configure
src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure
src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure
src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure
src/modules/rlm_unbound/configure
src/modules/rlm_unix/configure
src/modules/rlm_winbind/configure
src/modules/rlm_yubikey/configure

index a098b25291a71ac2bddcc615f99a06da39936c07..c1cad07a7544b85853c0b1c0cc667bcb9428fc44 100755 (executable)
--- a/configure
+++ b/configure
@@ -17582,3 +17582,46 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+
+library_list=$(find src/lib/ -mindepth 1 -maxdepth 1 -type d -print | sort)
+
+echo
+echo Library configure status report
+echo -------------------------------
+
+for library in $library_list; do
+  library_name="$(basename $library)"
+  library_print="$(echo "$library_name ........................" | cut -c 1-25)"
+  library_status="OK"
+
+  if test -r $library/configure.ac; then
+    if test -r $library/config.report; then
+      library_status=$(cat $library/config.report)
+    fi
+  fi
+
+  echo "$library_print $library_status"
+done
+
+
+module_list=$(find src/modules/ -type d -name 'rlm_*' -print | sort)
+
+echo
+echo Module configure status report
+echo ------------------------------
+
+for module in $module_list; do
+  module_name="$(basename $module)"
+  module_print="$(echo "$module_name ........................" | cut -c 1-25)"
+  module_status="OK"
+
+  if test -r $module/configure.ac; then
+    if test -r $module/config.report; then
+      module_status=$(cat $module/config.report)
+    fi
+  fi
+
+  $as_echo "$module_print $module_status"
+done
+
index 3551a11bb4cfb363d89e338e6b88271f14135c67..cc6a1f5ed767e03082873a7263324b73e7204ea6 100755 (executable)
@@ -585,10 +585,10 @@ PACKAGE_URL=
 ac_unique_file="base.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 version
 mod_ldflags
 mod_cflags
+targetname
 LIBCURL
 LIBCURL_CPPFLAGS
 _libcurl_config
@@ -1367,6 +1367,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for libfreeradius-curl
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1912,6 +1917,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # Check whether --with-libfreeradius-curl was given.
 if test "${with_libfreeradius_curl+set}" = set; then :
   withval=$with_libfreeradius_curl;
@@ -1919,11 +1925,20 @@ fi
 
 
 
-
 ac_config_headers="$ac_config_headers config.h"
 
 
-if test x$with_libfreeradius_curl != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_libfreeradius_curl" != xno; then
+
 
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3261,33 +3276,64 @@ $as_echo "$as_me: Sanitized cflags are \"$(echo "${LIBCURL_CPPFLAGS}" | sed 's/-
                fi
        fi
 
-       targetname=libfreeradius-curl
        version="$libcurl_cv_lib_curl_version"
 
+
+       targetname=libfreeradius-curl
 else
        targetname=
        echo \*\*\* module libfreeradius-curl is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-libfreeradius-curl to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building libfreeradius-curl." >&5
 $as_echo "$as_me: WARNING: silently not building libfreeradius-curl." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-curl requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: libfreeradius-curl requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
-mod_ldflags="$LIBCURL"
-mod_cflags="$LIBCURL_CPPFLAGS"
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
 
+rm "config.report.tmp"
 
 
 
 
+mod_ldflags="$LIBCURL"
+mod_cflags="$LIBCURL_CPPFLAGS"
+
+
+
 
 
 ac_config_files="$ac_config_files all.mk"
@@ -4565,4 +4611,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
index 701dfa8914bc1352c15f40abfb9ad492c727fefd..ab6463fd9948406cf003be022bfba575cc0a5ceb 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="json.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1367,6 +1367,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for libfreeradius-json
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1912,6 +1917,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # Check whether --with-libfreeradius-json was given.
 if test "${with_libfreeradius_json+set}" = set; then :
   withval=$with_libfreeradius_json;
@@ -1919,10 +1925,17 @@ fi
 
 
 
-ac_config_headers="$ac_config_headers config.h"
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
 
 
-if test x$with_libfreeradius_json != xno; then
+if test x"$with_libfreeradius_json" != xno; then
+
 
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3638,37 +3651,78 @@ $as_echo "$as_me: WARNING: json-c libraries not found. Use --with-jsonc-lib-dir=
                fail="$fail json-c >= 0.13"
        fi
 
+
        targetname=libfreeradius-json
 else
        targetname=
        echo \*\*\* module libfreeradius-json is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-libfreeradius-json to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building libfreeradius-json." >&5
 $as_echo "$as_me: WARNING: silently not building libfreeradius-json." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-json requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: libfreeradius-json requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
 else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
+
+if test x"$fail" = x""; then :
+
 
 $as_echo "#define HAVE_JSON 1" >>confdefs.h
 
+
 fi
 
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
 
+ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files all.mk"
 
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -4942,4 +4996,3 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-
index ee0a025ac8476c5e1f9f361132d8fa4ac36fd0c6..7f6729b0990531b8d20b0e695d5efd123b0ff530 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="base.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for libfreeradius-kafka
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # Check whether --with-libfreeradius-kafka was given.
 if test "${with_libfreeradius_kafka+set}" = set; then :
   withval=$with_libfreeradius_kafka;
@@ -1812,11 +1818,21 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_modname_useropt != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_libfreeradius_kafka" != xno; then
+
+
 
         rdkafka_include_dir=
 
@@ -3102,29 +3118,63 @@ $as_echo "$as_me: WARNING: rdkafka libraries not found. Use --with-rdkafka-lib-d
       fail="$fail libhirdkafka"
     fi
 
-    targetname=libfreeradius-kafka
+
+       targetname=libfreeradius-kafka
 else
-    targetname=
-    echo \*\*\* module libfreeradius-kafka is disabled.
+       targetname=
+       echo \*\*\* module libfreeradius-kafka is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-libfreeradius-kafka to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building libfreeradius-kafka." >&5
 $as_echo "$as_me: WARNING: silently not building libfreeradius-kafka." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-kafka requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: libfreeradius-kafka requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-kafka requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: libfreeradius-kafka requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 7748f59a1fa24d931a2c480145adbe8df11bebc3..6275e079bfa8d14954d8ae9fec1eeea798623be5 100755 (executable)
@@ -585,10 +585,10 @@ PACKAGE_URL=
 ac_unique_file="base.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 SASL
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1361,6 +1361,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for libfreeradius-ldap
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1915,6 +1920,7 @@ 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;
@@ -1922,13 +1928,21 @@ fi
 
 
 
-
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 SASL=
 
-if test x$with_libfreeradius_ldap != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_libfreeradius_ldap" != xno; then
+
 
                                ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3664,32 +3678,57 @@ $as_echo "#define WITH_SASL 1" >>confdefs.h
          fi
        fi
 
+
        targetname=libfreeradius-ldap
 else
        targetname=
        echo \*\*\* module libfreeradius-ldap is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-libfreeradius-ldap to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building libfreeradius-ldap." >&5
 $as_echo "$as_me: WARNING: silently not building libfreeradius-ldap." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-ldap requires: $fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: libfreeradius-ldap requires: $fail." >&2;}
-               if test x"$headersuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $headersuggestion" >&5
-$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
-               fi
-               if test x"$libsuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libsuggestion" >&5
-$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
-               fi
-               targetname=""
+$as_echo "$as_me: WARNING: FAILURE: libfreeradius-ldap requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 
 $as_echo "#define WITH_EDIR 1" >>confdefs.h
 
@@ -3703,7 +3742,6 @@ mod_cflags="$SMART_CPPFLAGS"
 
 ac_config_headers="$ac_config_headers config.h"
 
-
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index c6d5a4055d91851bd652d304cb76446cb3d34d29..a19c655eb7ba1ae8227118a77c25c3e0b6a58800 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="redis.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for libfreeradius-redis
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ 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;
@@ -1812,12 +1818,21 @@ fi
 
 
 
-
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_libfreeradius_redis != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_libfreeradius_redis" != xno; then
+
+
 
         redis_include_dir=
 
@@ -3103,29 +3118,63 @@ $as_echo "$as_me: WARNING: hiredis libraries not found. Use --with-redis-lib-dir
       fail="$fail libhiredis"
     fi
 
-    targetname=libfreeradius-redis
+
+       targetname=libfreeradius-redis
 else
-    targetname=
-    echo \*\*\* module libfreeradius-redis is disabled.
+       targetname=
+       echo \*\*\* module libfreeradius-redis is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-libfreeradius-redis to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building libfreeradius-redis." >&5
 $as_echo "$as_me: WARNING: silently not building libfreeradius-redis." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-redis requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: libfreeradius-redis requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: libfreeradius-redis requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: libfreeradius-redis requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 0d96b9f6baf64d976f7957b6ee325a2eab4a335c..394303bf19efe530ad1f44df43608974b68f9e52 100755 (executable)
@@ -1264,7 +1264,7 @@ 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     build without rlm_cache
+  --without-rlm_cache     build without module to cache attributes
 
 Some influential environment variables:
   CC          C compiler command
@@ -1355,6 +1355,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_cache
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1750,6 +1755,7 @@ 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;
@@ -1757,13 +1763,22 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_cache != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_cache" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2553,21 +2568,21 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-       mysubdirs=
-       if test "x$EXPERIMENTAL" = "xyes"; then
-         for foo in `find ./drivers -name configure -print`; do
-           bar=`echo $foo | sed 's%/configure$%%g'`
-           mysubdirs="$mysubdirs $bar"
-         done
-       else
-         for foo in `cat stable`; do
-           mysubdirs="$mysubdirs ./drivers/$foo"
-         done
-       fi
+mysubdirs=
+if test "x$EXPERIMENTAL" = "xyes"; then
+       for foo in `find ./drivers -name configure -print`; do
+               bar=`echo $foo | sed 's%/configure$%%g'`
+               mysubdirs="$mysubdirs $bar"
+       done
+else
+       for foo in `cat stable`; do
+               mysubdirs="$mysubdirs ./drivers/$foo"
+       done
+fi
 
-               ln -s ../../../install-sh install-sh
+ln -s ../../../install-sh install-sh
 
-                                       ac_aux_dir=
+ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
@@ -2600,15 +2615,52 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 subdirs="$subdirs $mysubdirs"
 
-       rm install-sh
+rm install-sh
 
 
        targetname=rlm_cache
 else
        targetname=
        echo \*\*\* module rlm_cache is disabled.
+
+
+fr_status="disabled"
+
 fi
 
+if test x"$fail" != x""; then
+       targetname=""
+
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_cache." >&5
+$as_echo "$as_me: WARNING: silently not building rlm_cache." >&2;}
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_cache requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_cache requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
 
 ac_config_files="$ac_config_files all.mk"
 
index a1b9672c86dbbba98fd8f34f6842885f4ce19a9f..6d42af60814a98eebfac8f947565cbf4913436b7 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_cache_memcached.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1270,7 +1270,7 @@ 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 rlm_cache_memcached
+                          build without memcached support for rlm_cache
   --with-libmemcached-include-dir=DIR
                           Directory where the libmemcached includes may be
                           found
@@ -1370,6 +1370,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_cache_memcached
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1915,6 +1920,7 @@ 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;
@@ -1922,9 +1928,19 @@ fi
 
 
 
-if test x$with_rlm_cache_memcached != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_cache_memcached" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2713,7 +2729,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2852,38 +2868,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-               libmemcached_include_dir=
+libmemcached_include_dir=
 
 # Check whether --with-libmemcached-include-dir was given.
 if test "${with_libmemcached_include_dir+set}" = set; then :
   withval=$with_libmemcached_include_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need libmemcached-include-dir" "$LINENO" 5
-                   ;;
-                       yes)
-                   ;;
-                   *)
-                       libmemcached_include_dir="$withval"
-                   ;;
-               esac
+       no)
+               as_fn_error $? "Need libmemcached-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libmemcached_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-               libmemcached_lib_dir=
+libmemcached_lib_dir=
 
 # Check whether --with-libmemcached-lib-dir was given.
 if test "${with_libmemcached_lib_dir+set}" = set; then :
   withval=$with_libmemcached_lib_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need libmemcached-lib-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       libmemcached_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need libmemcached-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libmemcached_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -2891,23 +2906,22 @@ fi
 # Check whether --with-libmemcached-dir was given.
 if test "${with_libmemcached_dir+set}" = set; then :
   withval=$with_libmemcached_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need libmemcached-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       libmemcached_lib_dir="$withval/lib"
-                       libmemcached_include_dir="$withval/include"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need libmemcached-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libmemcached_lib_dir="$withval/lib"
+               libmemcached_include_dir="$withval/include"
+               ;;
+       esac
 fi
 
 
 
 
-       have_json="yes"
-       smart_try_dir="$libmemcached_include_dir"
+smart_try_dir="$libmemcached_include_dir"
 
 
 
@@ -3159,11 +3173,13 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_libmemcached_memcached_h" != "xyes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmemcached headers not found. Use --with-libmemcached-include-dir=<path>." >&5
+if test "x$ac_cv_header_libmemcached_memcached_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmemcached headers not found. Use --with-libmemcached-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libmemcached headers not found. Use --with-libmemcached-include-dir=<path>." >&2;}
-               fail='memcached.h'
-       fi
+
+fail="$fail memcached.h"
+
+fi
 
 
 
@@ -3341,7 +3357,7 @@ SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
 
-       smart_try_dir="$libmemcached_lib_dir"
+smart_try_dir="$libmemcached_lib_dir"
 
 
 sm_lib_safe=`echo "memcached" | sed 'y%./+-%__p_%'`
@@ -3516,19 +3532,21 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_memcached_memcached" != "xyes"
-       then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmemcached libraries not found. Use --with-libmemcached-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_memcached_memcached" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmemcached libraries not found. Use --with-libmemcached-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libmemcached libraries not found. Use --with-libmemcached-lib-dir=<path>." >&2;}
-               fail="libmemcached $fail"
-       else
-               for ac_func in \
-            memcached \
-            memcached_free \
-            memcached_get \
-            memcached_set \
-            memcached_delete \
-            libmemcached_check_configuration \
+
+fail="$fail libmemcached"
+
+else
+       for ac_func in \
+               memcached \
+               memcached_free \
+               memcached_get \
+               memcached_set \
+               memcached_delete \
+               libmemcached_check_configuration \
 
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -3539,37 +3557,73 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 _ACEOF
 
 else
-  fail="memached functions"
+
+
+fail="$fail memcached functions"
+
+
 fi
 done
 
-       fi
+fi
+
 
        targetname=rlm_cache_memcached
 else
        targetname=
        echo \*\*\* module rlm_cache_memcached is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_cache_memcached to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_cache_memcached." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_cache_memcached." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_cache_memcached requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_cache_memcached requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$LIBCURL $SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
 
-
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 9f82fcd149efe065873cdf050df260171be6ea90..9c9f53a9a281826cf2d988d33bbdf69a918c2e8f 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_couchbase.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1269,7 +1269,7 @@ 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 rlm_couchbase
+  --without-rlm_couchbase build without couchbase database support
   --with-libcouchbase-include-dir=DIR
                           Directory where the libcouchbase includes may be
                           found
@@ -1369,6 +1369,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_couchbase
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1847,18 +1852,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # Check whether --with-rlm_couchbase was given.
 if test "${with_rlm_couchbase+set}" = set; then :
   withval=$with_rlm_couchbase;
 fi
 
 
-ac_config_headers="$ac_config_headers config.h"
 
 
-if test x$with_rlm_couchbase != xno; then
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
 
-       ac_ext=c
+
+
+if test x"$with_rlm_couchbase" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2647,7 +2661,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2786,38 +2800,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-               libcouchbase_include_dir=
+libcouchbase_include_dir=
 
 # Check whether --with-libcouchbase-include-dir was given.
 if test "${with_libcouchbase_include_dir+set}" = set; then :
   withval=$with_libcouchbase_include_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need libcouchbase-include-dir" "$LINENO" 5
-                       ;;
-                       yes)
-                       ;;
-                       *)
-                               libcouchbase_include_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need libcouchbase-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libcouchbase_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-               libcouchbase_lib_dir=
+libcouchbase_lib_dir=
 
 # Check whether --with-libcouchbase-lib-dir was given.
 if test "${with_libcouchbase_lib_dir+set}" = set; then :
   withval=$with_libcouchbase_lib_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need libcouchbase-lib-dir" "$LINENO" 5
-                       ;;
-                       yes)
-                       ;;
-                       *)
-                               libcouchbase_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need libcouchbase-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libcouchbase_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -2825,22 +2838,21 @@ fi
 # Check whether --with-libcouchbase-dir was given.
 if test "${with_libcouchbase_dir+set}" = set; then :
   withval=$with_libcouchbase_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need libcouchbase-dir" "$LINENO" 5
-                       ;;
-                       yes)
-                       ;;
-                       *)
-                               libcouchbase_lib_dir="$withval/lib"
-                               libcouchbase_include_dir="$withval/include"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need libcouchbase-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               libcouchbase_lib_dir="$withval/lib"
+               libcouchbase_include_dir="$withval/include"
+               ;;
+       esac
 fi
 
 
 
-       have_couchbase="yes"
-       smart_try_dir="$libcouchbase_include_dir"
+smart_try_dir="$libcouchbase_include_dir"
 
 
 
@@ -3092,14 +3104,16 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_libcouchbase_couchbase_h" != "xyes"; then
-               have_couchbase="no"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcouchbase headers not found. Use --with-libcouchbase-include-dir=<path>." >&5
+if test "x$ac_cv_header_libcouchbase_couchbase_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcouchbase headers not found. Use --with-libcouchbase-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libcouchbase headers not found. Use --with-libcouchbase-include-dir=<path>." >&2;}
-       fi
+
+fail="$fail couchbase.h"
+
+fi
 
 
-       smart_try_dir="$libcouchbase_lib_dir"
+smart_try_dir="$libcouchbase_lib_dir"
 
 
 sm_lib_safe=`echo "couchbase" | sed 'y%./+-%__p_%'`
@@ -3274,41 +3288,72 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_couchbase_lcb_get_version" != "xyes"; then
-               have_couchbase="no"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_couchbase_lcb_get_version" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>." >&2;}
-       fi
 
-       if test x"$have_couchbase" != x"yes"; then
-               fail="$fail libcouchbase"
-       fi
+fail="$fail libcouchbase"
+
+fi
 
 
        targetname=rlm_couchbase
 else
        targetname=
        echo \*\*\* module rlm_couchbase is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_couchbase to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_couchbase." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_couchbase." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_couchbase requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_couchbase requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="${SMART_LIBS}"
 mod_cflags="${SMART_CPPFLAGS}"
 
 
 
 
+ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files all.mk"
 
index a91beddccfd9147fa0f4bed8a290d0cf3d469e8b..936f2a3d742c0fb6ae7eaab53465d9e13f467ab7 100755 (executable)
@@ -586,10 +586,10 @@ ac_unique_file="rlm_eap.c"
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
 eaptypes
+targetname
 subdirs
 OBJEXT
 EXEEXT
@@ -1267,7 +1267,7 @@ 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_eap       build without rlm_eap
+  --without-rlm_eap       build without EAP functionality
 
 Some influential environment variables:
   CC          C compiler command
@@ -1358,6 +1358,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_eap
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1753,6 +1758,7 @@ 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;
@@ -1760,13 +1766,23 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
+eapsubdirs=
+
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
 
-if test x$with_rlm_eap != xno; then
 
-       ac_ext=c
+if test x"$with_rlm_eap" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2556,15 +2572,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-       eapsubdirs=
-       for foo in `find ./types -name configure -print`; do
-         bar=`echo $foo | sed 's%/configure$%%g'`
-         eapsubdirs="$eapsubdirs $bar"
-       done
+for foo in `find ./types -name configure -print`; do
+  bar=`echo $foo | sed 's%/configure$%%g'`
+  eapsubdirs="$eapsubdirs $bar"
+done
 
-               ln -s ../../../install-sh install-sh
+ln -s ../../../install-sh install-sh
 
-                                       ac_aux_dir=
+ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
@@ -2597,36 +2612,65 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 subdirs="$subdirs $eapsubdirs"
 
-       rm install-sh
+rm install-sh
 
 
        targetname=rlm_eap
 else
        targetname=
        echo \*\*\* module rlm_eap is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_eap to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_eap." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_eap." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_eap requires: $fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_eap requires: $fail." >&2;}
-               if test x"$headersuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $headersuggestion" >&5
-$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
-               fi
-               if test x"$libsuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libsuggestion" >&5
-$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
-               fi
-               targetname=""
-           eapsubdirs=""
+$as_echo "$as_me: WARNING: FAILURE: rlm_eap requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
+
+if test x"$fail" != x""; then :
+       eapsubdirs=""
 fi
 
+
 eaptypes=types
 if test x"$eapsubdirs" = x""; then
        eaptypes=""
index 02eb3d44a1226cb2153b7902b088f4f951792b14..9443798ceedfbbe3dfd0a7186ddc8045fbc5800a 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_idn.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1266,7 +1266,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_idn       build without rlm_idn
+  --without-rlm_idn       build without support for internationalized domain
+                          names
 
 Some influential environment variables:
   CC          C compiler command
@@ -1358,6 +1359,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_idn
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1836,6 +1842,7 @@ 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;
@@ -1843,9 +1850,19 @@ fi
 
 
 
-if test x$with_rlm_idn != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_idn" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2634,7 +2651,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2947,9 +2964,11 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_idn_idna_to_ascii_8z" != "xyes"; then
-               fail="$fail libidn"
-       fi
+if test "x$ac_cv_lib_idn_idna_to_ascii_8z" != "xyes"; then
+
+fail="$fail libidn"
+
+fi
 
 
 
@@ -3201,27 +3220,63 @@ fi
 
 smart_prefix=
 
-       if test "$ac_cv_header_idna_h" != "yes"; then
-               fail="$fail idna.h"
-       fi
+if test "$ac_cv_header_idna_h" != "yes"; then
+
+fail="$fail idna.h"
+
+fi
+
+
        targetname=rlm_idn
 else
        targetname=
        echo \*\*\* module rlm_idn is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_idn to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_idn." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_idn." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_idn requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_idn requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="${SMART_LIBS}"
 mod_cflags="${SMART_CPPFLAGS}"
 
@@ -4385,4 +4440,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
index a2e064daed5a1663f4dc354bf64c4c1d1e035290..37ace49b50f58a6ac79fec7ba47628052a4c24c7 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_krb5.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 krb5_config
 CPP
 OBJEXT
@@ -1268,8 +1268,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 rlm_krb5
-  --with-rlm-krb5-dir=DIR       Directory for krb5 files
+  --without-rlm_krb5      build without Kerberos support
+  --with-rlm-krb5-dir=DIR directory where krb5 files are installed
 
 Some influential environment variables:
   CC          C compiler command
@@ -1361,6 +1361,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_krb5
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1948,6 +1953,7 @@ 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;
@@ -1955,9 +1961,19 @@ fi
 
 
 
-if test x$with_rlm_krb5 != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_krb5" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2746,7 +2762,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2884,25 +2900,24 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-               rlm_krb5_dir=
+rlm_krb5_dir=
 
 # Check whether --with-rlm-krb5-dir was given.
 if test "${with_rlm_krb5_dir+set}" = set; then :
-  withval=$with_rlm_krb5_dir;  case "$withval" in
-           no)
+  withval=$with_rlm_krb5_dir; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-krb5-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                rlm_krb5_dir="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-       # Extract the first word of "krb5-config", so it can be a program name with args.
+# Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -2944,50 +2959,50 @@ $as_echo "no" >&6; }
 fi
 
 
-                                       if test "$krb5_config" != 'not-found'; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config CFLAGS" >&5
+if test "$krb5_config" != 'not-found'; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config CFLAGS" >&5
 $as_echo_n "checking krb5-config CFLAGS... " >&6; }
-               SMART_CPPFLAGS=$($krb5_config --cflags)
-               SMART_CPPFLAGS=$(echo "$SMART_CPPFLAGS" | sed 's/-I[ ]*/-isystem /g')
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SMART_CPPFLAGS\"" >&5
+       SMART_CPPFLAGS=$($krb5_config --cflags)
+       SMART_CPPFLAGS=$(echo "$SMART_CPPFLAGS" | sed 's/-I[ ]*/-isystem /g')
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SMART_CPPFLAGS\"" >&5
 $as_echo "\"$SMART_CPPFLAGS\"" >&6; }
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config LDFLAGS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config LDFLAGS" >&5
 $as_echo_n "checking krb5-config LDFLAGS... " >&6; }
-               SMART_LIBS=$($krb5_config --libs)
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SMART_LIBS}" >&5
+       SMART_LIBS=$($krb5_config --libs)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SMART_LIBS}" >&5
 $as_echo "${SMART_LIBS}" >&6; }
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config reported version" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config reported version" >&5
 $as_echo_n "checking krb5-config reported version... " >&6; }
-               krb5_version_raw=$($krb5_config --version)
+       krb5_version_raw=$($krb5_config --version)
 
-                               krb5_version=$(echo "$krb5_version_raw" | head -n 1 | \
-                       awk '{split($(4),v,"."); if (v["3"] == "") v["3"] = "0"; print v["1"]v["2"]v["3"] }')
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${krb5_version_raw} ($krb5_version)" >&5
+               krb5_version=$(echo "$krb5_version_raw" | head -n 1 | \
+               awk '{split($(4),v,"."); if (v["3"] == "") v["3"] = "0"; print v["1"]v["2"]v["3"] }')
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${krb5_version_raw} ($krb5_version)" >&5
 $as_echo "${krb5_version_raw} ($krb5_version)" >&6; }
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config reported vendor" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config reported vendor" >&5
 $as_echo_n "checking krb5-config reported vendor... " >&6; }
-               krb5_vendor=$($krb5_config --vendor)
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${krb5_vendor}" >&5
+       krb5_vendor=$($krb5_config --vendor)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${krb5_vendor}" >&5
 $as_echo "${krb5_vendor}" >&6; }
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking canonical API type" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking canonical API type" >&5
 $as_echo_n "checking canonical API type... " >&6; }
-               if test "$krb5_vendor" = "Massachusetts Institute of Technology" || \
-                       echo "$krb5_vendor" | grep -i 'MIT' > /dev/null 2>&1 || \
-                       echo "$krb5_version_raw" | grep -i 'MIT' > /dev/null 2>&1 ; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: MIT" >&5
+       if test "$krb5_vendor" = "Massachusetts Institute of Technology" || \
+               echo "$krb5_vendor" | grep -i 'MIT' > /dev/null 2>&1 || \
+               echo "$krb5_version_raw" | grep -i 'MIT' > /dev/null 2>&1 ; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: MIT" >&5
 $as_echo "MIT" >&6; }
-                       krb5_api_type='mit'
-               else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: HEIMDAL" >&5
-$as_echo "HEIMDAL" >&6; }
-                       krb5_api_type='heimdal'
-               fi
+               krb5_api_type='mit'
        else
-               smart_try_dir="$rlm_krb5_dir/include"
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: HEIMDAL" >&5
+$as_echo "HEIMDAL" >&6; }
+               krb5_api_type='heimdal'
+       fi
+else
+       smart_try_dir="$rlm_krb5_dir/include"
 
 
 
@@ -3239,12 +3254,14 @@ fi
 
 smart_prefix=
 
-               if test "$ac_cv_header_krb5_h" != "yes"; then
-                       fail="$fail krb5.h"
-               fi
+       if test "$ac_cv_header_krb5_h" != "yes"; then
+
+fail="$fail krb5.h"
 
-               krb5libcrypto=
-               smart_try_dir="$rlm_krb5_dir/lib"
+       fi
+
+       krb5libcrypto=
+       smart_try_dir="$rlm_krb5_dir/lib"
 
 
 sm_lib_safe=`echo "k5crypto" | sed 'y%./+-%__p_%'`
@@ -3419,11 +3436,11 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-               if test "x$ac_cv_lib_k5crypto_krb5_encrypt_data" = xyes; then
-                       krb5libcrypto="-lk5crypto"
-               fi
+       if test "x$ac_cv_lib_k5crypto_krb5_encrypt_data" = xyes; then
+               krb5libcrypto="-lk5crypto"
+       fi
 
-               if test "x$krb5libcrypto" = x; then
+       if test "x$krb5libcrypto" = x; then
 
 
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
@@ -3598,15 +3615,15 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-                       if test "x$ac_cv_lib_crypto_DH_new" = xyes; then
-                               krb5libcrypto="-lcrypto"
-                       fi
+               if test "x$ac_cv_lib_crypto_DH_new" = xyes; then
+                       krb5libcrypto="-lcrypto"
                fi
+       fi
 
-               if test "x$krb5libcrypto" = x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither krb5 'k5crypto' nor 'crypto' libraries are found!" >&5
+       if test "x$krb5libcrypto" = x; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither krb5 'k5crypto' nor 'crypto' libraries are found!" >&5
 $as_echo "$as_me: WARNING: neither krb5 'k5crypto' nor 'crypto' libraries are found!" >&2;}
-               fi
+       fi
 
 
 
@@ -3782,10 +3799,10 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-               if test "x$ac_cv_lib_com_err_set_com_err_hook" != xyes; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the comm_err library isn't found!" >&5
+       if test "x$ac_cv_lib_com_err_set_com_err_hook" != xyes; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the comm_err library isn't found!" >&5
 $as_echo "$as_me: WARNING: the comm_err library isn't found!" >&2;}
-               fi
+       fi
 
 
 
@@ -3961,10 +3978,10 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-               if test "x$ac_cv_lib_krb5_krb5_verify_user_opt" = xyes; then
-                       krb5_api_type='heimdal'
-               else
-                       krb5_api_type='mit'
+       if test "x$ac_cv_lib_krb5_krb5_verify_user_opt" = xyes; then
+               krb5_api_type='heimdal'
+       else
+               krb5_api_type='mit'
 
 
 
@@ -4140,17 +4157,19 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-                       if test "x$ac_cv_lib_krb5_krb5_get_init_creds_password" != xyes; then
-                           fail="$fail krb5"
-                       fi
-               fi
+               if test "x$ac_cv_lib_krb5_krb5_get_init_creds_password" != xyes; then
+
+fail="$fail krb5"
 
+               fi
        fi
 
-                               LDFLAGS="${LDFLAGS} ${SMART_LIBS}"
-       CFLAGS="${CFLAGS} ${SMART_CPPFLAGS}"
+fi
+
+LDFLAGS="${LDFLAGS} ${SMART_LIBS}"
+CFLAGS="${CFLAGS} ${SMART_CPPFLAGS}"
 
-                               for ac_func in krb5_get_error_message krb5_free_error_string krb5_free_error_message
+for ac_func in krb5_get_error_message krb5_free_error_string krb5_free_error_message
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -4162,18 +4181,18 @@ _ACEOF
 fi
 done
 
-       if test "x$ac_cv_func_krb5_get_error_message" = xyes; then
-               krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_GET_ERROR_MESSAGE"
-       fi
-       if test "x$ac_cv_func_krb5_free_error_message" = xyes; then
-               krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_FREE_ERROR_MESSAGE"
-       fi
-       if test "x$ac_cv_func_krb5_free_error_string" = xyes; then
-               krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_FREE_ERROR_STRING"
-       fi
+if test "x$ac_cv_func_krb5_get_error_message" = xyes; then
+       krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_GET_ERROR_MESSAGE"
+fi
+if test "x$ac_cv_func_krb5_free_error_message" = xyes; then
+       krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_FREE_ERROR_MESSAGE"
+fi
+if test "x$ac_cv_func_krb5_free_error_string" = xyes; then
+       krb5mod_cflags="${krb5mod_cflags} -DHAVE_KRB5_FREE_ERROR_STRING"
+fi
 
-                               if test "$krb5threadsafe" != "no"; then
-               krb5threadsafe=
+if test "$krb5threadsafe" != "no"; then
+       krb5threadsafe=
 
 
 
@@ -4349,8 +4368,8 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-               if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then
-                       if test "$cross_compiling" = yes; then :
+       if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then
+               if test "$cross_compiling" = yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
 $as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
 else
@@ -4375,12 +4394,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-               fi
-       else
-               krb5threadsafe=""
        fi
+else
+       krb5threadsafe=""
+fi
 
-       if test "$krb5_api_type" = "mit"; then
+if test "$krb5_api_type" = "mit"; then
 
 
 ac_safe=`echo "com_err.h" | sed 'y%./+-%__pm%'`
@@ -4631,7 +4650,7 @@ fi
 
 smart_prefix=
 
-               if test "$ac_cv_header_com_err_h" != "yes"; then
+       if test "$ac_cv_header_com_err_h" != "yes"; then
 
 
 ac_safe=`echo "et/com_err.h" | sed 'y%./+-%__pm%'`
@@ -4882,33 +4901,69 @@ fi
 
 smart_prefix=
 
-                       if test "$ac_cv_header_et_com_err_h" != "yes"; then
-                               fail="$fail com_err.h"
-                       else
-                               krb5mod_cflags="$krb5mod_cflags -DET_COMM_ERR "
-                       fi
+               if test "$ac_cv_header_et_com_err_h" != "yes"; then
+
+fail="$fail com_err.h"
+
+               else
+                       krb5mod_cflags="$krb5mod_cflags -DET_COMM_ERR "
                fi
-       else
-               krb5mod_cflags="$krb5mod_cflags -DHEIMDAL_KRB5"
        fi
+else
+       krb5mod_cflags="$krb5mod_cflags -DHEIMDAL_KRB5"
+fi
+
+
        targetname=rlm_krb5
 else
        targetname=
        echo \*\*\* module rlm_krb5 is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_krb5 to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_krb5." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_krb5." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_krb5 requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_krb5 requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$krb5mod_ldflags $krb5libcrypto $SMART_LIBS"
 mod_cflags="$krb5mod_cflags $krb5threadsafe $SMART_CPPFLAGS"
 
index 2b5d48c925c3cfd12ec045f98a4f2be536bb5714..e529522a1abbce7b47288421110dff9d6f2cba20 100755 (executable)
@@ -622,9 +622,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 lua_ldflags
 lua_cflags
+targetname
 LUA_LIB
 EGREP
 GREP
@@ -1408,6 +1408,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_lua
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -2046,6 +2051,7 @@ 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;
@@ -2053,8 +2059,19 @@ fi
 
 
 
-if test x$with_rlm_lua != xno; then
-       ac_ext=c
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_lua" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2843,7 +2860,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2985,45 +3002,45 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Check whether --with-lua-include-dir was given.
 if test "${with_lua_include_dir+set}" = set; then :
   withval=$with_lua_include_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need lua-include-dir" "$LINENO" 5
-                   ;;
-                   yes)
-                   ;;
-                   *)
-                       lua_include_dir="$withval"
-                   ;;
-               esac
+       no)
+               as_fn_error $? "Need lua-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               lua_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-       if test "x$lua_include_dir" != "x"; then
-               LUA_INCLUDE="-I$lua_include_dir"
-       fi
+if test "x$lua_include_dir" != "x"; then
+       LUA_INCLUDE="-I$lua_include_dir"
+fi
 
 
 # Check whether --with-lua-lib-dir was given.
 if test "${with_lua_lib_dir+set}" = set; then :
   withval=$with_lua_lib_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need lua-lib-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       lua_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need lua-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               lua_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
-       if test "x$lua_lib_dir" != "x"; then
-               LDFLAGS="-L$lua_lib_dir"
-       fi
+if test "x$lua_lib_dir" != "x"; then
+       LDFLAGS="-L$lua_lib_dir"
+fi
 
-                               LUA_COMPAT_VERSION=5.1
+LUA_COMPAT_VERSION=5.1
 
-                               LUA_VERSION=jit-2.0
+LUA_VERSION=jit-2.0
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -3452,8 +3469,8 @@ else
 $as_echo "$as_me: WARNING: cannot find Lua includes" >&2;}
 fi
 
-                               if test "x$ac_cv_header_lua_h" = "xno"; then
-               LUA_VERSION=5.2
+if test "x$ac_cv_header_lua_h" = "xno"; then
+       LUA_VERSION=5.2
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if LUA_VERSION is defined" >&5
 $as_echo_n "checking if LUA_VERSION is defined... " >&6; }
@@ -3621,28 +3638,32 @@ else
 $as_echo "$as_me: WARNING: cannot find Lua includes" >&2;}
 fi
 
-       fi
+fi
+
+if test "x$ac_cv_header_lua_h" = "xno"; then
+
+fail="$fail lua.h"
+
+else
+       if test "x$ax_header_version_match" = "xno"; then
+
+fail="$fail correct header version"
 
-       if test "x$ac_cv_header_lua_h" = "xno"; then
-               fail="lua.h"
        else
-               if test "x$ax_header_version_match" = "xno"; then
-                       fail="lua.h version"
-               else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking ldflags" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking ldflags" >&5
 $as_echo_n "checking ldflags... " >&6; }
 if ${_cv_lua_ldflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-                       if test "x$ac_cv_header_luajit_h" = "xno"; then
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: Falling back to Lua 5.2, for optimal performance rebuild with LuaJIT 2.x.x" >&5
+               if test "x$ac_cv_header_luajit_h" = "xno"; then
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: Falling back to Lua 5.2, for optimal performance rebuild with LuaJIT 2.x.x" >&5
 $as_echo "$as_me: Falling back to Lua 5.2, for optimal performance rebuild with LuaJIT 2.x.x" >&6;}
-                       else
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: Found LuaJIT headers, module will perform optimally" >&5
+               else
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: Found LuaJIT headers, module will perform optimally" >&5
 $as_echo "$as_me: Found LuaJIT headers, module will perform optimally" >&6;}
-                               LUA_VERSION=jit-5.1
-                       fi
+                       LUA_VERSION=jit-5.1
+               fi
 
 
 
@@ -3934,12 +3955,12 @@ else
 $as_echo "$as_me: WARNING: cannot find Lua libs" >&2;}
 fi
 
-                       if test "x$_ax_found_lua_libs" = 'xno' && test "x$lua_lib_dir" = "x"; then
-                               { ac_cv_search_dlopen=; unset ac_cv_search_dlopen;}
-                               { ac_cv_search_exp=; unset ac_cv_search_exp;}
-                               { ac_cv_search_lua_load=; unset ac_cv_search_lua_load;}
+               if test "x$_ax_found_lua_libs" = 'xno' && test "x$lua_lib_dir" = "x"; then
+                       { ac_cv_search_dlopen=; unset ac_cv_search_dlopen;}
+                       { ac_cv_search_exp=; unset ac_cv_search_exp;}
+                       { ac_cv_search_lua_load=; unset ac_cv_search_lua_load;}
 
-                               LDFLAGS="-L/usr/local/lib/"
+                       LDFLAGS="-L/usr/local/lib/"
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if LUA_VERSION is defined" >&5
@@ -4230,59 +4251,92 @@ else
 $as_echo "$as_me: WARNING: cannot find Lua libs" >&2;}
 fi
 
-                       fi
+               fi
 
-                       if test "x$_ax_found_lua_libs" != 'xyes'; then
-                               fail="Lua libs"
-                       fi
-                       _cv_lua_ldflags="$LUA_LIB $LDFLAGS"
+               if test "x$_ax_found_lua_libs" != 'xyes'; then
+
+fail="$fail lua libraries"
+
+               fi
+               _cv_lua_ldflags="$LUA_LIB $LDFLAGS"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_lua_ldflags" >&5
 $as_echo "$_cv_lua_ldflags" >&6; }
-               fi
        fi
+fi
 
-       lua_cflags="$LUA_INCLUDE"
-       lua_ldflags="$_cv_lua_ldflags"
+lua_cflags="$LUA_INCLUDE"
+lua_ldflags="$_cv_lua_ldflags"
 
-       if test "x$_ax_found_lua_libs" = 'xyes'; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Lua Library:" >&5
+if test "x$_ax_found_lua_libs" = 'xyes'; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Lua Library:" >&5
 $as_echo "$as_me: Lua Library:" >&6;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua version.......... : $ax_cv_lua_version" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua version.......... : $ax_cv_lua_version" >&5
 $as_echo "$as_me:   Using Lua version.......... : $ax_cv_lua_version" >&6;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua header version... : $ax_cv_lua_header_version" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua header version... : $ax_cv_lua_header_version" >&5
 $as_echo "$as_me:   Using Lua header version... : $ax_cv_lua_header_version" >&6;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua headers.......... : $lua_cflags" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua headers.......... : $lua_cflags" >&5
 $as_echo "$as_me:   Using Lua headers.......... : $lua_cflags" >&6;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua lib.............. : $lua_ldflags" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   Using Lua lib.............. : $lua_ldflags" >&5
 $as_echo "$as_me:   Using Lua lib.............. : $lua_ldflags" >&6;}
-       fi
+fi
+
 
 
-       targetname=rlm_lua     # keep this!  Don't change!
+       targetname=rlm_lua
 else
-       targetname=            # keep this!  Don't change!
-       echo \*\*\* module rlm_lua is disabled.  # keep this!  Don't change!
+       targetname=
+       echo \*\*\* module rlm_lua is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_lua to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_lua." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_lua." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_lua requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_lua requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
 
 
 
 
-  # keep this!  Don't change!
 ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files all.mk rlm_lua.mk libfreeradius-lua.mk"
@@ -5560,5 +5614,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
-  # keep this!  Don't change!
 
index 331aadf31edaeccaf384ec8945221eeb897de150..d6b3754e0515d97355624916e0f57290f3507494 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_mruby.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1269,7 +1269,7 @@ 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 rlm_mruby
+  --without-rlm_mruby     build without support for embedded mRuby scripts
   --with-mruby-include-dir=DIR
                           Directory where the mruby includes may be found
   --with-mruby-lib-dir=DIR
@@ -1366,6 +1366,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_mruby
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1844,6 +1849,7 @@ 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;
@@ -1851,8 +1857,19 @@ fi
 
 
 
-if test x$with_rlm_mruby != xno; then
-       ac_ext=c
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_mruby" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2641,7 +2658,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2780,37 +2797,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-               mruby_include_dir=
+mruby_include_dir=
 
 # Check whether --with-mruby-incude-dir was given.
 if test "${with_mruby_incude_dir+set}" = set; then :
   withval=$with_mruby_incude_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need mruby-include-dir" "$LINENO" 5
-                               ;;
-                       yes)
-                               ;;
-                       *)
-                               mruby_include_dir="$withval"
-                               ;;
-               esac
+               no)
+                       as_fn_error $? "Need mruby-include-dir" "$LINENO" 5
+                       ;;
+               yes)
+                       ;;
+               *)
+                       mruby_include_dir="$withval"
+                       ;;
+       esac
 fi
 
 
-               mruby_lib_dir=
+mruby_lib_dir=
 
 # Check whether --with-mruby-lib-dir was given.
 if test "${with_mruby_lib_dir+set}" = set; then :
   withval=$with_mruby_lib_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need mruby-lib-dir" "$LINENO" 5
-                               ;;
-                       yes)
-                               ;;
-                       *)
-                               mruby_lib_dir="$withval"
+               no)
+                       as_fn_error $? "Need mruby-lib-dir" "$LINENO" 5
+                       ;;
+               yes)
                        ;;
-               esac
+               *)
+                       mruby_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -2818,21 +2835,21 @@ fi
 # Check whether --with-mruby-dir was given.
 if test "${with_mruby_dir+set}" = set; then :
   withval=$with_mruby_dir; case "$withval" in
-                       no)
-                               as_fn_error $? "Need mruby-dir" "$LINENO" 5
-                               ;;
-                       yes)
-                               ;;
-                       *)
-                               mruby_lib_dir="$withval/lib"
-                               mruby_include_dir="$withval/include"
-                               ;;
-               esac
+               no)
+                       as_fn_error $? "Need mruby-dir" "$LINENO" 5
+                       ;;
+               yes)
+                       ;;
+               *)
+                       mruby_lib_dir="$withval/lib"
+                       mruby_include_dir="$withval/include"
+                       ;;
+       esac
 fi
 
 
 
-       smart_try_dir="$mruby_include_dir /usr/include"
+smart_try_dir="$mruby_include_dir /usr/include"
 
 
 
@@ -3084,11 +3101,13 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_mruby_h" != "xyes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby.h not found. Use --with-mruby-include-dir=<path>." >&5
+if test "x$ac_cv_header_mruby_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby.h not found. Use --with-mruby-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: mruby.h not found. Use --with-mruby-include-dir=<path>." >&2;}
-               fail="$fail mruby.h"
-       fi
+
+fail="$fail mruby.h"
+
+fi
 
 
 
@@ -3340,11 +3359,13 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_mruby_compile_h" != "xyes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby/compile.h not found. Use --with-mruby-include-dir=<path>." >&5
+if test "x$ac_cv_header_mruby_compile_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby/compile.h not found. Use --with-mruby-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: mruby/compile.h not found. Use --with-mruby-include-dir=<path>." >&2;}
-               fail="$fail mruby/compile.h"
-       fi
+
+fail="$fail mruby/compile.h"
+
+fi
 
 
 
@@ -3596,15 +3617,17 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_mruby_array_h" != "xyes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby/array.h not found. Use --with-mruby-include-dir=<path>." >&5
+if test "x$ac_cv_header_mruby_array_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby/array.h not found. Use --with-mruby-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: mruby/array.h not found. Use --with-mruby-include-dir=<path>." >&2;}
-               fail="$fail mruby/array.h"
-       fi
 
-       old_LIBS=$LIBS
-       LIBS="$LIBS -lmruby -lm"
-       smart_try_dir="$mruby_lib_dir /usr/lib"
+fail="$fail mruby/array.h"
+
+fi
+
+old_LIBS=$LIBS
+LIBS="$LIBS -lmruby -lm"
+smart_try_dir="$mruby_lib_dir /usr/lib"
 
 
 sm_lib_safe=`echo "mruby" | sed 'y%./+-%__p_%'`
@@ -3779,14 +3802,16 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       LIBS=$old_LIBS
-       if test "x$ac_cv_lib_mruby_mrb_run" = "xyes"; then
-               mod_ldflags="${SMART_LIBS}"
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby libraries not found. Use --with-mruby-lib-dir=<path>." >&5
+LIBS=$old_LIBS
+if test "x$ac_cv_lib_mruby_mrb_run" = "xyes"; then
+       mod_ldflags="${SMART_LIBS}"
+else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mruby libraries not found. Use --with-mruby-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: mruby libraries not found. Use --with-mruby-lib-dir=<path>." >&2;}
-               fail="$fail libmruby"
-       fi
+
+fail="$fail libmruby"
+
+fi
 
 
 
@@ -3962,37 +3987,71 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_m_fmod" = "xyes"; then
-               mod_ldflags="${mod_ldflags} ${SMART_LIBS}"
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: m library not found." >&5
+if test "x$ac_cv_lib_m_fmod" = "xyes"; then
+       mod_ldflags="${mod_ldflags} ${SMART_LIBS}"
+else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: m library not found." >&5
 $as_echo "$as_me: WARNING: m library not found." >&2;}
-               fail="$fail libm"
-       fi
+
+fail="$fail libm"
+
+fi
+
 
        targetname=rlm_mruby
 else
        targetname=
        echo \*\*\* module rlm_mruby is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_mruby to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_mruby." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_mruby." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_mruby requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_mruby requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
-mod_cflags="${SMART_CPPFLAGS}"
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
 
 
 
 
+mod_cflags="${SMART_CPPFLAGS}"
+
+
+
 
 ac_config_files="$ac_config_files all.mk"
 
index 91de326d1d4af36af1eed0e506ab02aed8b9f97e..90bf5cf5428c62ccbc577aa5e65b0e4ca3e3850f 100755 (executable)
@@ -585,10 +585,10 @@ PACKAGE_URL=
 ac_unique_file="rlm_mschap.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
 mschap_sources
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1270,7 +1270,7 @@ 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 rlm_mschap
+  --without-rlm_mschap    build without MS-CHAP and MS-CHAPv2 authentication
   --with-winbind-include-dir=DIR
                           Directory where the winbind includes may be found
   --with-winbind-lib-dir=DIR
@@ -1367,6 +1367,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_mschap
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1845,6 +1850,7 @@ 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;
@@ -1852,9 +1858,19 @@ fi
 
 
 
-if test x$with_rlm_mschap != xno; then
 
-    ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_mschap" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2643,7 +2659,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2782,34 +2798,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-        winbind_include_dir=
+winbind_include_dir=
 
 # Check whether --with-winbind-include-dir was given.
 if test "${with_winbind_include_dir+set}" = set; then :
   withval=$with_winbind_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        winbind_lib_dir=
+winbind_lib_dir=
 
 # Check whether --with-winbind-lib-dir was given.
 if test "${with_winbind_lib_dir+set}" = set; then :
   withval=$with_winbind_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_lib_dir="$withval"
                ;;
        esac
@@ -2820,12 +2836,12 @@ fi
 # Check whether --with-winbind-dir was given.
 if test "${with_winbind_dir+set}" = set; then :
   withval=$with_winbind_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_lib_dir="$withval/lib"
                winbind_include_dir="$withval/include"
                ;;
@@ -2835,7 +2851,7 @@ fi
 
 
 
-    mschap_sources=
+mschap_sources=
 
 
 
@@ -3087,15 +3103,38 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_membership_h" = "xyes"; then
+if test "x$ac_cv_header_membership_h" = "xyes"; then
 
 $as_echo "#define HAVE_MEMBERSHIP_H 1" >>confdefs.h
 
-        mschap_sources="$mschap_sources opendir.c"
-        mod_ldflags="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService"
-    fi
+       mschap_sources="$mschap_sources opendir.c"
+       mod_ldflags="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService"
 
-    smart_try_dir="$winbind_include_dir /usr/include/samba-4.0"
+if echo "$fr_features" | grep -q "+opendirectory+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""with opendirectory support" >> config.report.tmp
+       fr_features="$fr_features +opendirectory+"
+fi
+
+else
+
+if echo "$fr_features" | grep -q "+opendirectory+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without opendirectory support" >> config.report.tmp
+       fr_features="$fr_features +opendirectory+"
+fi
+
+fi
+
+smart_try_dir="$winbind_include_dir /usr/include/samba-4.0"
 
 
 ac_safe=`echo "wbclient.h" | sed 'y%./+-%__pm%'`
@@ -3125,7 +3164,7 @@ $as_echo_n "checking for wbclient.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3168,7 +3207,7 @@ $as_echo_n "checking for ${_prefix}/wbclient.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3209,7 +3248,7 @@ $as_echo_n "checking for wbclient.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3308,7 +3347,7 @@ $as_echo_n "checking for wbclient.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3350,12 +3389,23 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_wbclient_h" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&5
+if test "x$ac_cv_header_wbclient_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
 $as_echo "$as_me: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&2;}
-    fi
+
+if echo "$fr_features" | grep -q "+wbclient+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without direct winbind support" >> config.report.tmp
+       fr_features="$fr_features +wbclient+"
+fi
+
+fi
 
 
 
@@ -3386,7 +3436,7 @@ $as_echo_n "checking for core/ntstatus.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3429,7 +3479,7 @@ $as_echo_n "checking for ${_prefix}/core/ntstatus.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3470,7 +3520,7 @@ $as_echo_n "checking for core/ntstatus.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3569,7 +3619,7 @@ $as_echo_n "checking for core/ntstatus.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3611,18 +3661,29 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&5
+if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
 $as_echo "$as_me: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&2;}
-    fi
 
+if echo "$fr_features" | grep -q "+wbclient+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without direct winbind support" >> config.report.tmp
+       fr_features="$fr_features +wbclient+"
+fi
 
-    if test "x$ac_cv_header_wbclient_h" = "xyes" && \
-       test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then
+fi
 
-      smart_try_dir="$winbind_lib_dir"
+
+if test "x$ac_cv_header_wbclient_h" = "xyes" && \
+       test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then
+
+       smart_try_dir="$winbind_lib_dir"
 
 
 sm_lib_safe=`echo "wbclient" | sed 'y%./+-%__p_%'`
@@ -3797,37 +3858,92 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-      if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&5
+       if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&5
 $as_echo "$as_me: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&2;}
-      else
-        mschap_sources="$mschap_sources auth_wbclient.c"
+
+if echo "$fr_features" | grep -q "+wbclient+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without direct winbind support" >> config.report.tmp
+       fr_features="$fr_features +wbclient+"
+fi
+
+       else
+               mschap_sources="$mschap_sources auth_wbclient.c"
 
 $as_echo "#define WITH_AUTH_WINBIND 1" >>confdefs.h
 
-      fi
-    fi
 
-    targetname=rlm_mschap
+if echo "$fr_features" | grep -q "+wbclient+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""with direct winbind support" >> config.report.tmp
+       fr_features="$fr_features +wbclient+"
+fi
+
+       fi
+fi
+
+
+       targetname=rlm_mschap
 else
-    targetname=
-    echo \*\*\* module rlm_mschap is disabled.
+       targetname=
+       echo \*\*\* module rlm_mschap is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_mschap to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_mschap." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_mschap." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_mschap requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_mschap requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$mod_ldflags $SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
@@ -5111,4 +5227,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
index 2f980e491d54615b8e75577d8bd4b4ff80eff591..958919a7aaf68a8dc3311d3d8e9f28255115b4b9 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_opendirectory.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1267,7 +1267,7 @@ 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 rlm_opendirectory
+                          build without support for OpenDirectory
 
 Some influential environment variables:
   CC          C compiler command
@@ -1359,6 +1359,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_opendirectory
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1837,6 +1842,7 @@ 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;
@@ -1844,9 +1850,19 @@ fi
 
 
 
-if test x$with_rlm_opendirectory != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_opendirectory" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2635,7 +2651,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2773,7 +2789,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-       mod_ldflags="${mod_ldflags} -F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService"
+mod_ldflags="${mod_ldflags} -F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService"
 
 
 
@@ -3026,10 +3042,12 @@ fi
 
 smart_prefix=
 
-       if test "$ac_cv_header_membership_h" != "yes"; then
-         fail="$fail membership.h"
-       else
-         ac_fn_c_check_decl "$LINENO" "mbr_check_service_membership" "ac_cv_have_decl_mbr_check_service_membership" "#include <membership.h>
+if test "$ac_cv_header_membership_h" != "yes"; then
+
+fail="$fail membership.h"
+
+else
+       ac_fn_c_check_decl "$LINENO" "mbr_check_service_membership" "ac_cv_have_decl_mbr_check_service_membership" "#include <membership.h>
 "
 if test "x$ac_cv_have_decl_mbr_check_service_membership" = xyes; then :
   ac_have_decl=1
@@ -3044,7 +3062,7 @@ if test $ac_have_decl = 1; then :
   mod_cflags="${mod_cflags} -DHAVE_DECL_MBR_CHECK_SERVICE_MEMBERSHIP"
 fi
 
-         ac_fn_c_check_decl "$LINENO" "mbr_check_membership_refresh" "ac_cv_have_decl_mbr_check_membership_refresh" "#include <membership.h>
+       ac_fn_c_check_decl "$LINENO" "mbr_check_membership_refresh" "ac_cv_have_decl_mbr_check_membership_refresh" "#include <membership.h>
 "
 if test "x$ac_cv_have_decl_mbr_check_membership_refresh" = xyes; then :
   ac_have_decl=1
@@ -3059,25 +3077,59 @@ if test $ac_have_decl = 1; then :
   mod_cflags="${mod_cflags} -DHAVE_DECL_MBR_CHECK_MEMBERSHIP_REFRESH"
 fi
 
-       fi
+fi
+
+
        targetname=rlm_opendirectory
 else
        targetname=
        echo \*\*\* module rlm_opendirectory is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_opendirectory to disable it explicitly." "$LINENO" 5
        else
+
                { $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;}
-               targetname=""
+$as_echo "$as_me: WARNING: FAILURE: rlm_opendirectory requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 
 
 
index 40dfc53b6ec77f1068cc9dea729aa3b93f14b479..670e88d9b8b5899a7e62a217ff539f764b71626b 100755 (executable)
@@ -622,9 +622,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 EGREP
 GREP
 CPP
@@ -1305,7 +1305,7 @@ 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_pam       build without rlm_pam
+  --without-rlm_pam       build without PAM authentication
 
 Some influential environment variables:
   CC          C compiler command
@@ -1397,6 +1397,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_pam
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -2035,6 +2040,7 @@ 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;
@@ -2043,9 +2049,18 @@ fi
 
 
 
-if test x$with_rlm_pam != xno; then
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_pam" != xno; then
+
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2834,7 +2849,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3015,14 +3030,14 @@ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
 fi
 
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
 $as_echo_n "checking for pam_start in -lpam... " >&6; }
 if ${ac_cv_lib_pam_pam_start+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $mod_ldflags
       $LIBS"
+ $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3055,7 +3070,9 @@ $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
 if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
    mod_ldflags="-lpam $mod_ldflags"
 else
-   fail=$fail" libpam"
+
+fail="$fail libpam"
+
 fi
 
 
@@ -3320,8 +3337,8 @@ done
 
 
 for ac_header in \
-                       security/pam_appl.h \
-                       pam/pam_appl.h \
+       security/pam_appl.h \
+       pam/pam_appl.h \
 
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -3335,26 +3352,59 @@ fi
 
 done
 
-       mod_cflags="-I."
+mod_cflags="-I."
+
 
        targetname=rlm_pam
 else
        targetname=
        echo \*\*\* module rlm_pam is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_pam to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_pam." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_pam." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_pam requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_pam requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 
 
 
index daf4e3e9cc47ff46451504832632f08e10869907..971b22a75d46d719308e44e9e4263910d21dd143 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_perl.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 PERL
 CPP
 OBJEXT
@@ -1269,7 +1269,7 @@ 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 rlm_perl
+  --without-rlm_perl      build without support for embedded Perl functions
   --with-perl=[PATH]    absolute path to perl executable
 
 Some influential environment variables:
@@ -1363,6 +1363,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_perl
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1841,6 +1846,7 @@ 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;
@@ -1848,8 +1854,19 @@ fi
 
 
 
-if test x$with_rlm_perl != xno; then
-       ac_ext=c
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_perl" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2638,7 +2655,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2786,7 +2803,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
     if test -z "$PERL"; then :
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether perl executable path has been provided" >&5
@@ -2912,53 +2928,55 @@ fi
 
 
 
-       if test "$PERL" = "not-found" -o ! -x "$PERL"; then
-               fail=$fail" perl"
-       else
-               old_CFLAGS="${CFLAGS}"
-               old_LIBS="${LIBS}"
+if test "$PERL" = "not-found" -o ! -x "$PERL"; then
 
-                                                               { $as_echo "$as_me:${as_lineno-$LINENO}: Calling ExtUtils::Embed to get 'ccopts'" >&5
+fail="$fail perl"
+
+else
+       old_CFLAGS="${CFLAGS}"
+       old_LIBS="${LIBS}"
+
+                               { $as_echo "$as_me:${as_lineno-$LINENO}: Calling ExtUtils::Embed to get 'ccopts'" >&5
 $as_echo "$as_me: Calling ExtUtils::Embed to get 'ccopts'" >&6;}
-               perl_cflags=$($PERL -MExtUtils::Embed -e ccopts)
+       perl_cflags=$($PERL -MExtUtils::Embed -e ccopts)
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: ExtUtil's ccopts were \"${perl_cflags}\"" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: ExtUtil's ccopts were \"${perl_cflags}\"" >&5
 $as_echo "$as_me: ExtUtil's ccopts were \"${perl_cflags}\"" >&6;}
 
-               mod_cflags=`echo $perl_cflags | sed -e '\
-                       s/-I */-isystem /g;\
-                       s/-arch ^ *//g;\
-                       s/  / /g;\
-                       s/^ *//;\
-                       s/ *$//;\
-                       s/-fstack-clash-protection[[:blank:]]*//g; \
-                       '`
+       mod_cflags=`echo $perl_cflags | sed -e '\
+               s/-I */-isystem /g;\
+               s/-arch ^ *//g;\
+               s/  / /g;\
+               s/^ *//;\
+               s/ *$//;\
+               s/-fstack-clash-protection[[:blank:]]*//g; \
+               '`
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ccopts are \"${mod_cflags}\"" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ccopts are \"${mod_cflags}\"" >&5
 $as_echo "$as_me: Sanitized ccopts are \"${mod_cflags}\"" >&6;}
 
-               CFLAGS="${mod_cflags} ${CFLAGS}"
+       CFLAGS="${mod_cflags} ${CFLAGS}"
 
-                                                               { $as_echo "$as_me:${as_lineno-$LINENO}: Calling ExtUtils::Embed to get 'ldflags'" >&5
+                               { $as_echo "$as_me:${as_lineno-$LINENO}: Calling ExtUtils::Embed to get 'ldflags'" >&5
 $as_echo "$as_me: Calling ExtUtils::Embed to get 'ldflags'" >&6;}
-               perl_ldflags=$($PERL -MExtUtils::Embed -e ldopts)
+       perl_ldflags=$($PERL -MExtUtils::Embed -e ldopts)
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: ExtUtil's ldopts were \"${perl_ldflags}\"" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: ExtUtil's ldopts were \"${perl_ldflags}\"" >&5
 $as_echo "$as_me: ExtUtil's ldopts were \"${perl_ldflags}\"" >&6;}
 
-               mod_ldflags=`echo $perl_ldflags | sed -e '\
-                       s/-arch ^ *//g;\
-                       s/  / /g;\
-                       s/^ *//;\
-                       s/ *$//;\
-                       '`
+       mod_ldflags=`echo $perl_ldflags | sed -e '\
+               s/-arch ^ *//g;\
+               s/  / /g;\
+               s/^ *//;\
+               s/ *$//;\
+               '`
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ldopts are \"${mod_ldflags}\"" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ldopts are \"${mod_ldflags}\"" >&5
 $as_echo "$as_me: Sanitized ldopts are \"${mod_ldflags}\"" >&6;}
 
-               LIBS="${mod_ldflags} ${LIBS}"
+       LIBS="${mod_ldflags} ${LIBS}"
 
-                                                               smart_try_dir=
+                               smart_try_dir=
 
 
 
@@ -3210,10 +3228,11 @@ fi
 
 smart_prefix=
 
-               if test "x$ac_cv_header_EXTERN_h" != "xyes"; then
-                       fail="$fail EXTERN.h"
-                       targetname=
-               fi
+       if test "x$ac_cv_header_EXTERN_h" != "xyes"; then
+
+fail="$fail EXTERN.h"
+
+       fi
 
 
 
@@ -3465,22 +3484,23 @@ fi
 
 smart_prefix=
 
-               if test "x$ac_cv_header_perl_h" != "xyes"; then
-                       fail="$fail EXTERN.h"
-                       targetname=
-               fi
+       if test "x$ac_cv_header_perl_h" != "xyes"; then
+
+fail="$fail EXTERN.h"
+
+       fi
 
-                                                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to boot_DynaLoader" >&5
+                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to boot_DynaLoader" >&5
 $as_echo_n "checking we can link to boot_DynaLoader... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-                       extern char boot_DynaLoader();
-                       boot_DynaLoader();
+               extern char boot_DynaLoader();
+               boot_DynaLoader();
 
   ;
   return 0;
@@ -3494,24 +3514,25 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
 $as_echo "$LINKS" >&6; }
-               if test "x$LINKS" = "xno"; then
-                       fail="$fail libperl.so"
-                       targetname=
-               fi
+       if test "x$LINKS" = "xno"; then
+
+fail="$fail libperl.so"
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to Perl_hv_store()" >&5
+       fi
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to Perl_hv_store()" >&5
 $as_echo_n "checking we can link to Perl_hv_store()... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-                       extern char Perl_hv_store();
-                       Perl_hv_store();
+               extern char Perl_hv_store();
+               Perl_hv_store();
 
   ;
   return 0;
@@ -3525,44 +3546,74 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
 $as_echo "$LINKS" >&6; }
-               if test "x$LINKS" = "xno"; then
-                       fail="$fail libperl.so"
-                       targetname=
-               fi
+       if test "x$LINKS" = "xno"; then
 
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
+fail="$fail libperl.so"
 
-               targetname=rlm_perl
        fi
+
+       CFLAGS="$old_CFLAGS"
+       LIBS="$old_LIBS"
+fi
+
+
+       targetname=rlm_perl
 else
-               targetname=
-               echo \*\*\* module rlm_perl is disabled.
+       targetname=
+       echo \*\*\* module rlm_perl is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_perl to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_perl." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_perl." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_perl requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_perl requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
 
-               targetname=
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
 
+rm "config.report.tmp"
 
 
 
-ac_config_headers="$ac_config_headers config.h"
 
 
 
+
+ac_config_headers="$ac_config_headers config.h"
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 28c77a15b53e6faf71487e8e76bfa02f05805576..12583cf82e7f4e1a1ff1a669264366d445c10b61 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_python.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 PYTHON_CONFIG_BIN
 CPP
 OBJEXT
@@ -1268,8 +1268,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_python    build without rlm_python
-  --with-rlm-python-config-bin=PATH   Path to python-config binary
+  --without-rlm_python    build without support for embedded Python functions
+  --with-rlm-python-config-bin=PATH
+                          path to python-config binary
 
 Some influential environment variables:
   CC          C compiler command
@@ -1361,6 +1362,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_python
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1839,6 +1845,7 @@ 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;
@@ -1846,9 +1853,19 @@ fi
 
 
 
-if test x$with_rlm_python != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_python" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2637,7 +2654,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2775,26 +2792,25 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-               PYHTON_BIN=
+PYHTON_BIN=
 
 # Check whether --with-rlm-python-config-bin was given.
 if test "${with_rlm_python_config_bin+set}" = set; then :
-  withval=$with_rlm_python_config_bin;  case "$withval" in
-           no)
+  withval=$with_rlm_python_config_bin; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-python-config-bin" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                PYTHON_CONFIG_BIN="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-       if test "x$PYTHON_CONFIG_BIN" = x; then
-               for ac_prog in  python3-config
+if test "x$PYTHON_CONFIG_BIN" = x; then
+       for ac_prog in  python3-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2838,77 +2854,79 @@ fi
 done
 test -n "$PYTHON_CONFIG_BIN" || PYTHON_CONFIG_BIN="not-found"
 
-       fi
+fi
 
-       if test "x$PYTHON_CONFIG_BIN" = "xnot-found"; then
-               fail="python-config"
-       else
-                                                               old_CFLAGS="$CFLAGS"
-               old_LDFLAGS="$LDFLAGS"
+if test "x$PYTHON_CONFIG_BIN" = "xnot-found"; then
+
+fail="$fail python-config"
 
-               unset CFLAGS
-               unset LDFLAGS
+else
+                               old_CFLAGS="$CFLAGS"
+       old_LDFLAGS="$LDFLAGS"
+
+       unset CFLAGS
+       unset LDFLAGS
 
-                                                                                               if ${PYTHON_CONFIG_BIN} --help 2>&1 | grep '\-\-embed'; then
-                       PYTHON_CONFIG_EMBED="--embed"
-               else
-                       PYTHON_CONFIG_EMBED=""
-               fi
+                                               if ${PYTHON_CONFIG_BIN} --help 2>&1 | grep '\-\-embed'; then
+               PYTHON_CONFIG_EMBED="--embed"
+       else
+               PYTHON_CONFIG_EMBED=""
+       fi
 
-               python_cflags=`${PYTHON_CONFIG_BIN} --cflags ${PYTHON_CONFIG_EMBED}`
-               { $as_echo "$as_me:${as_lineno-$LINENO}: ${PYTHON_CONFIG_BIN}'s cflags were \"${python_cflags}\"" >&5
+       python_cflags=`${PYTHON_CONFIG_BIN} --cflags ${PYTHON_CONFIG_EMBED}`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: ${PYTHON_CONFIG_BIN}'s cflags were \"${python_cflags}\"" >&5
 $as_echo "$as_me: ${PYTHON_CONFIG_BIN}'s cflags were \"${python_cflags}\"" >&6;}
 
-                                                                                                                                                                                                                               mod_cflags=`echo " $python_cflags" | sed -e '\
-                       s/ -I/ -isystem/g;\
-                       s/ -isysroot[ =]\{0,1\}[^-]*/ /g;\
-                       s/ -O[^[[:blank:]]]*/ /g;\
-                       s/ -Wp,-D_FORTIFY_SOURCE=[[:digit:]]/ /g;\
-                       s/ -g[^ ]*/ /g;\
-                       s/ -W[^ ]*/ /g;\
-                       s/ -DNDEBUG[[:blank:]]*/ /g;\
-                       s/ -frecord-gcc-switches/ /g;\
-                       s/ -fstack-clash-protection[[:blank:]]*/ /g;\
-                       s/ -specs=[^ ]*/ /g;\
-                       s/ -ffat-lto-objects/ /g;
-                       '`
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized cflags were \"${mod_cflags}\"" >&5
+                                                                                                               mod_cflags=`echo " $python_cflags" | sed -e '\
+               s/ -I/ -isystem/g;\
+               s/ -isysroot[ =]\{0,1\}[^-]*/ /g;\
+               s/ -O[^[[:blank:]]]*/ /g;\
+               s/ -Wp,-D_FORTIFY_SOURCE=[[:digit:]]/ /g;\
+               s/ -g[^ ]*/ /g;\
+               s/ -W[^ ]*/ /g;\
+               s/ -DNDEBUG[[:blank:]]*/ /g;\
+               s/ -frecord-gcc-switches/ /g;\
+               s/ -fstack-clash-protection[[:blank:]]*/ /g;\
+               s/ -specs=[^ ]*/ /g;\
+               s/ -ffat-lto-objects/ /g;
+               '`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized cflags were \"${mod_cflags}\"" >&5
 $as_echo "$as_me: Sanitized cflags were \"${mod_cflags}\"" >&6;}
 
-               python_ldflags=`${PYTHON_CONFIG_BIN} --ldflags ${PYTHON_CONFIG_EMBED}`
-               { $as_echo "$as_me:${as_lineno-$LINENO}: ${PYTHON_CONFIG_BIN}'s ldflags were \"${python_ldflags}\"" >&5
+       python_ldflags=`${PYTHON_CONFIG_BIN} --ldflags ${PYTHON_CONFIG_EMBED}`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: ${PYTHON_CONFIG_BIN}'s ldflags were \"${python_ldflags}\"" >&5
 $as_echo "$as_me: ${PYTHON_CONFIG_BIN}'s ldflags were \"${python_ldflags}\"" >&6;}
 
-                                                                               mod_ldflags=`echo $python_ldflags | sed -e '\
-                       s/-Wl,-O[[:digit:]][[:blank:]]*//g;\
-                       s/-Wl,-Bsymbolic-functions[[:blank:]]*//g;\
-                       s/-Xlinker -export-dynamic//g;\
-                       s/-Wl,-stack_size,[[:digit:]]*[[:blank:]]//g;
-                       '`
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ldflags were \"${mod_ldflags}\"" >&5
+                                       mod_ldflags=`echo $python_ldflags | sed -e '\
+               s/-Wl,-O[[:digit:]][[:blank:]]*//g;\
+               s/-Wl,-Bsymbolic-functions[[:blank:]]*//g;\
+               s/-Xlinker -export-dynamic//g;\
+               s/-Wl,-stack_size,[[:digit:]]*[[:blank:]]//g;
+               '`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Sanitized ldflags were \"${mod_ldflags}\"" >&5
 $as_echo "$as_me: Sanitized ldflags were \"${mod_ldflags}\"" >&6;}
 
-               python_lib=`echo "${mod_ldflags}" | grep -o -E '\-lpython[0-9.]+' | sed -e 's/-l//'`
+       python_lib=`echo "${mod_ldflags}" | grep -o -E '\-lpython[0-9.]+' | sed -e 's/-l//'`
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: Python library is \"${python_lib}\"" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Python library is \"${python_lib}\"" >&5
 $as_echo "$as_me: Python library is \"${python_lib}\"" >&6;}
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to python libraries" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking we can link to python libraries" >&5
 $as_echo_n "checking we can link to python libraries... " >&6; }
 
-               CFLAGS=${mod_cflags}
-               LDFLAGS=${mod_ldflags}
+       CFLAGS=${mod_cflags}
+       LDFLAGS=${mod_ldflags}
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-                   #include <Python.h>
+                       #include <Python.h>
 
 int
 main ()
 {
 
-                   Py_SetProgramName("test")
+                       Py_SetProgramName("test")
 
   ;
   return 0;
@@ -2923,35 +2941,69 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKS" >&5
 $as_echo "$LINKS" >&6; }
-               if test "x$LINKS" = "xno"; then
-                       fail="$fail working python libraries"
-                       targetname=
-               fi
+       if test "x$LINKS" = "xno"; then
 
-               CFLAGS=$old_CFLAGS
-               LDFLAGS=$old_LDFLAGS
+fail="$fail working python libraries"
 
-               targetname="rlm_python"
        fi
+
+       CFLAGS=$old_CFLAGS
+       LDFLAGS=$old_LDFLAGS
+fi
+
+
+       targetname=rlm_python
 else
        targetname=
        echo \*\*\* module rlm_python is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_python to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_python." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_python." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_python requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_python requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 
 
 
index 3f41e047449b3f884565ce2ed23f31b1d4fd334c..c4202f3f108b82ed6cb74b6a59640a6acb19903a 100755 (executable)
@@ -622,9 +622,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 EGREP
 GREP
 CPP
@@ -1305,7 +1305,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_radutmp   build without rlm_radutmp
+  --without-rlm_radutmp   build without ability to maintain utmp-style
+                          sessions
 
 Some influential environment variables:
   CC          C compiler command
@@ -1397,6 +1398,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_radutmp
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1989,6 +1995,7 @@ 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;
@@ -1996,9 +2003,19 @@ fi
 
 
 
-if test x$with_rlm_radutmp != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_radutmp" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3198,12 +3215,51 @@ fi
 done
 
 
+
        targetname=rlm_radutmp
 else
        targetname=
        echo \*\*\* module rlm_radutmp is disabled.
+
+
+fr_status="disabled"
+
+fi
+
+if test x"$fail" != x""; then
+       targetname=""
+
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_radutmp." >&5
+$as_echo "$as_me: WARNING: silently not building rlm_radutmp." >&2;}
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_radutmp requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_radutmp requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 
 
 
index 4dd41d384ea7c32ff5b75271eabfc23344d847e9..d44474a4a6a42749470da6826bed201c127d70a4 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_securid.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1267,7 +1267,7 @@ 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 rlm_securid
+  --without-rlm_securid   build without support for RSA SecurID token checking
   --with-rlm-securid-include-dir=DIR
                           Directory where the securid includes may be found
   --with-rlm-securid-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_securid
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1804,6 +1809,8 @@ 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;
@@ -1811,41 +1818,50 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_securid != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_securid" != xno; then
 
 
-        securid_include_dir=
+
+securid_include_dir=
 
 # Check whether --with-rlm-securid-include-dir was given.
 if test "${with_rlm_securid_include_dir+set}" = set; then :
   withval=$with_rlm_securid_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need rlm-securid-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                securid_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        securid_lib_dir=
+securid_lib_dir=
 
 # Check whether --with-rlm-securid-lib-dir was given.
 if test "${with_rlm_securid_lib_dir+set}" = set; then :
   withval=$with_rlm_securid_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need rlm-securid-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                securid_lib_dir="$withval"
                ;;
        esac
@@ -1856,22 +1872,22 @@ fi
 # Check whether --with-rlm-securid-dir was given.
 if test "${with_rlm_securid_dir+set}" = set; then :
   withval=$with_rlm_securid_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need rlm-securid-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                securid_lib_dir="$withval/lib"
                securid_include_dir="$withval/inc"
-               ;;
+       ;;
        esac
 fi
 
 
 
-    smart_try_dir="$securid_include_dir"
-    ac_ext=c
+smart_try_dir="$securid_include_dir"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2911,14 +2927,16 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_acexport_h" != "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: securid headers not found. Use --with-rlm-securid-include-dir=<path>." >&5
+if test "x$ac_cv_header_acexport_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: securid headers not found. Use --with-rlm-securid-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: securid headers not found. Use --with-rlm-securid-include-dir=<path>." >&2;}
-      fail="$fail acexport.h"
-    fi
+
+fail="$fail acexport.h"
+
+fi
 
 
-        smart_try_dir="$securid_lib_dir"
+smart_try_dir="$securid_lib_dir"
 
 
 sm_lib_safe=`echo "aceclnt" | sed 'y%./+-%__p_%'`
@@ -3093,36 +3111,72 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_aceclnt_SD_Init" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: securid libraries not found. Use --with-rlm-securid-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_aceclnt_SD_Init" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: securid libraries not found. Use --with-rlm-securid-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: securid libraries not found. Use --with-rlm-securid-lib-dir=<path>." >&2;}
-      fail="$fail libaceclnt"
-    fi
 
-    targetname=rlm_securid
+fail="$fail libaceclnt"
+
+fi
+
+
+       targetname=rlm_securid
 else
-    targetname=
-    echo \*\*\* module rlm_securid is disabled.
+       targetname=
+       echo \*\*\* module rlm_securid is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_securid to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_securid." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_securid." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_securid requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_securid requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_securid requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_securid requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index d3d001e51e57b5207c3a1ab1887747a6c91266b2..6caec80ebe84a70d4a69f69291fa1b1ba3d0769a 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sigtran.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1266,7 +1266,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 rlm_sigtran
+  --without-rlm_sigtran   build without Sigtran functionality for EAP-SIM and
+                          EAP-AKA
   --with-sigtran-include-dir=DIR
                           Directory where osmocore and osmosccp may be found
   --with-sigtran-dir=DIR  Base directory where osmocore and osmosccp are
@@ -1361,6 +1362,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sigtran
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1802,6 +1808,7 @@ 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;
@@ -1809,23 +1816,33 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sigtran != xno; then
 
-        sigtran_include_dir=
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sigtran" != xno; then
+
+
+
+sigtran_include_dir=
 
 # Check whether --with-sigtran-include-dir was given.
 if test "${with_sigtran_include_dir+set}" = set; then :
   withval=$with_sigtran_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need sigtran-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                sigtran_lib_dir="$withval"
                ;;
        esac
@@ -1836,12 +1853,12 @@ fi
 # Check whether --with-sigtran-dir was given.
 if test "${with_sigtran_dir+set}" = set; then :
   withval=$with_sigtran_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need sigtran-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                sigtran_lib_dir="$withval/lib"
                sigtran_include_dir="$withval/include"
                ;;
@@ -1850,7 +1867,7 @@ fi
 
 
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2906,11 +2923,13 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_osmocom_core_msgb_h" != "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocomcore headers not found. Use --with-sigtran-include-dir=<path>." >&5
+if test "x$ac_cv_header_osmocom_core_msgb_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocomcore headers not found. Use --with-sigtran-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libosmocomcore headers not found. Use --with-sigtran-include-dir=<path>." >&2;}
-      fail="$fail osmocom/core/msgb.h"
-    fi
+
+fail="$fail osmocom/core/msgb.h"
+
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config libosmo-sccp include paths" >&5
@@ -2926,8 +2945,8 @@ else
 $as_echo "no" >&6; }
 fi
 
-    old_cflags="$CFLAGS"
-    CFLAGS="${CFLAGS} -include stdint.h -include osmocom/core/linuxlist.h"
+old_cflags="$CFLAGS"
+CFLAGS="${CFLAGS} -include stdint.h -include osmocom/core/linuxlist.h"
 
 
 ac_safe=`echo "osmocom/sccp/sccp.h" | sed 'y%./+-%__pm%'`
@@ -3178,12 +3197,14 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_osmocom_sccp_sccp_h" != "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocom-sccp headers not found. Use --with-sigtran-include-dir=<path>." >&5
+if test "x$ac_cv_header_osmocom_sccp_sccp_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocom-sccp headers not found. Use --with-sigtran-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libosmocom-sccp headers not found. Use --with-sigtran-include-dir=<path>." >&2;}
-      fail="$fail osmocom/sccp/sccp.h"
-    fi
-    CFLAGS="$old_cflags"
+
+fail="$fail osmocom/sccp/sccp.h"
+
+fi
+CFLAGS="$old_cflags"
 
 
 
@@ -3374,12 +3395,14 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_osmocore_msgb_alloc" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocore libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_osmocore_msgb_alloc" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libosmocore libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libosmocore libraries not found. Use --with-sigtran-lib-dir=<path>." >&2;}
-      fail="$fail libosmocore"
-    fi
+
+fail="$fail libosmocore"
+
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config libosmo-sccp linker paths" >&5
@@ -3569,12 +3592,14 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_sccp_sccp_connection_connect" != "xyes" -a "x$ac_cv_lib_osmo_sccp_sccp_connection_connect" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsccp libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_sccp_sccp_connection_connect" != "xyes" -a "x$ac_cv_lib_osmo_sccp_sccp_connection_connect" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsccp libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libsccp libraries not found. Use --with-sigtran-lib-dir=<path>." >&2;}
-      fail="$fail lib$NAMESCCP"
-    fi
+
+fail="$fail libsccp"
+
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config libosmo-xua linker paths" >&5
@@ -3764,12 +3789,14 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_xua_xua_msg_alloc" != "xyes" -a "x$ac_cv_lib_osmo_xua_xua_msg_alloc" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxua libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_xua_xua_msg_alloc" != "xyes" -a "x$ac_cv_lib_osmo_xua_xua_msg_alloc" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxua libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libxua libraries not found. Use --with-sigtran-lib-dir=<path>." >&2;}
-      fail="$fail lib$NAMEXUA"
-    fi
+
+fail="$fail libxua"
+
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config libosmo-mtp linker paths" >&5
@@ -3959,35 +3986,72 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_mtp_mtp_pcap_write_header" != "xyes" -a "x$ac_cv_lib_osmo_mtp_mtp_pcap_write_header" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmtp libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_mtp_mtp_pcap_write_header" != "xyes" -a "x$ac_cv_lib_osmo_mtp_mtp_pcap_write_header" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmtp libraries not found. Use --with-sigtran-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: libmtp libraries not found. Use --with-sigtran-lib-dir=<path>." >&2;}
-      fail="$fail lib$NAMEMTP"
-    fi
-    targetname=rlm_sigtran
+
+fail="$fail libmtp"
+
+fi
+
+
+       targetname=rlm_sigtran
 else
-    targetname=
-    echo \*\*\* module rlm_sigtran is disabled.
+       targetname=
+       echo \*\*\* module rlm_sigtran is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sigtran to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sigtran." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sigtran." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sigtran requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sigtran requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sigtran requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sigtran requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS $(pkg-config --libs-only-other libosmocore) $(pkg-config --libs-only-other libosmo-sccp) $(pkg-config --libs-only-other libosmo-xua) $(pkg-config --libs-only-other libosmo-mtp) $(net-snmp-config --agent-libs 2>&-) -lsctp"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
@@ -5145,4 +5209,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
index e26f6c603b98821dfdeddf93acf2b3bed9a67b51..d7f2f278f834d4c7f557f66edba87bfea5fc17a0 100755 (executable)
@@ -586,9 +586,9 @@ ac_unique_file="rlm_sql.c"
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 subdirs
 OBJEXT
 EXEEXT
@@ -1266,7 +1266,7 @@ 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       build without rlm_sql
+  --without-rlm_sql       build without SQL database functionality
 
 Some influential environment variables:
   CC          C compiler command
@@ -1357,6 +1357,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1752,6 +1757,7 @@ 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;
@@ -1759,13 +1765,22 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2555,21 +2570,21 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-       mysubdirs=
-       if test "x$EXPERIMENTAL" = "xyes"; then
-         for foo in `find ./drivers -name configure -print`; do
-           bar=`echo $foo | sed 's%/configure$%%g'`
-           mysubdirs="$mysubdirs $bar"
-         done
-       else
-         for foo in `cat stable`; do
-           mysubdirs="$mysubdirs ./drivers/$foo"
-         done
-       fi
+mysubdirs=
+if test "x$EXPERIMENTAL" = "xyes"; then
+       for foo in `find ./drivers -name configure -print`; do
+               bar=`echo $foo | sed 's%/configure$%%g'`
+               mysubdirs="$mysubdirs $bar"
+       done
+else
+       for foo in `cat stable`; do
+               mysubdirs="$mysubdirs ./drivers/$foo"
+       done
+fi
 
-               ln -s ../../../install-sh install-sh
+ln -s ../../../install-sh install-sh
 
-                                       ac_aux_dir=
+ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
@@ -2602,41 +2617,65 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 subdirs="$subdirs $mysubdirs"
 
-       rm install-sh
+rm install-sh
 
 
        targetname=rlm_sql
 else
        targetname=
        echo \*\*\* module rlm_sql is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql requires: $fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql requires: $fail." >&2;}
-               if test x"$headersuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $headersuggestion" >&5
-$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
-               fi
-               if test x"$libsuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libsuggestion" >&5
-$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
-               fi
-               targetname=""
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
 
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index eff86651b2a56867b269a23317cd0592ce52b12a..54e8c6baa3f35ebb748f32391c8e7e67ca3a5a41 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_cassandra.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_cassandra
+                          build without Cassandra database support
   --with-cassandra-include-dir=DIR
                           Directory where the cassandra includes may be found
   --with-cassandra-lib-dir=DIR
@@ -1365,6 +1365,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_cassandra
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1806,6 +1811,7 @@ 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;
@@ -1813,41 +1819,50 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_cassandra != xno; then
 
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
 
-        cassandra_include_dir=
+
+
+if test x"$with_rlm_sql_cassandra" != xno; then
+
+
+
+cassandra_include_dir=
 
 # Check whether --with-cassandra-include-dir was given.
 if test "${with_cassandra_include_dir+set}" = set; then :
   withval=$with_cassandra_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need cassandra-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                cassandra_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        cassandra_lib_dir=
+cassandra_lib_dir=
 
 # Check whether --with-cassandra-lib-dir was given.
 if test "${with_cassandra_lib_dir+set}" = set; then :
   withval=$with_cassandra_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need cassandra-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                cassandra_lib_dir="$withval"
                ;;
        esac
@@ -1858,12 +1873,12 @@ fi
 # Check whether --with-cassandra-dir was given.
 if test "${with_cassandra_dir+set}" = set; then :
   withval=$with_cassandra_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need cassandra-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                cassandra_lib_dir="$withval/lib"
                cassandra_include_dir="$withval/include"
                ;;
@@ -1872,7 +1887,7 @@ fi
 
 
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2663,7 +2678,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-        smart_try_dir="$cassandra_lib_dir"
+smart_try_dir="$cassandra_lib_dir"
 
 
 
@@ -2839,16 +2854,18 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-        LDFLAGS="$SMART_LIBS"
-    if test "x$ac_cv_lib_cassandra_cass_statement_new_n" != "xyes"
-    then
+LDFLAGS="$SMART_LIBS"
+if test "x$ac_cv_lib_cassandra_cass_statement_new_n" != "xyes"
+then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cassandra libraries not found. Use --with-cassandra-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: Cassandra libraries not found. Use --with-cassandra-lib-dir=<path>." >&2;}
-       fail="$fail libcassandra (>= 2.0)"
-    fi
+
+fail="$fail libcassandra (>= 2.0)"
+
+fi
 
 
-    smart_try_dir="$cassandra_include_dir"
+smart_try_dir="$cassandra_include_dir"
 
 
 ac_safe=`echo "cassandra.h" | sed 'y%./+-%__pm%'`
@@ -3099,33 +3116,75 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_cassandra_h" != "xyes"; then
+if test "x$ac_cv_header_cassandra_h" != "xyes"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cassandra headers not found. Use --with-cassandra-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: Cassandra headers not found. Use --with-cassandra-include-dir=<path>." >&2;}
-       fail="$fail cassandra.h"
-    fi
-    CFLAGS="$SMART_CPPFLAGS"
 
-    targetname=rlm_sql_cassandra
+fail="$fail cassandra.h"
+
+fi
+CFLAGS="$SMART_CPPFLAGS"
+
+
+       targetname=rlm_sql_cassandra
 else
-    targetname=
-    echo \*\*\* module rlm_sql_cassandra is disabled.
+       targetname=
+       echo \*\*\* module rlm_sql_cassandra is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_cassandra to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_cassandra." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_cassandra." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_cassandra requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_cassandra requires:$fail." >&2;};
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: available from https://github.com/datastax/cpp-driver" >&5
-$as_echo "$as_me: WARNING: available from https://github.com/datastax/cpp-driver" >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_cassandra requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_cassandra requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
+
+if test x"$fail" != x""; then :
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: available from https://github.com/datastax/cpp-driver" >&5
+$as_echo "$as_me: WARNING: available from https://github.com/datastax/cpp-driver" >&2;};
+
+fi
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
index c558218ed685716ef7b1dc3e84515f17e068d871..81ec3d38010f242cf1d7d683cb4157c9f03ce0fd 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_db2.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 sql_ibmdb2_cflags
 sql_ibmdb2_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1267,7 +1267,7 @@ 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 rlm_sql_db2
+  --without-rlm_sql_db2   build without IBM DB2 database support
   --with-ibmdb2-include-dir=DIR
                           Directory where the IBM-DB2 includes may be found
   --with-ibmdb2-lib-dir=DIR
@@ -1363,6 +1363,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_db2
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1804,6 +1809,7 @@ 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;
@@ -1811,43 +1817,52 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_db2 != xno; then
 
-               ibmdb2_include_dir=
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_db2" != xno; then
+
+
+ibmdb2_include_dir=
 
 # Check whether --with-ibmdb2-include-dir was given.
 if test "${with_ibmdb2_include_dir+set}" = set; then :
   withval=$with_ibmdb2_include_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need ibmdb2-include-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       ibmdb2_include_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need ibmdb2-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               ibmdb2_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-               ibmdb2_lib_dir=
+ibmdb2_lib_dir=
 
 # Check whether --with-ibmdb2-lib-dir was given.
 if test "${with_ibmdb2_lib_dir+set}" = set; then :
   withval=$with_ibmdb2_lib_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need ibmdb2-lib-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       ibmdb2_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need ibmdb2-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               ibmdb2_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -1855,21 +1870,21 @@ fi
 # Check whether --with-ibmdb2-dir was given.
 if test "${with_ibmdb2_dir+set}" = set; then :
   withval=$with_ibmdb2_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need ibmdb2-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       ibmdb2_lib_dir="$withval/lib"
-                       ibmdb2_include_dir="$withval/include"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need ibmdb2-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               ibmdb2_lib_dir="$withval/lib"
+               ibmdb2_include_dir="$withval/include"
+               ;;
+       esac
 fi
 
 
-               smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib"
-       ac_ext=c
+smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2833,11 +2848,13 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then
-               fail="$fail libdb2"
-       fi
+if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then
+
+fail="$fail libdb2"
 
-               smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include"
+fi
+
+smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include"
 
 
 ac_safe=`echo "sqlcli.h" | sed 'y%./+-%__pm%'`
@@ -3088,33 +3105,69 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_sqlcli_h" != xyes; then
-               fail="$fail sqlcli.h"
-       fi
+if test "x$ac_cv_header_sqlcli_h" != xyes; then
+
+fail="$fail sqlcli.h"
+
+fi
+
 
        targetname=rlm_sql_db2
 else
        targetname=
        echo \*\*\* module rlm_sql_db2 is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_db2 to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_db2." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_db2." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_db2 requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_db2 requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_db2 requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_db2 requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 sql_ibmdb2_ldflags="$SMART_LIBS"
 sql_ibmdb2_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index bffc92793c79292a7c8944bbc0b897033b4ef223..eec8bf0ebfc7e631170e41988d93b0fb720bec0e 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_firebird.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_firebird
+                          build without Firebird database support
   --with-firebird-include-dir=DIR
                           Directory where the firebird includes may be found
   --with-firebird-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_firebird
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ 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;
@@ -1812,42 +1818,52 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_firebird != xno; then
-               firebird_include_dir=
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_firebird" != xno; then
+
+
+firebird_include_dir=
 
 # Check whether --with-firebird-include-dir was given.
 if test "${with_firebird_include_dir+set}" = set; then :
   withval=$with_firebird_include_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need firebird-include-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       firebird_include_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need firebird-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               firebird_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-               firebird_lib_dir=
+firebird_lib_dir=
 
 # Check whether --with-firebird-lib-dir was given.
 if test "${with_firebird_lib_dir+set}" = set; then :
   withval=$with_firebird_lib_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need firebird-lib-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       firebird_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need firebird-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               firebird_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -1855,21 +1871,21 @@ fi
 # Check whether --with-firebird-dir was given.
 if test "${with_firebird_dir+set}" = set; then :
   withval=$with_firebird_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need firebird-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       firebird_lib_dir="$withval/lib"
-                       firebird_include_dir="$withval/include"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need firebird-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               firebird_lib_dir="$withval/lib"
+               firebird_include_dir="$withval/include"
+               ;;
+       esac
 fi
 
 
-               smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib"
-       ac_ext=c
+smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2833,11 +2849,13 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then
-               fail="$fail libfbclient"
-       fi
+if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then
+
+fail="$fail libfbclient"
 
-               smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include"
+fi
+
+smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include"
 
 
 ac_safe=`echo "ibase.h" | sed 'y%./+-%__pm%'`
@@ -3088,33 +3106,69 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_ibase_h" != xyes; then
-               fail="$fail ibase.h"
-       fi
+if test "x$ac_cv_header_ibase_h" != xyes; then
+
+fail="$fail ibase.h"
+
+fi
+
 
        targetname=rlm_sql_firebird
 else
        targetname=
        echo \*\*\* module rlm_sql_firebird is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_firebird to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_firebird." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_firebird." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_firebird requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_firebird requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_firebird requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_firebird requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index b56b4677941004c5a8b3cf78d0f7fdc339791e4b..038c9b0521a02b82e079d90769b0ae20b819aa87 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_freetds.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_freetds
+                          build without MS-SQL and Sybase database support
   --with-freetds-include-dir=DIR
                           Directory where the freetds includes may be found
   --with-freetds-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_freetds
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ 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;
@@ -1812,41 +1818,50 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_freetds != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_freetds" != xno; then
+
 
 
-        freetds_include_dir=
+freetds_include_dir=
 
 # Check whether --with-freetds-include-dir was given.
 if test "${with_freetds_include_dir+set}" = set; then :
   withval=$with_freetds_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need freetds-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                freetds_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        freetds_lib_dir=
+freetds_lib_dir=
 
 # Check whether --with-freetds-lib-dir was given.
 if test "${with_freetds_lib_dir+set}" = set; then :
   withval=$with_freetds_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need freetds-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                freetds_lib_dir="$withval"
                ;;
        esac
@@ -1857,12 +1872,12 @@ fi
 # Check whether --with-freetds-dir was given.
 if test "${with_freetds_dir+set}" = set; then :
   withval=$with_freetds_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need freetds-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                freetds_lib_dir="$withval/lib"
                freetds_include_dir="$withval/include"
                ;;
@@ -1871,8 +1886,8 @@ fi
 
 
 
-    smart_try_dir="$freetds_include_dir"
-    ac_ext=c
+smart_try_dir="$freetds_include_dir"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2912,14 +2927,16 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_ctpublic_h" != "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetds headers not found. Use --with-freetds-include-dir=<path>." >&5
+if test "x$ac_cv_header_ctpublic_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetds headers not found. Use --with-freetds-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: freetds headers not found. Use --with-freetds-include-dir=<path>." >&2;}
-      fail="$fail ctpublic.h"
-    fi
+
+fail="$fail ctpublic.h"
+
+fi
 
 
-        smart_try_dir="$freetds_lib_dir"
+smart_try_dir="$freetds_lib_dir"
 
 
 sm_lib_safe=`echo "ct" | sed 'y%./+-%__p_%'`
@@ -3094,36 +3111,72 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_ct_ct_command" != "xyes"
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetds libraries not found. Use --with-freetds-lib-dir=<path>." >&5
+if test "x$ac_cv_lib_ct_ct_command" != "xyes"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetds libraries not found. Use --with-freetds-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: freetds libraries not found. Use --with-freetds-lib-dir=<path>." >&2;}
-      fail="$fail libct"
-    fi
 
-    targetname=rlm_sql_freetds
+fail="$fail libct"
+
+fi
+
+
+       targetname=rlm_sql_freetds
 else
-    targetname=
-    echo \*\*\* module rlm_sql_freetds is disabled.
+       targetname=
+       echo \*\*\* module rlm_sql_freetds is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_freetds to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_freetds." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_freetds." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_freetds requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_freetds requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_freetds requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_freetds requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index a0bd76c3699ba1c4c745e730cf68f211a4aea85f..8a4cb01c787dad1cb50679dd53d32a1c4aa301ef 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_mysql.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 MYSQL_CONFIG
 OBJEXT
 EXEEXT
@@ -1269,7 +1269,7 @@ 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 rlm_sql_mysql
+  --without-rlm_sql_mysql build without MySQL and MariaDB database support
   --with-mysql-include-dir=DIR
                           Directory where the mysql includes may be found
   --with-mysql-lib-dir=DIR
@@ -1366,6 +1366,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_mysql
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1807,49 +1812,58 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # Check whether --with-rlm_sql_mysql was given.
 if test "${with_rlm_sql_mysql+set}" = set; then :
   withval=$with_rlm_sql_mysql;
 fi
 
 
-ac_config_headers="$ac_config_headers config.h"
-
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_mysql != xno; then
 
-               mysql_include_dir=
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_mysql" != xno; then
+
+
+
+mysql_include_dir=
 
 # Check whether --with-mysql-include-dir was given.
 if test "${with_mysql_include_dir+set}" = set; then :
   withval=$with_mysql_include_dir; case "$withval" in
-               no)
+       no)
                as_fn_error $? "Need mysql-include-dir" "$LINENO" 5
                ;;
-               yes)
+       yes)
                ;;
-               *)
+       *)
                mysql_include_dir="$withval"
                ;;
        esac
 fi
 
 
-               mysql_lib_dir=
+mysql_lib_dir=
 
 # Check whether --with-mysql-lib-dir was given.
 if test "${with_mysql_lib_dir+set}" = set; then :
   withval=$with_mysql_lib_dir; case "$withval" in
-               no)
+       no)
                as_fn_error $? "Need mysql-lib-dir" "$LINENO" 5
                ;;
-               yes)
+       yes)
                ;;
-               *)
+       *)
                mysql_lib_dir="$withval"
                ;;
        esac
@@ -1860,12 +1874,12 @@ fi
 # Check whether --with-mysql-dir was given.
 if test "${with_mysql_dir+set}" = set; then :
   withval=$with_mysql_dir; case "$withval" in
-               no)
+       no)
                as_fn_error $? "Need mysql-dir" "$LINENO" 5
                ;;
-               yes)
+       yes)
                ;;
-               *)
+       *)
                mysql_lib_dir="$withval/lib"
                mysql_include_dir="$withval/include"
                ;;
@@ -1873,22 +1887,22 @@ if test "${with_mysql_dir+set}" = set; then :
 fi
 
 
-               mysql_with_threads=yes
+mysql_with_threads=yes
 
 # Check whether --with-threads was given.
 if test "${with_threads+set}" = set; then :
   withval=$with_threads; case "$withval" in
-               no)
+       no)
                mysql_with_threads=no
                ;;
-               *)
+       *)
                ;;
        esac
 fi
 
 
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2677,7 +2691,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       # Extract the first word of "mysql_config", so it can be a program name with args.
+# Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -2718,12 +2732,12 @@ fi
 
 
 
-                       if test "x$MYSQL_CONFIG" = "xyes"; then
-               mysql_libs="$(mysql_config --libs_r)"
-               old_LIBS="$LIBS"
-               LIBS="$mysql_libs $LIBS"
+if test "x$MYSQL_CONFIG" = "xyes"; then
+       mysql_libs="$(mysql_config --libs_r)"
+       old_LIBS="$LIBS"
+       LIBS="$mysql_libs $LIBS"
 
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient_r (using mysql_config)" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient_r (using mysql_config)" >&5
 $as_echo_n "checking for mysql_init in -lmysqlclient_r (using mysql_config)... " >&6; }
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2750,26 +2764,26 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-               LIBS="$old_LIBS"
-               if test "x$have_libmysqlclient_r" = "xyes"; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+       LIBS="$old_LIBS"
+       if test "x$have_libmysqlclient_r" = "xyes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-                       have_a_libmysqlclient='yes'
-                       SMART_LIBS="$mysql_libs $SMART_LIBS"
-               else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+               have_a_libmysqlclient='yes'
+               SMART_LIBS="$mysql_libs $SMART_LIBS"
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-               fi
+       fi
 
-                               if test "x$have_a_libmysqlclient" != "xyes"; then
-                       mysql_libs="$(mysql_config --libs)"
-                       old_LIBS="$LIBS"
-                       LIBS="$mysql_libs $LIBS"
+               if test "x$have_a_libmysqlclient" != "xyes"; then
+               mysql_libs="$(mysql_config --libs)"
+               old_LIBS="$LIBS"
+               LIBS="$mysql_libs $LIBS"
 
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient (using mysql_config)" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient (using mysql_config)" >&5
 $as_echo_n "checking for mysql_init in -lmysqlclient (using mysql_config)... " >&6; }
-                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2793,22 +2807,22 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-                       LIBS="$old_LIBS"
-                       if test "x$have_libmysqlclient" = "xyes"; then
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               LIBS="$old_LIBS"
+               if test "x$have_libmysqlclient" = "xyes"; then
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-                               have_a_libmysqlclient=yes
-                               SMART_LIBS="$mysql_libs $SMART_LIBS"
-                       else
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                       have_a_libmysqlclient=yes
+                       SMART_LIBS="$mysql_libs $SMART_LIBS"
+               else
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                       fi
                fi
        fi
+fi
 
-               if test "x$have_a_libmysqlclient" != "xyes"; then
-           smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql"
+if test "x$have_a_libmysqlclient" != "xyes"; then
+       smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql"
 
 
 sm_lib_safe=`echo "mysqlclient_r" | sed 'y%./+-%__p_%'`
@@ -2983,13 +2997,13 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-           if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then
-                       have_a_libmysqlclient='yes'
-           fi
+       if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then
+               have_a_libmysqlclient='yes'
        fi
+fi
 
-               if test "x$have_a_libmysqlclient" != "xyes"; then
-           smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql"
+if test "x$have_a_libmysqlclient" != "xyes"; then
+       smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql"
 
 
 sm_lib_safe=`echo "mysqlclient" | sed 'y%./+-%__p_%'`
@@ -3164,24 +3178,26 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-           if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then
-                       have_a_libmysqlclient='yes'
-           fi
+       if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then
+               have_a_libmysqlclient='yes'
        fi
+fi
 
-       if test "x$have_a_libmysqlclient" != "xyes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MySQL libraries not found. Use --with-mysql-lib-dir=<path>." >&5
+if test "x$have_a_libmysqlclient" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MySQL libraries not found. Use --with-mysql-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: MySQL libraries not found. Use --with-mysql-lib-dir=<path>." >&2;}
-               fail="$fail libmysqlclient || libmysqlclient_r"
-       fi
 
-                if test "x$MYSQL_CONFIG" = "xyes"; then
-               mod_cflags="$(mysql_config --cflags)"
-               old_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS $mod_cflags"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql.h (using mysql_config --cflags)" >&5
+fail="$fail libmysqlclient || libmysqlclient_r"
+
+fi
+
+if test "x$MYSQL_CONFIG" = "xyes"; then
+       mod_cflags="$(mysql_config --cflags)"
+       old_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS $mod_cflags"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql.h (using mysql_config --cflags)" >&5
 $as_echo_n "checking for mysql.h (using mysql_config --cflags)... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mysql.h>
 int
@@ -3196,22 +3212,22 @@ if ac_fn_c_try_compile "$LINENO"; then :
   have_mysql_h=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-               if test "x$have_mysql_h" = "xyes"; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+       if test "x$have_mysql_h" = "xyes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_MYSQL_H /**/" >>confdefs.h
 
-                       SMART_CPPFLAGS="$SMART_CPPFLAGS $mod_cflags"
-               else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+               SMART_CPPFLAGS="$SMART_CPPFLAGS $mod_cflags"
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-                       mod_cflags="$(mysql_config --include)"
-                       CFLAGS="$old_CFLAGS $mod_cflags"
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql.h (using mysql_config --include)" >&5
+               mod_cflags="$(mysql_config --include)"
+               CFLAGS="$old_CFLAGS $mod_cflags"
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql.h (using mysql_config --include)" >&5
 $as_echo_n "checking for mysql.h (using mysql_config --include)... " >&6; }
-                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mysql.h>
 int
@@ -3226,23 +3242,23 @@ if ac_fn_c_try_compile "$LINENO"; then :
   have_mysql_h=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-                       if test "x$have_mysql_h" = "xyes"; then
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               if test "x$have_mysql_h" = "xyes"; then
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_MYSQL_H /**/" >>confdefs.h
 
-                               SMART_CPPFLAGS="$SMART_CPPFLAGS $mod_cflags"
-                       else
-                               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                       SMART_CPPFLAGS="$SMART_CPPFLAGS $mod_cflags"
+               else
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                       fi
                fi
-               CFLAGS="$old_CFLAGS"
-    fi
+       fi
+       CFLAGS="$old_CFLAGS"
+fi
 
-    if test "x$have_mysql_h" != "xyes"; then
-               smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include"
+if test "x$have_mysql_h" != "xyes"; then
+       smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include"
 
 
 ac_safe=`echo "mysql/mysql.h" | sed 'y%./+-%__pm%'`
@@ -3493,40 +3509,78 @@ fi
 
 smart_prefix=
 
-               if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then
+       if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then
 
 $as_echo "#define HAVE_MYSQL_MYSQL_H /**/" >>confdefs.h
 
-               else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MySQL headers not found. Use --with-mysql-include-dir=<path>." >&5
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MySQL headers not found. Use --with-mysql-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: MySQL headers not found. Use --with-mysql-include-dir=<path>." >&2;}
-               fail="$fail mysql.h"
-               fi
-    fi
 
-    targetname=rlm_sql_mysql
+fail="$fail mysql.h"
+
+       fi
+fi
+
+
+       targetname=rlm_sql_mysql
 else
-    targetname=
-    echo \*\*\* module rlm_sql_mysql is disabled.
+       targetname=
+       echo \*\*\* module rlm_sql_mysql is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_mysql to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_mysql." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_mysql." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_mysql requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_mysql requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_mysql requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_mysql requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
+ac_config_headers="$ac_config_headers config.h"
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index fdc84d93a3a7325f9ae5774296aa76f45ee9195d..8a4819db6710c1e8f1943eec20ab01af60588646 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_oracle.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_oracle
+                          build without Oracle database support
   --with-oracle-include-dir=DIR
                           Directory where the oracle includes may be found
   --with-oracle-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_oracle
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ 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;
@@ -1813,43 +1819,53 @@ fi
 
 
 oracle_supported_versions="19 18 12 11"
-fail=
+
 mod_ldflags=
 mod_cflags=
 
-if test x$with_rlm_sql_oracle != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_oracle" != xno; then
 
 
-        oracle_include_dir=
+
+oracle_include_dir=
 
 # Check whether --with-oracle-include-dir was given.
 if test "${with_oracle_include_dir+set}" = set; then :
   withval=$with_oracle_include_dir; case "$withval" in
-           no)
-           as_fn_error $? "Need oracle-include-dir" "$LINENO" 5
-           ;;
-           yes)
-           ;;
-           *)
-           oracle_include_dir="$withval"
-           ;;
+       no)
+               as_fn_error $? "Need oracle-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               oracle_include_dir="$withval"
+               ;;
        esac
 fi
 
 
-        oracle_lib_dir=
+oracle_lib_dir=
 
 # Check whether --with-oracle-lib-dir was given.
 if test "${with_oracle_lib_dir+set}" = set; then :
   withval=$with_oracle_lib_dir; case "$withval" in
-           no)
-           as_fn_error $? "Need oracle-lib-dir" "$LINENO" 5
-           ;;
-           yes)
-           ;;
-           *)
-           oracle_lib_dir="$withval"
-           ;;
+       no)
+               as_fn_error $? "Need oracle-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               oracle_lib_dir="$withval"
+               ;;
        esac
 fi
 
@@ -1858,27 +1874,27 @@ fi
 # Check whether --with-oracle-dir was given.
 if test "${with_oracle_dir+set}" = set; then :
   withval=$with_oracle_dir; case "$withval" in
-           no)
-           as_fn_error $? "Need oracle-dir" "$LINENO" 5
-           ;;
-           yes)
-           ;;
-           *)
-           oracle_lib_dir="$withval/lib"
-           oracle_include_dir="$withval/include"
-           ;;
+       no)
+               as_fn_error $? "Need oracle-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               oracle_lib_dir="$withval/lib"
+               oracle_include_dir="$withval/include"
+               ;;
        esac
 fi
 
 
 
-    smart_try_dir="$oracle_include_dir /usr/local/instaclient/include"
+smart_try_dir="$oracle_include_dir /usr/local/instaclient/include"
 
-    if test "x$ORACLE_HOME" != "x"; then
+if test "x$ORACLE_HOME" != "x"; then
        smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include"
-    fi
+fi
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2918,63 +2934,65 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_oci_h" != "xyes"; then
+if test "x$ac_cv_header_oci_h" != "xyes"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: oracle headers not found. Use --with-oracle-include-dir=<path> or set ORACLE_HOME." >&5
 $as_echo "$as_me: WARNING: oracle headers not found. Use --with-oracle-include-dir=<path> or set ORACLE_HOME." >&2;}
-       fail="$fail oci.h"
-    fi
 
+fail="$fail oci.h"
+
+fi
 
-    old_LIBS="$LIBS"
 
-    if test "x$oracle_lib_dir" != "x" ; then
+old_LIBS="$LIBS"
+
+if test "x$oracle_lib_dir" != "x" ; then
        lib_path="${oracle_lib_dir} "
-    elif test "x$ORACLE_HOME" != "x" ; then
+elif test "x$ORACLE_HOME" != "x" ; then
        lib_path="${ORACLE_HOME}/lib "
-    fi
+fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Oracle supported versions: ${oracle_supported_versions}" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Oracle supported versions: ${oracle_supported_versions}" >&5
 $as_echo "$as_me: WARNING: Oracle supported versions: ${oracle_supported_versions}" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Oracle version >= 12 needs -laio" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Oracle version >= 12 needs -laio" >&5
 $as_echo "$as_me: WARNING: Oracle version >= 12 needs -laio" >&2;}
 
-    for path in $lib_path "/usr/local/instaclient/lib" "" "/opt/lib"; do
+for path in $lib_path "/usr/local/instaclient/lib" "" "/opt/lib"; do
        for oracle_version in ${oracle_supported_versions} ""; do
-           if test "$path" != ""; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIInitialize in nnz${oracle_version} in $path" >&5
+               if test "$path" != ""; then
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIInitialize in nnz${oracle_version} in $path" >&5
 $as_echo_n "checking for OCIInitialize in nnz${oracle_version} in $path... " >&6; }
-           else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIInitialize in nnz${oracle_version}" >&5
+               else
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIInitialize in nnz${oracle_version}" >&5
 $as_echo_n "checking for OCIInitialize in nnz${oracle_version}... " >&6; }
-           fi
+               fi
 
-           LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}"
+               LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}"
 
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <oci.h>
 
-               static OCIEnv           *p_env;
-               static OCIError         *p_err;
-               static OCISvcCtx        *p_svc;
-               static OCIStmt          *p_sql;
-               static OCIDefine        *p_dfn    = (OCIDefine *) 0;
-               static OCIBind          *p_bnd    = (OCIBind *) 0;
+                       static OCIEnv           *p_env;
+                       static OCIError         *p_err;
+                       static OCISvcCtx        *p_svc;
+                       static OCIStmt          *p_sql;
+                       static OCIDefine        *p_dfn    = (OCIDefine *) 0;
+                       static OCIBind          *p_bnd    = (OCIBind *) 0;
 
 int
 main ()
 {
 
-               int             p_bvi;
-               char            p_sli[20];
-               int             rc;
-               char            errbuf[100];
-               int             errcode;
+                       int             p_bvi;
+                       char            p_sli[20];
+                       int             rc;
+                       char            errbuf[100];
+                       int             errcode;
 
-               rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
-                                  (dvoid * (*)(dvoid *, size_t)) 0,
-                                  (dvoid * (*)(dvoid *, dvoid *, size_t))0,
-                                  (void (*)(dvoid *, dvoid *)) 0 );
+                       rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
+                                          (dvoid * (*)(dvoid *, size_t)) 0,
+                                          (dvoid * (*)(dvoid *, dvoid *, size_t))0,
+                                          (void (*)(dvoid *, dvoid *)) 0 );
 
 
   ;
@@ -2986,50 +3004,88 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           if test "x$mod_ldflags" != "x"; then
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+
+               if test "x$mod_ldflags" != "x"; then
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                   break
-           fi
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                       break
+               fi
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        done
 
        if test "x$mod_ldflags" != "x"; then
                break
        fi
-    done
+done
 
-    LIBS="$old_LIBS"
+LIBS="$old_LIBS"
 
-    if test "x$mod_ldflags" = "x"; then
+if test "x$mod_ldflags" = "x"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: oracle libraries not found.  Use --with-oracle-lib-dir=<path> or set ORACLE_HOME." >&5
 $as_echo "$as_me: WARNING: oracle libraries not found.  Use --with-oracle-lib-dir=<path> or set ORACLE_HOME." >&2;}
-       fail="$fail libclntsh libnnz[9-12]"
-    fi
 
-    targetname=rlm_sql_oracle
+fail="$fail libclntsh libnnz[9-12]"
+]
+fi
+
+
+       targetname=rlm_sql_oracle
 else
-    targetname=
-    echo \*\*\* module rlm_sql_oracle is disabled.
+       targetname=
+       echo \*\*\* module rlm_sql_oracle is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_oracle to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_oracle." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_oracle." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_oracle requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_oracle requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_oracle requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_oracle requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 8c745dde1840e6a2e4ab2453ab406d771d5f99b6..79acc32ed57f0a6860831ef0edd2760bdc26ad36 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_postgresql.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1267,9 +1267,11 @@ 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 rlm_sql_postgresql
-  --with-rlm-sql-postgresql-lib-dir=DIR       Directory for PostgreSQL library files
-  --with-rlm-sql-postgresql-include-dir=DIR   Directory for PostgreSQL include files
+                          build without PostgreSQL database support
+  --with-rlm-sql-postgresql-lib-dir=DIR
+                          Directory for PostgreSQL library files
+  --with-rlm-sql-postgresql-include-dir=DIR
+                          Directory for PostgreSQL include files
 
 Some influential environment variables:
   CC          C compiler command
@@ -1360,6 +1362,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_postgresql
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1868,6 +1875,7 @@ 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;
@@ -1875,13 +1883,22 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_postgresql != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_postgresql" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2671,43 +2688,41 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-               rlm_sql_postgresql_lib_dir=
+rlm_sql_postgresql_lib_dir=
 
 # Check whether --with-rlm-sql-postgresql-lib-dir was given.
 if test "${with_rlm_sql_postgresql_lib_dir+set}" = set; then :
-  withval=$with_rlm_sql_postgresql_lib_dir;  case "$withval" in
-           no)
+  withval=$with_rlm_sql_postgresql_lib_dir; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-sql-postgresql-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                rlm_sql_postgresql_lib_dir="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-               rlm_sql_postgresql_include_dir=
+rlm_sql_postgresql_include_dir=
 
 # Check whether --with-rlm-sql-postgresql-include-dir was given.
 if test "${with_rlm_sql_postgresql_include_dir+set}" = set; then :
-  withval=$with_rlm_sql_postgresql_include_dir;  case "$withval" in
-           no)
+  withval=$with_rlm_sql_postgresql_include_dir; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-sql-postgresql-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                rlm_sql_postgresql_include_dir="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-       smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql"
+smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql"
 
 
 
@@ -2959,21 +2974,23 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
-               fail="$fail libpq-fe.h"
-       else
-               CPPFLAGS="$SMART_CPPFLAGS"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_SINGLE_TUPLE" >&5
+if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
+
+fail="$fail libpq-fe.h"
+
+else
+       CPPFLAGS="$SMART_CPPFLAGS"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_SINGLE_TUPLE" >&5
 $as_echo_n "checking for PGRES_SINGLE_TUPLE... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libpq-fe.h>
 int
 main ()
 {
 
-                   if (PGRES_SINGLE_TUPLE) return 0;
-                   return 1;
+               if (PGRES_SINGLE_TUPLE) return 0;
+               return 1;
 
   ;
   return 0;
@@ -2984,28 +3001,28 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 $as_echo "#define HAVE_PGRES_SINGLE_TUPLE 1" >>confdefs.h
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_COPY_BOTH" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_COPY_BOTH" >&5
 $as_echo_n "checking for PGRES_COPY_BOTH... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libpq-fe.h>
 int
 main ()
 {
 
-                   if (PGRES_COPY_BOTH) return 0;
-                   return 1;
+               if (PGRES_COPY_BOTH) return 0;
+               return 1;
 
   ;
   return 0;
@@ -3016,28 +3033,28 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 $as_echo "#define HAVE_PGRES_COPY_BOTH 1" >>confdefs.h
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_PIPELINE_SYNC" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PGRES_PIPELINE_SYNC" >&5
 $as_echo_n "checking for PGRES_PIPELINE_SYNC... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libpq-fe.h>
 int
 main ()
 {
 
-                   if (PGRES_PIPELINE_SYNC) return 0;
-                   return 1;
+               if (PGRES_PIPELINE_SYNC) return 0;
+               return 1;
 
   ;
   return 0;
@@ -3048,19 +3065,19 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 $as_echo "#define HAVE_PGRES_PIPELINE_SYNC 1" >>confdefs.h
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       fi
+fi
 
-       smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib"
+smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib"
 
 
 sm_lib_safe=`echo "pq" | sed 'y%./+-%__p_%'`
@@ -3235,12 +3252,14 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then
-               fail="$fail libpq"
-       fi
-       for ac_func in \
-               PQinitOpenSSL \
-               PQinitSSL \
+if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then
+
+fail="$fail libpq"
+
+fi
+for ac_func in \
+       PQinitOpenSSL \
+       PQinitSSL \
 
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -3253,37 +3272,64 @@ _ACEOF
 fi
 done
 
+
+
        targetname=rlm_sql_postgresql
 else
        targetname=
        echo \*\*\* module rlm_sql_postgresql is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_postgresql to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_postgresql." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_postgresql." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_postgresql requires: $fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_postgresql requires: $fail." >&2;}
-               if test x"$headersuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $headersuggestion" >&5
-$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
-               fi
-               if test x"$libsuggestion" != x; then
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libsuggestion" >&5
-$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
-               fi
-               targetname=""
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_postgresql requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files all.mk"
index c7c9261e6bc35499553b2780f8ed0d40d95cbb7c..7455812318dc179bd3e71db4c1316b9b1a8f2ad4 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_sqlite.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_sqlite
+                          build without SQLite database support
   --with-sqlite-include-dir=DIR
                           Directory where the sqlite includes may be found
   --with-sqlite-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_sqlite
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1926,6 +1931,7 @@ 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;
@@ -1933,41 +1939,50 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_sqlite != xno; then
 
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
 
-        sqlite_include_dir=
+
+
+if test x"$with_rlm_sql_sqlite" != xno; then
+
+
+
+sqlite_include_dir=
 
 # Check whether --with-sqlite-include-dir was given.
 if test "${with_sqlite_include_dir+set}" = set; then :
   withval=$with_sqlite_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need sqlite-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                sqlite_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        sqlite_lib_dir=
+sqlite_lib_dir=
 
 # Check whether --with-sqlite-lib-dir was given.
 if test "${with_sqlite_lib_dir+set}" = set; then :
   withval=$with_sqlite_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need sqlite-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                sqlite_lib_dir="$withval"
                ;;
        esac
@@ -1978,12 +1993,12 @@ fi
 # Check whether --with-sqlite-dir was given.
 if test "${with_sqlite_dir+set}" = set; then :
   withval=$with_sqlite_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need sqlite-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                sqlite_lib_dir="$withval/lib"
                sqlite_include_dir="$withval/include"
                ;;
@@ -1992,7 +2007,7 @@ fi
 
 
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2783,7 +2798,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-        smart_try_dir="$sqlite_lib_dir"
+smart_try_dir="$sqlite_lib_dir"
 
 
 
@@ -2959,13 +2974,16 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-        LDFLAGS="$SMART_LIBS"
-    if test "x$ac_cv_lib_sqlite3_sqlite3_open" != "xyes"
-    then
+
+LDFLAGS="$SMART_LIBS"
+if test "x$ac_cv_lib_sqlite3_sqlite3_open" != "xyes"
+then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sqlite libraries not found. Use --with-sqlite-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: Sqlite libraries not found. Use --with-sqlite-lib-dir=<path>." >&2;}
-       fail="$fail libsqlite3"
-    else
+
+fail="$fail libsqlite3"
+
+else
                for ac_func in \
                sqlite3_prepare_v2 \
                sqlite3_open_v2 \
@@ -2984,10 +3002,10 @@ _ACEOF
 fi
 done
 
-    fi
+fi
 
 
-    smart_try_dir="$sqlite_include_dir"
+smart_try_dir="$sqlite_include_dir"
 
 
 ac_safe=`echo "sqlite3.h" | sed 'y%./+-%__pm%'`
@@ -3238,13 +3256,17 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_sqlite3_h" != "xyes"; then
+
+if test "x$ac_cv_header_sqlite3_h" != "xyes"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sqlite headers not found. Use --with-sqlite-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: Sqlite headers not found. Use --with-sqlite-include-dir=<path>." >&2;}
-       fail="$fail sqlite.h"
-    fi
-    CFLAGS="$SMART_CPPFLAGS"
-    ac_fn_c_check_type "$LINENO" "sqlite3_int64" "ac_cv_type_sqlite3_int64" "#include <sqlite3.h>
+
+fail="$fail sqlite.h"
+
+fi
+
+CFLAGS="$SMART_CPPFLAGS"
+ac_fn_c_check_type "$LINENO" "sqlite3_int64" "ac_cv_type_sqlite3_int64" "#include <sqlite3.h>
 "
 if test "x$ac_cv_type_sqlite3_int64" = xyes; then :
 
@@ -3256,32 +3278,64 @@ _ACEOF
 fi
 
 
-    targetname=rlm_sql_sqlite
+
+       targetname=rlm_sql_sqlite
 else
-    targetname=
-    echo \*\*\* module rlm_sql_sqlite is disabled.
+       targetname=
+       echo \*\*\* module rlm_sql_sqlite is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_sqlite to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_sqlite." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_sqlite." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_sqlite requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_sqlite requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_sqlite requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_sqlite requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
-ac_config_headers="$ac_config_headers config.h"
-
 
+ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files all.mk"
 
index 51b0d34f4d4f1c79e742aa4ee27cb3a6501cd23b..84810665229341f0fc0e61809e11a11aeb61eef9 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_sql_unixodbc.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1268,7 +1268,7 @@ 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 rlm_sql_unixodbc
+                          build without ODBC database connectivity
   --with-unixodbc-include-dir=DIR
                           Directory where the unixODBC includes may be found
   --with-unixodbc-lib-dir=DIR
@@ -1364,6 +1364,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_sql_unixodbc
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1805,6 +1810,7 @@ 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;
@@ -1812,43 +1818,52 @@ fi
 
 
 
-fail=
 SMART_LIBS=
 SMART_CLFAGS=
 
-if test x$with_rlm_sql_unixodbc != xno; then
 
-               unixodbc_include_dir=
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_sql_unixodbc" != xno; then
+
+
+unixodbc_include_dir=
 
 # Check whether --with-unixodbc-include-dir was given.
 if test "${with_unixodbc_include_dir+set}" = set; then :
   withval=$with_unixodbc_include_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need unixodbc-include-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       unixodbc_include_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need unixodbc-include-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               unixodbc_include_dir="$withval"
+               ;;
+       esac
 fi
 
 
-               unixodbc_lib_dir=
+unixodbc_lib_dir=
 
 # Check whether --with-unixodbc-lib-dir was given.
 if test "${with_unixodbc_lib_dir+set}" = set; then :
   withval=$with_unixodbc_lib_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need unixodbc-lib-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       unixodbc_lib_dir="$withval"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need unixodbc-lib-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               unixodbc_lib_dir="$withval"
+               ;;
+       esac
 fi
 
 
@@ -1856,21 +1871,21 @@ fi
 # Check whether --with-unixodbc-dir was given.
 if test "${with_unixodbc_dir+set}" = set; then :
   withval=$with_unixodbc_dir; case "$withval" in
-                   no)
-                       as_fn_error $? "Need unixodbc-dir" "$LINENO" 5
-                       ;;
-                   yes)
-                       ;;
-                   *)
-                       unixodbc_lib_dir="$withval/lib"
-                       unixodbc_include_dir="$withval/include"
-                       ;;
-               esac
+       no)
+               as_fn_error $? "Need unixodbc-dir" "$LINENO" 5
+               ;;
+       yes)
+               ;;
+       *)
+               unixodbc_lib_dir="$withval/lib"
+               unixodbc_include_dir="$withval/include"
+               ;;
+       esac
 fi
 
 
-               smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib"
-       ac_ext=c
+smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2834,11 +2849,13 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then
-               fail="$fail libodbc"
-       fi
+if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then
+
+fail="$fail libodbc"
 
-               smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include"
+fi
+
+smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include"
 
 
 ac_safe=`echo "sql.h" | sed 'y%./+-%__pm%'`
@@ -3089,33 +3106,69 @@ fi
 
 smart_prefix=
 
-       if test "x$ac_cv_header_sql_h" != xyes; then
-               fail="$fail sql.h"
-       fi
+if test "x$ac_cv_header_sql_h" != xyes; then
+
+fail="$fail sql.h"
+
+fi
+
 
        targetname=rlm_sql_unixodbc
 else
        targetname=
        echo \*\*\* module rlm_sql_unixodbc is disabled.
+
+
+fr_status="disabled"
+
 fi
 
-if test "x$fail" != x; then
-       if test "x${enable_strict_dependencies}" = xyes; then
+if test x"$fail" != x""; then
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_sql_unixodbc to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_sql_unixodbc." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_sql_unixodbc." >&2;}
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_unixodbc requires:$fail." >&5
-$as_echo "$as_me: WARNING: FAILURE: rlm_sql_unixodbc requires:$fail." >&2;};
-               targetname=
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_sql_unixodbc requires: $fail." >&5
+$as_echo "$as_me: WARNING: FAILURE: rlm_sql_unixodbc requires: $fail." >&2;};
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
 
 
+
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index fb260b13f1b1f7f4b803de7fdeb723edb131bf84..d599e332cae0058f5a165c4964c84377cd1e6beb 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_unbound.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1266,9 +1266,11 @@ 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 rlm_unbound
-  --with-rlm-unbound-lib-dir=DIR       directory for libunbound library files
-  --with-rlm-unbound-include-dir=DIR   directory for libunbound include files
+  --without-rlm_unbound   build without DNS lookups with unbound
+  --with-rlm-unbound-lib-dir=DIR
+                          directory for libunbound library files
+  --with-rlm-unbound-include-dir=DIR
+                          directory for libunbound include files
 
 Some influential environment variables:
   CC          C compiler command
@@ -1359,6 +1361,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_unbound
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1800,6 +1807,7 @@ 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;
@@ -1807,45 +1815,54 @@ fi
 
 
 
-if test x$with_rlm_unbound != xno; then
-               rlm_unbound_lib_dir=
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_unbound" != xno; then
+
+
+rlm_unbound_lib_dir=
 
 # Check whether --with-rlm-unbound-lib-dir was given.
 if test "${with_rlm_unbound_lib_dir+set}" = set; then :
-  withval=$with_rlm_unbound_lib_dir;  case "$withval" in
-           no)
+  withval=$with_rlm_unbound_lib_dir; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-unbound-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                rlm_unbound_lib_dir="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-               rlm_unbound_include_dir=
+rlm_unbound_include_dir=
 
 # Check whether --with-rlm-unbound-include-dir was given.
 if test "${with_rlm_unbound_include_dir+set}" = set; then :
-  withval=$with_rlm_unbound_include_dir;  case "$withval" in
-           no)
+  withval=$with_rlm_unbound_include_dir; case "$withval" in
+       no)
                as_fn_error $? "Need rlm-unbound-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                rlm_unbound_include_dir="$withval"
                ;;
-         esac
-
+       esac
 fi
 
 
-       smart_try_dir=$rlm_unbound_lib_dir
-       ac_ext=c
+smart_try_dir=$rlm_unbound_lib_dir
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2809,11 +2826,13 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-       if test "x$ac_cv_lib_unbound_ub_ctx_create_ub_event" != "xyes"; then
-               fail="$fail libunbound"
-       fi
+if test "x$ac_cv_lib_unbound_ub_ctx_create_ub_event" != "xyes"; then
 
-       smart_try_dir=$rlm_unbound_include_dir
+fail="$fail libunbound"
+
+fi
+
+smart_try_dir=$rlm_unbound_include_dir
 
 
 ac_safe=`echo "unbound.h" | sed 'y%./+-%__pm%'`
@@ -3064,11 +3083,13 @@ fi
 
 smart_prefix=
 
-       if test "$ac_cv_header_unbound_h" != "yes"; then
-               fail="$fail unbound.h"
-       fi
+if test "$ac_cv_header_unbound_h" != "yes"; then
 
-       smart_try_dir=$rlm_unbound_include_dir
+fail="$fail unbound.h"
+
+fi
+
+smart_try_dir=$rlm_unbound_include_dir
 
 
 ac_safe=`echo "unbound-event.h" | sed 'y%./+-%__pm%'`
@@ -3319,28 +3340,63 @@ fi
 
 smart_prefix=
 
-       if test "$ac_cv_header_unboundmevent_h" != "yes"; then
-               fail="$fail unbound-event.h"
-       fi
+if test "$ac_cv_header_unboundmevent_h" != "yes"; then
+
+fail="$fail unbound-event.h"
+
+fi
+
 
        targetname=rlm_unbound
 else
        targetname=
        echo \*\*\* module rlm_unbound is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_unbound to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_unbound." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_unbound." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_unbound requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_unbound requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="${SMART_LIBS}"
 mod_cflags="${SMART_CFLAGS}"
 
@@ -3349,8 +3405,6 @@ mod_cflags="${SMART_CFLAGS}"
 
 ac_config_headers="$ac_config_headers config.h"
 
-
-
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
index 0c8eb1e22403dc0c1dce3f34fc12927821c229c0..c3a7ebd48500660f0a998dbf8a51d9f33baee1bc 100755 (executable)
@@ -622,9 +622,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 EGREP
 GREP
 CPP
@@ -1305,7 +1305,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_unix      build without rlm_unix
+  --without-rlm_unix      build without support for checking UNIX
+                          authentication methods
 
 Some influential environment variables:
   CC          C compiler command
@@ -1397,6 +1398,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_unix
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -2102,6 +2108,7 @@ 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;
@@ -2109,9 +2116,19 @@ fi
 
 
 
-if test x$with_rlm_unix != xno; then
 
-       ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_unix" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2900,7 +2917,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3038,26 +3055,28 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system password file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system password file" >&5
 $as_echo_n "checking for system password file... " >&6; }
-       if test -f /etc/passwd; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: /etc/passwd" >&5
+if test -f /etc/passwd; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: /etc/passwd" >&5
 $as_echo "/etc/passwd" >&6; }
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no /etc/passwd file." >&5
+else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no /etc/passwd file." >&5
 $as_echo "no /etc/passwd file." >&6; }
-                fail=$fail" /etc/passwd"
-       fi
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system shadow password file" >&5
+fail="$fail /etc/passwd"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system shadow password file" >&5
 $as_echo_n "checking for system shadow password file... " >&6; }
-       if test -f /etc/shadow; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: /etc/shadow" >&5
+if test -f /etc/shadow; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: /etc/shadow" >&5
 $as_echo "/etc/shadow" >&6; }
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no /etc/shadow file." >&5
+else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no /etc/shadow file." >&5
 $as_echo "no /etc/shadow file." >&6; }
-       fi
+fi
 
 
 
@@ -3333,7 +3352,7 @@ fi
 
 done
 
-       for ac_func in getspnam getusershell getpwnam
+for ac_func in getspnam getusershell getpwnam
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -3346,19 +3365,23 @@ fi
 done
 
 
-       if test "$ac_cv_func_getpwnam" != "yes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no getpwnam" >&5
+if test "$ac_cv_func_getpwnam" != "yes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no getpwnam" >&5
 $as_echo "no getpwnam" >&6; }
-                fail=$fail" getpwnam"
-       fi
 
-       if test "$ac_cv_header_pwd_h" != "yes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pwd.h" >&5
+fail="$fail getpwnam"
+
+fi
+
+if test "$ac_cv_header_pwd_h" != "yes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pwd.h" >&5
 $as_echo "no pwd.h" >&6; }
-                fail=$fail" pwd.h"
-       fi
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lshadow" >&5
+fail="$fail pwd.h"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lshadow" >&5
 $as_echo_n "checking for getspnam in -lshadow... " >&6; }
 if ${ac_cv_lib_shadow_getspnam+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -3396,33 +3419,65 @@ fi
 $as_echo "$ac_cv_lib_shadow_getspnam" >&6; }
 if test "x$ac_cv_lib_shadow_getspnam" = xyes; then :
 
-                       mod_ldflags="${mod_ldflags} -lshadow"
-                       $as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
+               mod_ldflags="${mod_ldflags} -lshadow"
+               $as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
 
 
 
 fi
 
 
-       targetname=rlm_unix
 
+       targetname=rlm_unix
 else
        targetname=
        echo \*\*\* module rlm_unix is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_unix to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_unix." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_unix." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_unix requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_unix requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
 fi
 
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
+fi
+
+rm "config.report.tmp"
+
+
+
+
 
 
 
index 0edeac3882e203ccee90c6131b3c93193b9b293c..71d3202fda5e0ee9813b01663dd5d0beb9c11ddc 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_winbind.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_cflags
 mod_ldflags
+targetname
 CPP
 OBJEXT
 EXEEXT
@@ -1269,7 +1269,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 rlm_winbind
+  --without-rlm_winbind   build without support for password authentication
+                          with winbind
   --with-winbind-include-dir=DIR
                           Directory where the winbind includes may be found
   --with-winbind-lib-dir=DIR
@@ -1366,6 +1367,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_winbind
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1844,6 +1850,7 @@ 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;
@@ -1851,9 +1858,19 @@ fi
 
 
 
-if test x$with_rlm_winbind != xno; then
 
-    ac_ext=c
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_winbind" != xno; then
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2642,7 +2659,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2781,34 +2798,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-        winbind_include_dir=
+winbind_include_dir=
 
 # Check whether --with-winbind-include-dir was given.
 if test "${with_winbind_include_dir+set}" = set; then :
   withval=$with_winbind_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        winbind_lib_dir=
+winbind_lib_dir=
 
 # Check whether --with-winbind-lib-dir was given.
 if test "${with_winbind_lib_dir+set}" = set; then :
   withval=$with_winbind_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_lib_dir="$withval"
                ;;
        esac
@@ -2819,12 +2836,12 @@ fi
 # Check whether --with-winbind-dir was given.
 if test "${with_winbind_dir+set}" = set; then :
   withval=$with_winbind_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need winbind-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                winbind_lib_dir="$withval/lib"
                winbind_include_dir="$withval/include"
                ;;
@@ -2834,7 +2851,7 @@ fi
 
 
 
-    smart_try_dir="$winbind_include_dir /usr/include/samba-4.0"
+smart_try_dir="$winbind_include_dir /usr/include/samba-4.0"
 
 
 
@@ -2865,7 +2882,7 @@ $as_echo_n "checking for wbclient.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -2908,7 +2925,7 @@ $as_echo_n "checking for ${_prefix}/wbclient.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -2949,7 +2966,7 @@ $as_echo_n "checking for wbclient.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3048,7 +3065,7 @@ $as_echo_n "checking for wbclient.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                       #include <stdbool.h>
+                                   #include <stdbool.h>
                                        #include <wbclient.h>
 
 int
@@ -3090,13 +3107,15 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_wbclient_h" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&5
+if test "x$ac_cv_header_wbclient_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: wbclient.h not found. Use --with-winbind-include-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
 $as_echo "$as_me: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&2;}
-       fail="$fail wbclient.h"
-    fi
+
+fail="$fail wbclient.h"
+
+fi
 
 
 
@@ -3127,7 +3146,7 @@ $as_echo_n "checking for core/ntstatus.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3170,7 +3189,7 @@ $as_echo_n "checking for ${_prefix}/core/ntstatus.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3211,7 +3230,7 @@ $as_echo_n "checking for core/ntstatus.h... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3310,7 +3329,7 @@ $as_echo_n "checking for core/ntstatus.h in $try... " >&6; }
 /* end confdefs.h.  */
 
                                        #include <stdint.h>
-                                            #include <stdbool.h>
+                                        #include <stdbool.h>
                                        #include <core/ntstatus.h>
 
 int
@@ -3352,19 +3371,21 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&5
+if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: core/ntstatus.h not found. Use --with-winbind-include-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&5
 $as_echo "$as_me: WARNING: silently building without support for direct authentication via winbind. requires: libwbclient" >&2;}
-       fail="$fail core/ntstatus.h"
-    fi
+
+fail="$fail core/ntstatus.h"
+
+fi
 
 
-    if test "x$ac_cv_header_wbclient_h" = "xyes" && \
-       test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then
+if test "x$ac_cv_header_wbclient_h" = "xyes" && \
+       test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then
 
-      smart_try_dir="$winbind_lib_dir"
+       smart_try_dir="$winbind_lib_dir"
 
 
 sm_lib_safe=`echo "wbclient" | sed 'y%./+-%__p_%'`
@@ -3539,33 +3560,68 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-      if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&5
+       if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: winbind libraries not found. Use --with-winbind-lib-dir=<path>." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&5
 $as_echo "$as_me: WARNING: Samba must be version 4.2.1 or higher to use this feature." >&2;}
-       fail="$fail libwbclient"
-      fi
-    fi
 
-    targetname=rlm_winbind
+fail="$fail libwbclient"
+
+       fi
+fi
+
+
+       targetname=rlm_winbind
 else
-    targetname=
-    echo \*\*\* module rlm_winbind is disabled.
+       targetname=
+       echo \*\*\* module rlm_winbind is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
+       targetname=""
+
+
        if test x"${enable_strict_dependencies}" = x"yes"; then
                as_fn_error $? "set --without-rlm_winbind to disable it explicitly." "$LINENO" 5
        else
+
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_winbind." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_winbind." >&2;}
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_winbind requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_winbind requires: $fail." >&2;};
-               targetname=""
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
        fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$mod_ldflags $SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"
 
index 3ffef193b9faede10d8b170abf1f791f450d01b4..5647e8e4d6278c67e92ef8a563ce8c975fa8ee5b 100755 (executable)
@@ -585,9 +585,9 @@ PACKAGE_URL=
 ac_unique_file="rlm_yubikey.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-targetname
 mod_ldflags
 mod_cflags
+targetname
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1270,7 +1270,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 rlm_yubikey
+  --without-rlm_yubikey   build without support for Yubikey token
+                          authentication
   --with-yubikey-include-dir=DIR
                           Directory where the yubikey includes may be found
   --with-yubikey-lib-dir=DIR
@@ -1371,6 +1372,11 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+echo
+echo Running tests for rlm_yubikey
+echo
+
+
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1812,6 +1818,7 @@ 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;
@@ -1819,37 +1826,48 @@ fi
 
 
 
-if test x$with_rlm_yubikey != xno; then
+
+fail=
+fr_status=
+fr_features=
+: > "config.report"
+: > "config.report.tmp"
+
+
+
+if test x"$with_rlm_yubikey" != xno; then
 
 
-        yubikey_include_dir=
+
+
+yubikey_include_dir=
 
 # Check whether --with-yubikey-include-dir was given.
 if test "${with_yubikey_include_dir+set}" = set; then :
   withval=$with_yubikey_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need yubikey-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                yubikey_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        yubikey_lib_dir=
+yubikey_lib_dir=
 
 # Check whether --with-yubikey-lib-dir was given.
 if test "${with_yubikey_lib_dir+set}" = set; then :
   withval=$with_yubikey_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need yubikey-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                yubikey_lib_dir="$withval"
                ;;
        esac
@@ -1860,12 +1878,12 @@ fi
 # Check whether --with-yubikey-dir was given.
 if test "${with_yubikey_dir+set}" = set; then :
   withval=$with_yubikey_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need yubikey-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                yubikey_lib_dir="$withval/lib"
                yubikey_include_dir="$withval/include"
                ;;
@@ -1874,34 +1892,34 @@ fi
 
 
 
-        ykclient_include_dir=
+ykclient_include_dir=
 
 # Check whether --with-ykclient-include-dir was given.
 if test "${with_ykclient_include_dir+set}" = set; then :
   withval=$with_ykclient_include_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need ykclient-include-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                ykclient_include_dir="$withval"
                ;;
        esac
 fi
 
 
-        ykclient_lib_dir=
+ykclient_lib_dir=
 
 # Check whether --with-ykclient-lib-dir was given.
 if test "${with_ykclient_lib_dir+set}" = set; then :
   withval=$with_ykclient_lib_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need ykclient-lib-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                ykclient_lib_dir="$withval"
                ;;
        esac
@@ -1912,12 +1930,12 @@ fi
 # Check whether --with-ykclient-dir was given.
 if test "${with_ykclient_dir+set}" = set; then :
   withval=$with_ykclient_dir; case "$withval" in
-           no)
+       no)
                as_fn_error $? "Need ykclient-dir" "$LINENO" 5
                ;;
-           yes)
+       yes)
                ;;
-           *)
+       *)
                ykclient_lib_dir="$withval/lib"
                ykclient_include_dir="$withval/include"
                ;;
@@ -1926,9 +1944,9 @@ fi
 
 
 
-    have_yubikey="yes"
-    smart_try_dir="$yubikey_include_dir"
-    ac_ext=c
+have_yubikey="yes"
+smart_try_dir="$yubikey_include_dir"
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2968,14 +2986,14 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_yubikey_h" != "xyes"; then
+if test "x$ac_cv_header_yubikey_h" != "xyes"; then
        have_ykclient="no"
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: yubikey headers not found. Use --with-yubikey-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: yubikey headers not found. Use --with-yubikey-include-dir=<path>." >&2;}
-    fi
+fi
 
 
-        smart_try_dir="$yubikey_lib_dir"
+smart_try_dir="$yubikey_lib_dir"
 
 
 sm_lib_safe=`echo "yubikey" | sed 'y%./+-%__p_%'`
@@ -3150,24 +3168,35 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_yubikey_yubikey_aes_decrypt" != "xyes"; then
+if test "x$ac_cv_lib_yubikey_yubikey_aes_decrypt" != "xyes"; then
        have_yubikey="no"
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: yubikey libraries not found. Use --with-yubikey-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: yubikey libraries not found. Use --with-yubikey-lib-dir=<path>." >&2;}
-    fi
+fi
 
-    if test "x$have_yubikey" = "xyes"; then
+if test "x$have_yubikey" = "xyes"; then
 
 $as_echo "#define HAVE_YUBIKEY 1" >>confdefs.h
 
-    else
+else
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without yubikey token decryption support. requires: yubikey" >&5
 $as_echo "$as_me: WARNING: silently building without yubikey token decryption support. requires: yubikey" >&2;}
-    fi
+
+if echo "$fr_features" | grep -q "+yubikey+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without yubikey token decryption support" >> config.report.tmp
+       fr_features="$fr_features +yubikey+"
+fi
+
+fi
 
 
-    have_ykclient="yes"
-    smart_try_dir="$ykclient_include_dir"
+have_ykclient="yes"
+smart_try_dir="$ykclient_include_dir"
 
 
 ac_safe=`echo "ykclient.h" | sed 'y%./+-%__pm%'`
@@ -3418,14 +3447,14 @@ fi
 
 smart_prefix=
 
-    if test "x$ac_cv_header_ykclient_h" != "xyes"; then
+if test "x$ac_cv_header_ykclient_h" != "xyes"; then
        have_ykclient="no"
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ykclient headers not found. Use --with-ykclient-include-dir=<path>." >&5
 $as_echo "$as_me: WARNING: ykclient headers not found. Use --with-ykclient-include-dir=<path>." >&2;}
-    fi
+fi
 
 
-    smart_try_dir="$ykclient_lib_dir"
+smart_try_dir="$ykclient_lib_dir"
 
 
 sm_lib_safe=`echo "ykclient" | sed 'y%./+-%__p_%'`
@@ -3600,7 +3629,7 @@ LIBS="$smart_ldflags $smart_lib $old_LIBS"
 SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
-    if test "x$ac_cv_lib_ykclient_ykclient_request_process" != "xyes"; then
+if test "x$ac_cv_lib_ykclient_ykclient_request_process" != "xyes"; then
        have_ykclient="no"
 
 
@@ -3777,41 +3806,85 @@ SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
 fi
 
        if test "x$ac_cv_lib_ykclient_ykclient_request" = "xyes"; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libykclient missing ykclient_request_process. A later version of libykclient is required." >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libykclient missing ykclient_request_process. A later version of libykclient is required." >&5
 $as_echo "$as_me: WARNING: libykclient missing ykclient_request_process. A later version of libykclient is required." >&2;}
        else
-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ykclient libraries not found. Use --with-ykclient-lib-dir=<path>." >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ykclient libraries not found. Use --with-ykclient-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: ykclient libraries not found. Use --with-ykclient-lib-dir=<path>." >&2;}
        fi
-    fi
+fi
 
-    if test "x$have_ykclient" = "xyes"; then
+if test "x$have_ykclient" = "xyes"; then
 
 $as_echo "#define HAVE_YKCLIENT 1" >>confdefs.h
 
-    else
+else
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without yubicloud support. requires: ykclient" >&5
 $as_echo "$as_me: WARNING: silently building without yubicloud support. requires: ykclient" >&2;}
-    fi
 
-    targetname=rlm_yubikey
+if echo "$fr_features" | grep -q "+ykclient+"; then :
+else :
+       fr_report_prefix=""
+       if test x"$fr_features" != x""; then
+               fr_report_prefix="                                 "
+       fi
+       $as_echo "$fr_report_prefix""without yubicloud support" >> config.report.tmp
+       fr_features="$fr_features +ykclient+"
+fi
+
+fi
+
+
+       targetname=rlm_yubikey
 else
-    targetname=
-    echo \*\*\* module rlm_yubikey is disabled.
+       targetname=
+       echo \*\*\* module rlm_yubikey is disabled.
+
+
+fr_status="disabled"
+
 fi
 
 if test x"$fail" != x""; then
-    if test x"${enable_strict_dependencies}" = x"yes"; then
-       as_fn_error $? "set --without-rlm_yubikey to disable it explicitly." "$LINENO" 5
-    else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_yubikey." >&5
+       targetname=""
+
+
+       if test x"${enable_strict_dependencies}" = x"yes"; then
+               as_fn_error $? "set --without-rlm_yubikey to disable it explicitly." "$LINENO" 5
+       else
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_yubikey." >&5
 $as_echo "$as_me: WARNING: silently not building rlm_yubikey." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_yubikey requires: $fail." >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_yubikey requires: $fail." >&5
 $as_echo "$as_me: WARNING: FAILURE: rlm_yubikey requires: $fail." >&2;};
-       targetname=""
-    fi
+               fail="$(echo $fail)"
+
+
+fr_status="skipping (requires $fail)"
+
+               fr_features=
+
+       fi
+
+else
+
+
+fr_status="OK"
+
+fi
+
+if test x"$fr_features" = x""; then
+       $as_echo "$fr_status" > "config.report"
+else
+       $as_echo_n "$fr_status ... " > "config.report"
+       cat "config.report.tmp" >> "config.report"
 fi
 
+rm "config.report.tmp"
+
+
+
+
 mod_ldflags="$SMART_LIBS"
 mod_cflags="$SMART_CPPFLAGS"