Debian Etch: fixes some compilation issues

With some tweaks the autotools on Debian Etch are good enough to
compile the code. However, distributions of SyncEvolution should
better be built with recent versions of the tools and then get compiled
on Debian Etch.

We need BOOST >= 1.34 because of BOOST_FOREACH(). The configure script
now checks for this. Debian Etch can get 1.35 from www.backports.org.
That version of BOOST shows that in some files <boost/algorithm/string/join.hpp>
was not explicitly included.

README

@@ -679,14 +679,17 @@ SyncEvolution source packages and will be used
 automatically. Instructions for working with upstream Synthesis
 sources directly are contained in the HACKING document.
 
-Also needed are the Evolution and Boost development files. For HTTP,
-either Curl or libsoup can be used. Debian based systems the required
-packages can be installed with
+Also needed are the Evolution and Boost (>= 1.35) development
+files. For HTTP, either Curl or libsoup can be used.
+
+On Debian based systems the required packages can be installed with
    apt-get install evolution-data-server-dev libdb3-dev \
                    libecal1.2-dev libebook1.2-dev \
                    libsoup2.4-dev \
                    libboost-dev
 
+See also the libsynthesis README file for other required packages.
+
 The test framework also requires CPPUnit:
    apt-get install libcppunit-dev
 

autogen.sh

@@ -30,7 +30,14 @@ sed -e "s;@CONFIG_SUBS@;$SUBS;" \
 libtoolize -c
 glib-gettextize --force --copy
 intltoolize --force --copy --automake
-aclocal -Im4
+aclocal -I m4
 autoheader
 automake -a -c -Wno-portability
 autoconf
+
+# This hack is required for the autotools on Debian Etch.
+# Without it, configure expects a po/Makefile where
+# only po/Makefile.in is available. This patch fixes
+# configure so that it uses po/Makefile.in, like more
+# recent macros do.
+perl -pi -e 's;test ! -f "po/Makefile";test ! -f "po/Makefile.in";; s;mv "po/Makefile" "po/Makefile.tmp";cp "po/Makefile.in" "po/Makefile.tmp";;' configure

configure-pre.in

@@ -264,8 +264,10 @@ AC_SUBST(GUI_CFLAGS)
 AC_SUBST(GUI_LIBS)
 
 
-# need Boost headers
-AX_BOOST_BASE()
+# Boost headers: boost/foreach.hpp is needed (1.33/Debian Etch
+# doesn't have it, 1.34/Ubuntu 8.10 Hardy does). 1.35 is available
+# as Debian Etch backport.
+AX_BOOST_BASE(1.34)
 
 # absolute patch to source of Synthesis client library
 SYNTHESIS_SRC=no-synthesis-source

src/core/EvolutionSyncClient.cpp

@@ -44,6 +44,7 @@ using namespace SyncEvolution;
 using namespace std;
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <boost/foreach.hpp>
 
 #include <sys/stat.h>

src/core/EvolutionSyncSource.cpp

@@ -24,6 +24,7 @@
 #include "Logging.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <boost/foreach.hpp>
 
 #include <list>

src/core/FilterConfigNode.cpp

@@ -21,6 +21,7 @@
 #include "EvolutionSyncClient.h"
 
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string/join.hpp>
 
 FilterConfigNode::FilterConfigNode(const boost::shared_ptr<ConfigNode> &node,
                                    const ConfigFilter &filter) :

src/core/SyncEvolutionCmdline.cpp

@@ -37,6 +37,7 @@
 using namespace std;
 
 #include <boost/shared_ptr.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>