[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  c7c269f43ccecd9066cbd0f6650eca296e3d6faa (commit)
      from  304b4d897c97c16699dddac79c68377b06a848f2 (commit)

Summary of changes:
 cpp/src/IceUtil/DynamicLibrary.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit c7c269f43ccecd9066cbd0f6650eca296e3d6faa
Author: David M. Lee <dlee at digium.com>
Date:   Fri Apr 15 11:03:13 2011 -0500

    Fixed merge bug in DynamicLibrary.cpp
    
    The icebox-lib-path patch needs to be taken into account for the
    fix-apple-so patch.

diff --git a/cpp/src/IceUtil/DynamicLibrary.cpp b/cpp/src/IceUtil/DynamicLibrary.cpp
index 40b8dd8..e92503d 100755
--- a/cpp/src/IceUtil/DynamicLibrary.cpp
+++ b/cpp/src/IceUtil/DynamicLibrary.cpp
@@ -167,7 +167,7 @@ IceUtilInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool u
         // (.dylib) and loadable modules (usually .bundle or .so).  If we can't
         // load as a shared library, try loading as a bundle.  For more info,
         // see http://www.finkproject.org/doc/porting/shared.php
-        lib = "lib" + libName;
+        lib = libPath + "lib" + libName;
         if(!version.empty())
         {
             lib += "." + version;

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git