From 5a80c12061902e18620a822bb336b3ab6ca36df7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 29 Nov 2011 14:06:08 +0200
Subject: Don't add -R option when searching for liboci

While this helps with the libodb-oracle, this still break when linking
tests/examples. The correct way to resolve this is for the user to add
the directory to LD_LIBRARY_PATH.
---
 m4/liboci.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/m4/liboci.m4 b/m4/liboci.m4
index 34023e1..e21b956 100644
--- a/m4/liboci.m4
+++ b/m4/liboci.m4
@@ -30,7 +30,7 @@ if test x"$oci_dir" != x; then
   #
   if test -d "$oci_dir/sdk/include"; then
     CPPFLAGS="$CPPFLAGS -I$oci_dir/sdk/include"
-    LDFLAGS="$LDFLAGS -L$oci_dir -R $oci_dir"
+    LDFLAGS="$LDFLAGS -L$oci_dir"
     LIBS="-lclntsh $LIBS"
 
     CXX_LIBTOOL_LINK_IFELSE(
@@ -56,7 +56,7 @@ oci_found=yes
     fi
   elif test -d "$oci_dir/rdbms/public"; then
     CPPFLAGS="$CPPFLAGS -I$oci_dir/rdbms/public"
-    LDFLAGS="$LDFLAGS -L$oci_dir/lib -R $oci_dir/lib"
+    LDFLAGS="$LDFLAGS -L$oci_dir/lib"
     LIBS="-lclntsh $LIBS"
   fi
 fi
@@ -92,7 +92,7 @@ if test x"$oci_found" = xno; then
   #
   if test x"$ORACLE_HOME" != x; then
     CPPFLAGS="$CPPFLAGS -I$ORACLE_HOME/rdbms/public"
-    LDFLAGS="$LDFLAGS -L$ORACLE_HOME/lib -R $ORACLE_HOME/lib"
+    LDFLAGS="$LDFLAGS -L$ORACLE_HOME/lib"
     LIBS="-lclntsh $LIBS"
 
     CXX_LIBTOOL_LINK_IFELSE(
-- 
cgit v1.1