Patch from Andrew Stitcher to fix APR #include using apr-config.

Fixed build problems with USE_APR= - builds OK but broker non-functional.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476303 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 19 insertions, 17 deletions

diff --git a/cpp/src/qpid/apr/APRBase.h b/cpp/src/qpid/apr/APRBase.h
index 929d421aeb..d1b3e21b91 100644
--- a/cpp/src/qpid/apr/APRBase.h
+++ b/cpp/src/qpid/apr/APRBase.h
@@ -22,8 +22,8 @@
 #define _APRBase_
 
 #include <string>
-#include <apr-1/apr_thread_mutex.h>
-#include <apr-1/apr_errno.h>
+#include <apr_thread_mutex.h>
+#include <apr_errno.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/apr/APRPool.h b/cpp/src/qpid/apr/APRPool.h
index b52db3739f..da7661fcfa 100644
--- a/cpp/src/qpid/apr/APRPool.h
+++ b/cpp/src/qpid/apr/APRPool.h
@@ -22,7 +22,7 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/apr/APRSocket.h b/cpp/src/qpid/apr/APRSocket.h
index 591df2daaa..803740f97e 100644
--- a/cpp/src/qpid/apr/APRSocket.h
+++ b/cpp/src/qpid/apr/APRSocket.h
@@ -21,7 +21,7 @@
 #ifndef _APRSocket_
 #define _APRSocket_
 
-#include <apr-1/apr_network_io.h>
+#include <apr_network_io.h>
 #include <qpid/framing/Buffer.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/apr/LFProcessor.h b/cpp/src/qpid/apr/LFProcessor.h
index 63771f9ab6..1d1162d034 100644
--- a/cpp/src/qpid/apr/LFProcessor.h
+++ b/cpp/src/qpid/apr/LFProcessor.h
@@ -21,7 +21,7 @@
 #ifndef _LFProcessor_
 #define _LFProcessor_
 
-#include <apr-1/apr_poll.h>
+#include <apr_poll.h>
 #include <iostream>
 #include <vector>
 #include <qpid/sys/Monitor.h>
diff --git a/cpp/src/qpid/apr/LFSessionContext.h b/cpp/src/qpid/apr/LFSessionContext.h
index 031aad5e5f..7060c971a5 100644
--- a/cpp/src/qpid/apr/LFSessionContext.h
+++ b/cpp/src/qpid/apr/LFSessionContext.h
@@ -23,9 +23,9 @@
 
 #include <queue>
 
-#include <apr-1/apr_network_io.h>
-#include <apr-1/apr_poll.h>
-#include <apr-1/apr_time.h>
+#include <apr_network_io.h>
+#include <apr_poll.h>
+#include <apr_time.h>
 
 #include <qpid/framing/AMQFrame.h>
 #include <qpid/framing/Buffer.h>
diff --git a/cpp/src/qpid/posix/EpollEventChannel.cpp b/cpp/src/qpid/posix/EpollEventChannel.cpp
index 1418507542..7dce4bc58c 100644
--- a/cpp/src/qpid/posix/EpollEventChannel.cpp
+++ b/cpp/src/qpid/posix/EpollEventChannel.cpp
@@ -35,6 +35,8 @@ EpollEventChannel::EpollEventChannel()
     epollFd = epoll_create(estimatedFdsForEpoll);
 }
 
+EpollEventChannel::~EpollEventChannel() { }
+
 void 
 EpollEventChannel::post(ReadEvent& /*event*/)
 {
diff --git a/cpp/src/qpid/posix/check.cpp b/cpp/src/qpid/posix/check.cpp
index 3470906639..2ef52f68b7 100644
--- a/cpp/src/qpid/posix/check.cpp
+++ b/cpp/src/qpid/posix/check.cpp
@@ -25,7 +25,7 @@
 namespace qpid {
 namespace sys {
 
-std::string strError() {
+std::string errnoToString() {
     char buf[512];
     return strerror_r(errno, buf, sizeof(buf));
 }
diff --git a/cpp/src/qpid/sys/Module.h b/cpp/src/qpid/sys/Module.h
index 3093eef074..db791666e0 100644
--- a/cpp/src/qpid/sys/Module.h
+++ b/cpp/src/qpid/sys/Module.h
@@ -28,7 +28,7 @@
 namespace qpid {
 namespace sys {
 #if USE_APR
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
     typedef apr_dso_handle_t* dso_handle_t;
 #else 
     typedef void* dso_handle_t;
diff --git a/cpp/src/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h
index a3abe37748..59e1e74b57 100644
--- a/cpp/src/qpid/sys/Monitor.h
+++ b/cpp/src/qpid/sys/Monitor.h
@@ -25,8 +25,8 @@
 #include <boost/noncopyable.hpp>
 
 #ifdef USE_APR
-#  include <apr-1/apr_thread_mutex.h>
-#  include <apr-1/apr_thread_cond.h>
+#  include <apr_thread_mutex.h>
+#  include <apr_thread_cond.h>
 #  include <qpid/apr/APRBase.h>
 #  include <qpid/apr/APRPool.h>
 #else
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index 0b898bb999..cf757e7a27 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -25,7 +25,7 @@
 #include <string>
 
 #ifdef USE_APR
-#  include <apr-1/apr_network_io.h>
+#  include <apr_network_io.h>
 #endif
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/Thread.h b/cpp/src/qpid/sys/Thread.h
index 79dfc184e0..2aad7c24d7 100644
--- a/cpp/src/qpid/sys/Thread.h
+++ b/cpp/src/qpid/sys/Thread.h
@@ -25,8 +25,8 @@
 #include <qpid/sys/Runnable.h>
 
 #ifdef USE_APR
-#  include <apr-1/apr_thread_proc.h>
-#  include <apr-1/apr_portable.h>
+#  include <apr_thread_proc.h>
+#  include <apr_portable.h>
 #  include <qpid/apr/APRPool.h>
 #  include <qpid/apr/APRBase.h>
 #else
diff --git a/cpp/src/qpid/sys/Time.h b/cpp/src/qpid/sys/Time.h
index 7fa2f2d8e7..a569c90780 100644
--- a/cpp/src/qpid/sys/Time.h
+++ b/cpp/src/qpid/sys/Time.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #ifdef USE_APR
-#  include <apr-1/apr_time.h>
+#  include <apr_time.h>
 #else
 #  include <time.h>
 #endif
diff --git a/cpp/src/qpid/sys/signal.h b/cpp/src/qpid/sys/signal.h
index 6cae2b9e4a..b7cfc8a950 100644
--- a/cpp/src/qpid/sys/signal.h
+++ b/cpp/src/qpid/sys/signal.h
@@ -20,7 +20,7 @@
  */
 
 #ifdef USE_APR
-#  include <apr-1/apr_signal.h>
+#  include <apr_signal.h>
 #else
 #  include <signal.h>
 #endif