From 4de83f126ab4f7d402bb1e83b8867fb2c334d650 Mon Sep 17 00:00:00 2001 From: Jorge Pereira Date: Fri, 9 Aug 2019 16:55:52 -0300 Subject: [PATCH] rlm_sql_oracle: Inform the supported versions --- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure | 5 ++++- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure index 22b74f095e45..78340bb92eda 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure @@ -1787,6 +1787,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +oracle_supported_versions="19 18 12 11 10 9" fail= mod_ldflags= mod_cflags= @@ -2882,11 +2883,13 @@ $as_echo "$as_me: WARNING: oracle headers not found. Use --with-oracle-include-d lib_path="${ORACLE_HOME}/lib " fi + { $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: WARNING: Oracle version >= 12 needs -laio" >&2;} for path in $lib_path "/usr/local/instaclient/lib" "" "/opt/lib"; do - for oracle_version in 19 18 12.1 12 11 10 9 ""; 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 $as_echo_n "checking for OCIInitialize in nnz${oracle_version} in $path... " >&6; } diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac index f7c74ccd04f9..2a97fd67647a 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac @@ -2,6 +2,7 @@ AC_INIT(rlm_sql_oracle.c) AC_REVISION($Revision: 1.10 $) AC_DEFUN(modname,[rlm_sql_oracle]) +oracle_supported_versions="19 18 12 11 10 9" fail= mod_ldflags= mod_cflags= @@ -87,10 +88,11 @@ if test x$with_[]modname != xno; then lib_path="${ORACLE_HOME}/lib " fi + AC_MSG_WARN([Oracle supported versions: ${oracle_supported_versions}]) AC_MSG_WARN([Oracle version >= 12 needs -laio]) for path in $lib_path "/usr/local/instaclient/lib" "" "/opt/lib"; do - for oracle_version in 19 18 12.1 12 11 10 9 ""; do + for oracle_version in ${oracle_supported_versions} ""; do if test "$path" != ""; then AC_MSG_CHECKING([for OCIInitialize in nnz${oracle_version} in $path]) else