Author: aconway
Date: Mon Oct 16 10:36:08 2006
New Revision: 464577
URL: http://svn.apache.org/viewvc?view=rev&rev=464577
Log:
Add apr-1/ prefix to APR #includes to pick up from standard location.
Modified:
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/options.mk
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
Modified: incubator/qpid/trunk/qpid/cpp/README
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Mon Oct 16 10:36:08 2006
@@ -4,16 +4,16 @@
== Prerequisites ==
-Apache Portable Runtime 1.2.7: http://apr.apache.org/
-Install in /usr/local/apr or update options.mk if installed elsewhere.
-
-CppUnit: http://cppunit.sourceforge.net
-
-boost: http://www.boost.org
+Required to build:
+ * Apache Portable Runtime 1.2.7: http://apr.apache.org/
+ * CppUnit: http://cppunit.sourceforge.net
+ * boost: http://www.boost.org
Optional: to generate source code documentation you need:
* doxygen: http://sourceforge.net/projects/doxygen/
* graphviz - http://www.graphviz.org/
+
+On Fedora: yum install apr apr-devel cppunit cppunit-devel boost boost-devel
doxygen graphviz
== Build and test ==
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Mon Oct 16 10:36:08 2006
@@ -18,7 +18,7 @@
## External dependencies:
# Add location for headers and libraries of any external dependencies here
-EXTRA_INCLUDES := -I/usr/local/apr/include/apr-1
+EXTRA_INCLUDES := -I/usr/local/apr/include
EXTRA_LIBDIRS := -L/usr/local/apr/lib
## Compile flags
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Mon Oct 16 10:36:08
2006
@@ -21,7 +21,7 @@
#include <vector>
#include <queue>
#include "memory.h"
-#include "apr_time.h"
+#include "apr-1/apr_time.h"
#include "qpid/framing/amqp_types.h"
#include "qpid/broker/Binding.h"
#include "qpid/broker/ConnectionToken.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h Mon Oct 16
10:36:08 2006
@@ -19,8 +19,8 @@
#define _APRBase_
#include <string>
-#include "apr_thread_mutex.h"
-#include "apr_errno.h"
+#include "apr-1/apr_thread_mutex.h"
+#include "apr-1/apr_errno.h"
namespace qpid {
namespace concurrent {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h Mon Oct 16
10:36:08 2006
@@ -18,8 +18,8 @@
#ifndef _APRMonitor_
#define _APRMonitor_
-#include "apr_thread_mutex.h"
-#include "apr_thread_cond.h"
+#include "apr-1/apr_thread_mutex.h"
+#include "apr-1/apr_thread_cond.h"
#include "qpid/concurrent/Monitor.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp Mon Oct 16
10:36:08 2006
@@ -17,7 +17,7 @@
*/
#include "qpid/concurrent/APRBase.h"
#include "qpid/concurrent/APRThread.h"
-#include "apr_portable.h"
+#include "apr-1/apr_portable.h"
using namespace qpid::concurrent;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h Mon Oct 16
10:36:08 2006
@@ -18,7 +18,7 @@
#ifndef _APRThread_
#define _APRThread_
-#include "apr_thread_proc.h"
+#include "apr-1/apr_thread_proc.h"
#include "qpid/concurrent/APRThread.h"
#include "qpid/concurrent/Runnable.h"
#include "qpid/concurrent/Thread.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h Mon
Oct 16 10:36:08 2006
@@ -18,7 +18,7 @@
#ifndef _APRThreadFactory_
#define _APRThreadFactory_
-#include "apr_thread_proc.h"
+#include "apr-1/apr_thread_proc.h"
#include "qpid/concurrent/APRThread.h"
#include "qpid/concurrent/Thread.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h Mon Oct 16
10:36:08 2006
@@ -18,8 +18,8 @@
#ifndef _APRConnector_
#define _APRConnector_
-#include "apr_network_io.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_time.h"
#include "qpid/framing/InputHandler.h"
#include "qpid/framing/OutputHandler.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h Mon Oct 16 10:36:08
2006
@@ -18,7 +18,7 @@
#ifndef _APRSocket_
#define _APRSocket_
-#include "apr_network_io.h"
+#include "apr-1/apr_network_io.h"
#include "qpid/framing/Buffer.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h Mon Oct 16
10:36:08 2006
@@ -19,9 +19,9 @@
#define _BlockingAPRAcceptor_
#include <vector>
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
#include "qpid/io/Acceptor.h"
#include "qpid/concurrent/APRMonitor.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h Mon
Oct 16 10:36:08 2006
@@ -21,8 +21,8 @@
#include <queue>
#include <vector>
-#include "apr_network_io.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_time.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/concurrent/APRMonitor.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h Mon Oct 16 10:36:08
2006
@@ -19,9 +19,9 @@
#define _LFAcceptor_
#include <vector>
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
#include "qpid/io/Acceptor.h"
#include "qpid/concurrent/APRMonitor.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h Mon Oct 16 10:36:08
2006
@@ -18,7 +18,7 @@
#ifndef _LFProcessor_
#define _LFProcessor_
-#include "apr_poll.h"
+#include "apr-1/apr_poll.h"
#include <iostream>
#include <vector>
#include "qpid/concurrent/APRMonitor.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h Mon Oct 16
10:36:08 2006
@@ -20,9 +20,9 @@
#include <queue>
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/concurrent/APRMonitor.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?view=diff&rev=464577&r1=464576&r2=464577
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Mon Oct 16 10:36:08 2006
@@ -17,7 +17,7 @@
*/
#include "qpid/broker/Broker.h"
#include "qpid/broker/Configuration.h"
-#include "apr_signal.h"
+#include "apr-1/apr_signal.h"
#include <iostream>
#include <memory>
