svn commit: r663614 - /incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp

[tr...@apache.org]

Author: tross
Date: Thu Jun  5 07:04:56 2008
New Revision: 663614

URL: http://svn.apache.org/viewvc?rev=663614&view=rev
Log:
Load modules from /usr/lib64/qpidd on x86_64 architecture

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?rev=663614&r1=663613&r2=663614&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Thu Jun  5 07:04:56 2008
@@ -33,6 +33,7 @@
 #include <fstream>
 #include <signal.h>
 #include <unistd.h>
+#include <sys/utsname.h>
 
 using namespace qpid;
 using namespace qpid::broker;
@@ -47,6 +48,12 @@
     bool           noLoad;
     ModuleOptions() : qpid::Options("Module options"), loadDir("/usr/lib/qpidd"), noLoad(false)
     {
+        struct utsname _uname;
+        if (::uname(&_uname) == 0) {
+            if (string(_uname.machine) == "x86_64")
+                loadDir = "/usr/lib64/qpidd";
+        }
+
         addOptions()
             ("module-dir",    optValue(loadDir, "DIR"),  "Load all .so modules in this directory")
             ("load-module",   optValue(load,    "FILE"), "Specifies additional module(s) to be loaded")