From 9f8e7c29ff2f05dd1bf6689f68f4ba2bdbf19b2d Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Thu, 5 Jun 2008 14:04:56 +0000
Subject: Load modules from /usr/lib64/qpidd on x86_64 architecture

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@663614 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpidd.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'cpp/src/qpidd.cpp')

diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index ad3dcb3aeb..23781ead2c 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -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 @@ struct ModuleOptions : public qpid::Options {
     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")
-- 
cgit v1.2.1