diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2011-11-28 16:52:57 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-11-28 16:52:57 +0200 |
commit | b12e076d8232dd2c757fa41685205f9c610114fc (patch) | |
tree | dfa1a8ed2fda396bb6042537fa7585e3a366bc12 | |
parent | 5f2af10857a29513f21539a57738250cd66bf377 (diff) |
Add -R option in addition to -L for liboci
libclntsh.so depends on other Oracle libraries which are normally
not installed and no LD_LIBRARY_PATH entry points to their directory.
Adding -R option makes libtool add this directory to rpath search
list.
-rw-r--r-- | m4/liboci.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/liboci.m4 b/m4/liboci.m4 index e21b956..34023e1 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" + LDFLAGS="$LDFLAGS -L$oci_dir -R $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" + LDFLAGS="$LDFLAGS -L$oci_dir/lib -R $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" + LDFLAGS="$LDFLAGS -L$ORACLE_HOME/lib -R $ORACLE_HOME/lib" LIBS="-lclntsh $LIBS" CXX_LIBTOOL_LINK_IFELSE( |