Skip to content

Commit

Permalink
Make reconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed May 5, 2015
1 parent c9e93f0 commit 5fed8c8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/include/autoconf.h.in
Expand Up @@ -42,7 +42,7 @@
/* Define if we have a binary safe regular expression library */
#undef HAVE_BINSAFE_REGEX

/* Define if the compiler supports __builtin_types_compatible_p */
/* Define if the compiler supports __builtin_bswap64 */
#undef HAVE_BUILTIN_BSWAP_64

/* Define if the compiler supports __builtin_choose_expr */
Expand Down
8 changes: 6 additions & 2 deletions src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
Expand Up @@ -2882,8 +2882,11 @@ $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 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 11 10 9 ""; do
for oracle_version in 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; }
Expand All @@ -2893,6 +2896,7 @@ $as_echo_n "checking for OCIInitialize in nnz${oracle_version}... " >&6; }
fi
LIBS="$old_LIBS -L$path -lclntsh -lnnz${oracle_version}"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <oci.h>
Expand Down Expand Up @@ -2948,7 +2952,7 @@ $as_echo "no" >&6; }
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-11]"
fail="$fail libclntsh libnnz[9-12]"
fi
targetname=rlm_sql_oracle
Expand Down

0 comments on commit 5fed8c8

Please sign in to comment.