diff -r 275f1c8a7f1d model/dlm-loader-factory.cc

--- a/model/dlm-loader-factory.cc	Thu Mar 29 13:54:58 2012 +0900

+++ b/model/dlm-loader-factory.cc	Thu Mar 29 13:55:03 2012 +0900

@@ -3,6 +3,7 @@

 #include "ns3/fatal-error.h"

 #include <list>

 #include <dlfcn.h>

+#include <sys/stat.h>

 NS_LOG_COMPONENT_DEFINE ("DlmLoaderFactory");

@@ -34,6 +35,10 @@

   virtual void Unload (void *module);

   virtual void *Lookup (void *module, std::string symbol);

 private:

+  bool SearchFile (std::string filename, std::string *fullname) const;

+  std::list<std::string> GetSearchDirectories (void) const;

+  std::list<std::string> Split (std::string input, std::string sep) const;

+  bool Exists (std::string filename) const;

   Lmid_t m_lmid;

   std::list<void *> m_loaded;

 };

@@ -83,11 +88,98 @@

       ::dlclose (*i);

     }

 }

+std::list<std::string>

+DlmLoader::Split (std::string input, std::string sep) const

+{

+  NS_LOG_FUNCTION (this << input << sep);

+  std::list<std::string> retval;

+  std::string::size_type cur = 0, next;

+  while (true)

+    {

+      next = input.find (sep, cur);

+      if (next == cur)

+	{

+	  cur ++;

+	  continue;

+	} 

+      else if (next == std::string::npos)

+	{

+	  if (input.size () != cur)

+	    {

+	      retval.push_back (input.substr (cur, input.size () - cur));

+	    }

+	  break;

+	}

+      retval.push_back (input.substr (cur, next - cur));

+      cur = next + 1;

+    }

+  return retval;

+}

+std::list<std::string>

+DlmLoader::GetSearchDirectories (void) const

+{

+  NS_LOG_FUNCTION (this);

+  std::list<std::string> directories;

+  char *ldLibraryPath = getenv ("LD_LIBRARY_PATH");

+  if (ldLibraryPath != 0)

+    {

+      std::list<std::string> tmp = Split (ldLibraryPath, ":");

+      directories.insert (directories.end (), 

+			  tmp.begin (),

+			  tmp.end ());

+    }

+  char *path = getenv ("PATH");

+  if (path != 0)

+    {

+      std::list<std::string> tmp = Split (path, ":");

+      directories.insert (directories.end (), 

+			  tmp.begin (),

+			  tmp.end ());

+    }

+  directories.push_back ("/lib");

+  directories.push_back ("/usr/lib");

+  directories.push_back (".");

+  return directories;

+}

+bool

+DlmLoader::Exists (std::string filename) const

+{

+  //NS_LOG_FUNCTION (this << filename);

+  struct stat st;

+  int retval = ::stat (filename.c_str (), &st);

+  return retval == 0;

+}

+bool

+DlmLoader::SearchFile (std::string filename, std::string *fullname) const

+{

+  NS_LOG_FUNCTION (this << filename);

+  if (Exists (filename))

+    {

+      *fullname = filename;

+      NS_LOG_DEBUG ("Found: " << filename << " as " << *fullname);

+      return true;

+    }

+  std::list<std::string> dirs = GetSearchDirectories ();

+  for (std::list<std::string>::const_iterator i = dirs.begin (); i != dirs.end (); i++)

+    {

+      if (Exists (*i + "/" + filename))

+	{

+	  *fullname = *i + "/" + filename;

+	  NS_LOG_DEBUG ("Found: " << filename << " as " << *fullname);

+	  return true;

+	}

+    }

+  return false;

+}

 void *

 DlmLoader::Load (std::string filename, int flag)

 {

+  std::string fullname;

+  bool found;

   NS_LOG_FUNCTION (this << filename << flag);

-  void *module = dlmopen (m_lmid, filename.c_str (), flag);

+  found = SearchFile (filename, &fullname);

+  NS_ASSERT (found);

+  void *module = dlmopen (m_lmid, fullname.c_str (), flag);

   m_loaded.push_back (module);

   return module;

 }

diff -r 275f1c8a7f1d wscript

--- a/wscript	Thu Mar 29 13:54:58 2012 +0900

+++ b/wscript	Thu Mar 29 13:55:03 2012 +0900

@@ -36,6 +36,8 @@

     conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H', mandatory=False)

     conf.env.append_value('LINKFLAGS', '-pthread')

+    conf.env.append_value('LINKFLAGS', '-Wl,--dynamic-linker=' +

+                             os.path.abspath ('../build/lib/ldso'))

     conf.check (lib='dl', mandatory = True)

     vg_h = conf.check(header_name='valgrind/valgrind.h', mandatory=False)