Commit 801d229a authored by legoc's avatar legoc
Browse files

changed include paths to avoid ../cameo and ../impl

parent bcc3accb
......@@ -37,6 +37,7 @@ AC_SUBST(LIBRARY_VERSION)
AX_PTHREAD(,[AC_MSG_ERROR([Posix threads required])])
AX_BOOST_BASE([1.41],, [AC_MSG_ERROR([Boost 1.41 required])])
AX_BOOST_THREAD
AX_BOOST_SYSTEM
AC_ZMQ
AC_PROTOBUF_LITE
......@@ -49,6 +50,7 @@ CAMEO_LDFLAGS="$BOOST_LDFLAGS \
$PROTOBUF_LDFLAGS"
CAMEO_LIBS="$BOOST_THREAD_LIB \
$BOOST_SYSTEM_LIB \
$ZMQ_LIB \
$PROTOBUF_LIB"
......
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_SYSTEM
#
# DESCRIPTION
#
# Test for System library from the Boost C++ libraries. The macro requires
# a preceding call to AX_BOOST_BASE. Further documentation is available at
# <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_SYSTEM_LIB)
#
# And sets:
#
# HAVE_BOOST_SYSTEM
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
# Copyright (c) 2008 Michael Tindal
# Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 17
AC_DEFUN([AX_BOOST_SYSTEM],
[
AC_ARG_WITH([boost-system],
AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
[use the System library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-system=boost_system-gcc-mt ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_system_lib=""
else
want_boost="yes"
ax_boost_user_system_lib="$withval"
fi
],
[want_boost="yes"]
)
if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_BUILD])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS
AC_CACHE_CHECK(whether the Boost::System library is available,
ax_cv_boost_system,
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
[[boost::system::system_category]])],
ax_cv_boost_system=yes, ax_cv_boost_system=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_system" = "xyes"; then
AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
LDFLAGS_SAVE=$LDFLAGS
if test "x$ax_boost_user_system_lib" = "x"; then
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
done
if test "x$link_system" != "xyes"; then
for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
done
fi
else
for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
done
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_system" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
fi
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/Application.h"
#include "Application.h"
#include <sstream>
#include <iostream>
......@@ -22,25 +22,25 @@
#include <iostream>
#include <stdexcept>
#include <vector>
#include "../cameo/EventStreamSocket.h"
#include "../cameo/impl/ApplicationImpl.h"
#include "../cameo/impl/PublisherImpl.h"
#include "../cameo/impl/RequesterImpl.h"
#include "../cameo/impl/RequestImpl.h"
#include "../cameo/impl/ResponderImpl.h"
#include "../cameo/impl/Serializer.h"
#include "../cameo/impl/SocketImpl.h"
#include "../cameo/impl/SubscriberImpl.h"
#include "../cameo/impl/WaitingImpl.h"
#include "../cameo/impl/WaitingImplSet.h"
#include "../cameo/PortEvent.h"
#include "../cameo/ProtoType.h"
#include "../cameo/PublisherEvent.h"
#include "../cameo/ResultEvent.h"
#include "../cameo/Server.h"
#include "../cameo/StarterServerException.h"
#include "../cameo/StatusEvent.h"
#include "../cameo/StatusEvent.h"
#include "EventStreamSocket.h"
#include "impl/ApplicationImpl.h"
#include "impl/PublisherImpl.h"
#include "impl/RequesterImpl.h"
#include "impl/RequestImpl.h"
#include "impl/ResponderImpl.h"
#include "impl/Serializer.h"
#include "impl/SocketImpl.h"
#include "impl/SubscriberImpl.h"
#include "impl/WaitingImpl.h"
#include "impl/WaitingImplSet.h"
#include "PortEvent.h"
#include "ProtoType.h"
#include "PublisherEvent.h"
#include "ResultEvent.h"
#include "Server.h"
#include "StarterServerException.h"
#include "StatusEvent.h"
#include "StatusEvent.h"
using namespace std;
......
......@@ -23,13 +23,13 @@
#include <set>
#include <memory>
#include <stdint.h>
#include "../cameo/ConnectionTimeout.h"
#include "../cameo/PublisherCreationException.h"
#include "../cameo/RequesterCreationException.h"
#include "../cameo/ResponderCreationException.h"
#include "../cameo/Response.h"
#include "../cameo/Services.h"
#include "../cameo/StateException.h"
#include "ConnectionTimeout.h"
#include "PublisherCreationException.h"
#include "RequesterCreationException.h"
#include "ResponderCreationException.h"
#include "Response.h"
#include "Services.h"
#include "StateException.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/ConnectionTimeout.h"
#include "ConnectionTimeout.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/Event.h"
#include "Event.h"
#include <iostream>
......
......@@ -14,14 +14,14 @@
* limitations under the Licence.
*/
#include "../cameo/EventStreamSocket.h"
#include "../cameo/impl/SocketImpl.h"
#include "../cameo/impl/SocketWaitingImpl.h"
#include "../cameo/PortEvent.h"
#include "../cameo/PublisherEvent.h"
#include "../cameo/ResultEvent.h"
#include "../cameo/StatusEvent.h"
#include "EventStreamSocket.h"
#include "impl/SocketImpl.h"
#include "impl/SocketWaitingImpl.h"
#include "PortEvent.h"
#include "PublisherEvent.h"
#include "ResultEvent.h"
#include "StatusEvent.h"
#include "../proto/Messages.pb.h"
using namespace std;
......
......@@ -18,7 +18,7 @@
#define CAMEO_EVENTSTREAMSOCKET_H_
#include <memory>
#include "../cameo/Event.h"
#include "Event.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/PortEvent.h"
#include "PortEvent.h"
#include <iostream>
......
......@@ -18,7 +18,7 @@
#define CAMEO_PORTEVENT_H_
#include <iostream>
#include "../cameo/Event.h"
#include "Event.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/PublisherCreationException.h"
#include "PublisherCreationException.h"
namespace cameo {
......
......@@ -17,7 +17,7 @@
#ifndef CAMEO_PUBLISHERCREATIONEXCEPTION_H_
#define CAMEO_PUBLISHERCREATIONEXCEPTION_H_
#include "../cameo/RemoteException.h"
#include "RemoteException.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/PublisherEvent.h"
#include "PublisherEvent.h"
#include <iostream>
......
......@@ -18,7 +18,7 @@
#define CAMEO_PUBLISHEREVENT_H_
#include <iostream>
#include "../cameo/Event.h"
#include "Event.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/RemoteException.h"
#include "RemoteException.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/RequesterCreationException.h"
#include "RequesterCreationException.h"
namespace cameo {
......
......@@ -17,7 +17,7 @@
#ifndef CAMEO_REQUESTERCREATIONEXCEPTION_H_
#define CAMEO_REQUESTERCREATIONEXCEPTION_H_
#include "../cameo/RemoteException.h"
#include "RemoteException.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/ResponderCreationException.h"
#include "ResponderCreationException.h"
namespace cameo {
......
......@@ -17,7 +17,7 @@
#ifndef CAMEO_RESPONDERCREATIONEXCEPTION_H_
#define CAMEO_RESPONDERCREATIONEXCEPTION_H_
#include "../cameo/RemoteException.h"
#include "RemoteException.h"
namespace cameo {
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include "../cameo/Response.h"
#include "Response.h"
namespace cameo {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment