ActiveSync: more explicit check for config.h
Don't depend on config.h being included indirectly.
This commit is contained in:
parent
a4ce729e6e
commit
4abe883d49
|
@ -21,7 +21,11 @@
|
|||
#ifndef INCL_ACTIVESYNCSOURCE
|
||||
#define INCL_ACTIVESYNCSOURCE
|
||||
|
||||
#include <config.h>
|
||||
#include <syncevo/SyncSource.h>
|
||||
|
||||
#ifdef ENABLE_ACTIVESYNC
|
||||
|
||||
#include <syncevo/PrefixConfigNode.h>
|
||||
#include <syncevo/SafeConfigNode.h>
|
||||
#include <syncevo/SmartPtr.h>
|
||||
|
@ -36,8 +40,6 @@
|
|||
#include <syncevo/declarations.h>
|
||||
SE_BEGIN_CXX
|
||||
|
||||
#ifdef ENABLE_ACTIVESYNC
|
||||
|
||||
/**
|
||||
* Synchronizes contacts, events, tasks and journals with an
|
||||
* ActiveSync server. Sub-classes provide the necessary specialization
|
||||
|
@ -221,7 +223,8 @@ class ActiveSyncCalendarSource : public ActiveSyncSource
|
|||
EasItemType getEasType() const { return m_type; }
|
||||
};
|
||||
|
||||
#endif // ENABLE_ACTIVESYNC
|
||||
|
||||
SE_END_CXX
|
||||
|
||||
#endif // ENABLE_ACTIVESYNC
|
||||
#endif // INCL_ACTIVESYNCSOURCE
|
||||
|
|
|
@ -20,6 +20,10 @@
|
|||
|
||||
#include "ActiveSyncSource.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_UNIT_TESTS
|
||||
# include <cppunit/extensions/TestFactoryRegistry.h>
|
||||
# include <cppunit/extensions/HelperMacros.h>
|
||||
|
|
|
@ -5,7 +5,8 @@ To compile this backend as part of SyncEvolution, ensure that this directory
|
|||
is visible at src/backends/activesync (symlink or copy), run ./autogen.sh at
|
||||
the top level, and use --enable-activesync in configure. To work around the
|
||||
missing libeassync.pc, on MeeGo install activesyncd-devel and use:
|
||||
ACTIVESYNC_CFLAGS="-I<path to sources>/libeassync/src/ -I/usr/include/libwbxml-1.0 -I/usr/include/libxml2/ -I/usr/include/evolution-data-server-2.32" ACTIVESYNC_LIBS=-leassync
|
||||
|
||||
--enable-activesync EASSYNC_CFLAGS="-I/home/pohly/src/activesyncd/libeassync/src/ -I/usr/include/libwbxml-1.0 -I/usr/include/libxml2/ -I/usr/include/evolution-data-server-2.32 -I/usr/include/dbus-1.0" EASSYNC_LIBS="-leassync -leas -leasmail"
|
||||
|
||||
Beware that the pre-compiled activesyncd must match the header files from
|
||||
the sources.
|
||||
|
|
Loading…
Reference in New Issue