Skip to content
Permalink
Browse files

Fix the Oracle support

  • Loading branch information
jpereira authored and alandekok committed Aug 5, 2019
1 parent bec0959 commit be0343ae0137f8334faff885a87e3342ffdc870a
@@ -53,6 +53,7 @@ FreeRADIUS 3.0.20 Wed 10 Apr 2019 09:00:00 EDT urgency=low
"update" section of its configuration.
* Add configure checks for -latomic. This helps on armel, mips
and mipsel. Fixes #2828.
* Fix Oracle rlm_sql support.

FreeRADIUS 3.0.19 Wed 10 Apr 2019 09:00:00 EDT urgency=high
Feature improvements
@@ -2886,7 +2886,7 @@ $as_echo "$as_me: WARNING: oracle headers not found. Use --with-oracle-include-d
$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 12.1 12 11 10 9 ""; do
for oracle_version in 19 12.1 12 11 10 9 ""; 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; }
@@ -2895,7 +2895,7 @@ $as_echo_n "checking for OCIInitialize in nnz${oracle_version} in $path... " >&6
$as_echo_n "checking for OCIInitialize in nnz${oracle_version}... " >&6; }
fi

LIBS="$old_LIBS -L$path -lclntsh -lnnz${oracle_version}"
LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}"

cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -90,14 +90,14 @@ if test x$with_[]modname != xno; then
AC_MSG_WARN([Oracle version >= 12 needs -laio])

for path in $lib_path "/usr/local/instaclient/lib" "" "/opt/lib"; do
for oracle_version in 12.1 12 11 10 9 ""; do
for oracle_version in 19 12.1 12 11 10 9 ""; do
if test "$path" != ""; then
AC_MSG_CHECKING([for OCIInitialize in nnz${oracle_version} in $path])
else
AC_MSG_CHECKING([for OCIInitialize in nnz${oracle_version}])
fi

LIBS="$old_LIBS -L$path -lclntsh -lnnz${oracle_version}"
LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}"

AC_TRY_LINK([#include <oci.h>

0 comments on commit be0343a

Please sign in to comment.
You can’t perform that action at this time.