From 3c95f9a289fee6a3b43608ec2ac95f841c43e3ff Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 23 Apr 2009 22:59:12 +0000 Subject: Merge in initial changes to allow building with CMake; rubygen and managementgen can now generate either .mk files or .cmake files as needed; CONF_FILE and MODULE_DIR macros now have broker/client counterparts QPIDD_CONF_FILE, QPIDD_MODULE_DIR, QPIDC_CONF_FILE, QPIDC_MODULE_DIR configurable by cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@768085 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/LoadPlugins.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/client/LoadPlugins.cpp') diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp index b395226859..eca6aa47fc 100644 --- a/cpp/src/qpid/client/LoadPlugins.cpp +++ b/cpp/src/qpid/client/LoadPlugins.cpp @@ -19,6 +19,7 @@ * */ +#include "config.h" #include "qpid/Modules.h" #include "qpid/sys/Shlib.h" #include @@ -30,9 +31,9 @@ namespace { struct LoadtimeInitialise { LoadtimeInitialise() { - qpid::ModuleOptions moduleOptions(MODULE_DIR); + qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR); string defaultPath (moduleOptions.loadDir); - moduleOptions.parse (0, 0, CONF_FILE, true); + moduleOptions.parse (0, 0, QPIDC_CONF_FILE, true); for (vector::iterator iter = moduleOptions.load.begin(); iter != moduleOptions.load.end(); -- cgit v1.2.1