GNOME.org
 

[ekiga] Detect boost in configure script

commit 41c0995cd708726f4b83ba8e4eea22f76918e573
Author: Julien Puydt <jpuydt gnome org>
Date:   Sat Aug 29 08:43:19 2009 +0200

    Detect boost in configure script
    
    For that I added a m4 file to do the job, then modified
    almost all Makefile.am files.

 configure.ac                                       |    5 +
 lib/engine/Makefile.am                             |    4 +-
 lib/engine/account/Makefile.am                     |    4 +-
 lib/engine/addressbook/Makefile.am                 |    4 +-
 lib/engine/audioinput/Makefile.am                  |    4 +-
 lib/engine/audiooutput/Makefile.am                 |    4 +-
 lib/engine/chat/Makefile.am                        |    4 +-
 lib/engine/components/avahi-publisher/Makefile.am  |    4 +-
 lib/engine/components/avahi/Makefile.am            |    4 +-
 lib/engine/components/call-history/Makefile.am     |    4 +-
 lib/engine/components/dx-videooutput/Makefile.am   |    4 +-
 lib/engine/components/echo/Makefile.am             |    4 +-
 lib/engine/components/evolution/Makefile.am        |    4 +-
 .../components/gmconf-personal-details/Makefile.am |    4 +-
 lib/engine/components/gnome-session/Makefile.am    |    4 +-
 lib/engine/components/gstreamer/Makefile.am        |    4 +-
 lib/engine/components/hal-dbus/Makefile.am         |    4 +-
 lib/engine/components/kab/Makefile.am              |    2 +-
 lib/engine/components/kde/Makefile.am              |    4 +-
 lib/engine/components/ldap/Makefile.am             |    4 +-
 lib/engine/components/libnotify/Makefile.am        |    4 +-
 lib/engine/components/local-roster/Makefile.am     |    4 +-
 lib/engine/components/loudmouth/Makefile.am        |    4 +-
 lib/engine/components/mlogo-videoinput/Makefile.am |    4 +-
 lib/engine/components/null-audioinput/Makefile.am  |    4 +-
 lib/engine/components/null-audiooutput/Makefile.am |    4 +-
 lib/engine/components/opal/Makefile.am             |    4 +-
 lib/engine/components/ptlib/Makefile.am            |    4 +-
 lib/engine/components/resource-list/Makefile.am    |    4 +-
 lib/engine/components/x-videooutput/Makefile.am    |    4 +-
 lib/engine/components/xcap/Makefile.am             |    4 +-
 lib/engine/framework/Makefile.am                   |    4 +-
 lib/engine/friend-or-foe/Makefile.am               |    2 +-
 lib/engine/gui/gtk-core/Makefile.am                |    2 +-
 lib/engine/gui/gtk-frontend/Makefile.am            |    2 +-
 lib/engine/hal/Makefile.am                         |    4 +-
 lib/engine/notification/Makefile.am                |    4 +-
 lib/engine/plugin/Makefile.am                      |    4 +-
 lib/engine/presence/Makefile.am                    |    4 +-
 lib/engine/protocol/Makefile.am                    |    4 +-
 lib/engine/videoinput/Makefile.am                  |    4 +-
 lib/engine/videooutput/Makefile.am                 |    4 +-
 lib/gui/Makefile.am                                |    4 +-
 m4/ax_boost_base.m4                                |  219 ++++++++++++++++++++
 src/Makefile.am                                    |    4 +-
 45 files changed, 306 insertions(+), 82 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 25e4081..46d421b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_INIT(ekiga, 3.3.1, http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga)
 AC_CANONICAL_TARGET
 AC_PREREQ(2.53)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/gui/main.cpp)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -186,6 +187,10 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+dnl ###############################
+dnl   Mandatory BOOST support
+dnl ###############################
+AX_BOOST_BASE([1.34])
 
 dnl ###############################
 dnl   Mandatory SIGC++ support
diff --git a/lib/engine/Makefile.am b/lib/engine/Makefile.am
index 93b7bd3..0bb7918 100644
--- a/lib/engine/Makefile.am
+++ b/lib/engine/Makefile.am
@@ -47,8 +47,8 @@ INCLUDES = 								\
 
 libekiga_engine_la_SOURCES = engine.h engine.cpp
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GTK_CFLAGS)
-AM_LIBS = $(SIGC_LIBS) $(GTK_LIBS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GTK_CFLAGS)
+AM_LIBS = $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GTK_LIBS)
 
 libekiga_engine_la_LDFLAGS = -export-dynamic
 libekiga_engine_la_LIBADD = \
diff --git a/lib/engine/account/Makefile.am b/lib/engine/account/Makefile.am
index de8dc8f..bc80894 100644
--- a/lib/engine/account/Makefile.am
+++ b/lib/engine/account/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libaccount.la
 
 account_dir = $(top_srcdir)/lib/engine/account
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
@@ -15,4 +15,4 @@ libaccount_la_SOURCES = \
 	$(account_dir)/account-core.h			\
 	$(account_dir)/account-core.cpp
 
-libaccount_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
+libaccount_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/addressbook/Makefile.am b/lib/engine/addressbook/Makefile.am
index 291a357..07b39fe 100644
--- a/lib/engine/addressbook/Makefile.am
+++ b/lib/engine/addressbook/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmaddressbook.la
 
 addressbook_dir = $(top_srcdir)/lib/engine/addressbook
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework
@@ -19,4 +19,4 @@ libgmaddressbook_la_SOURCES = \
 libgmaddressbook_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmaddressbook_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
-	$(SIGC_LIBS) $(GLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/audioinput/Makefile.am b/lib/engine/audioinput/Makefile.am
index 7afddb8..99a8bdb 100644
--- a/lib/engine/audioinput/Makefile.am
+++ b/lib/engine/audioinput/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmaudioinput.la
 
 audioinput_dir = $(top_srcdir)/lib/engine/audioinput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -22,4 +22,4 @@ libgmaudioinput_la_SOURCES = \
 libgmaudioinput_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmaudioinput_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/audiooutput/Makefile.am b/lib/engine/audiooutput/Makefile.am
index cc6989e..1ba4028 100644
--- a/lib/engine/audiooutput/Makefile.am
+++ b/lib/engine/audiooutput/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmaudiooutput.la
 
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -24,4 +24,4 @@ libgmaudiooutput_la_SOURCES = \
 libgmaudiooutput_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmaudiooutput_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/chat/Makefile.am b/lib/engine/chat/Makefile.am
index fdace9a..61f19cc 100644
--- a/lib/engine/chat/Makefile.am
+++ b/lib/engine/chat/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmchat.la
 
 chat_dir = $(top_srcdir)/lib/engine/chat
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -17,4 +17,4 @@ libgmchat_la_SOURCES = \
 	$(chat_dir)/chat-simple.h		\
 	$(chat_dir)/chat-multiple.h
 
-libgmchat_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS)
+libgmchat_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/components/avahi-publisher/Makefile.am b/lib/engine/components/avahi-publisher/Makefile.am
index f6bfec9..cb0658c 100644
--- a/lib/engine/components/avahi-publisher/Makefile.am
+++ b/lib/engine/components/avahi-publisher/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libavahipublisher.la
 
 avahi_publisher_dir = $(top_srcdir)/lib/engine/components/avahi-publisher/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(AVAHI_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(AVAHI_CFLAGS)
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf	 		\
@@ -22,4 +22,4 @@ libavahipublisher_la_LIBADD = 						\
 	$(top_builddir)/lib/engine/framework/libgmframework.la		\
 	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
-libavahipublisher_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(AVAHI_LIBS)
+libavahipublisher_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(AVAHI_LIBS)
diff --git a/lib/engine/components/avahi/Makefile.am b/lib/engine/components/avahi/Makefile.am
index f194ec2..ef1b4b3 100644
--- a/lib/engine/components/avahi/Makefile.am
+++ b/lib/engine/components/avahi/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmavahi.la
 
 avahi_dir = $(top_srcdir)/lib/engine/components/avahi
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(AVAHI_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(AVAHI_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -20,4 +20,4 @@ libgmavahi_la_SOURCES = \
 libgmavahi_la_LIBADD = \
 	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
-libgmavahi_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(AVAHI_LIBS)
+libgmavahi_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(AVAHI_LIBS)
diff --git a/lib/engine/components/call-history/Makefile.am b/lib/engine/components/call-history/Makefile.am
index e5311d7..afc7e29 100644
--- a/lib/engine/components/call-history/Makefile.am
+++ b/lib/engine/components/call-history/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcall-history.la
 
 call_history_dir = $(top_srcdir)/lib/engine/components/call-history
 
-AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(XML_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -23,4 +23,4 @@ libcall_history_la_SOURCES = \
 libcall_history_la_LIBADD = \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
-libcall_history_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)
+libcall_history_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/components/dx-videooutput/Makefile.am b/lib/engine/components/dx-videooutput/Makefile.am
index e1bd19f..8c3127b 100644
--- a/lib/engine/components/dx-videooutput/Makefile.am
+++ b/lib/engine/components/dx-videooutput/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libgmvideooutput-dx.la
 videooutput_dir = $(top_srcdir)/lib/engine/components/dx-videooutput
 common_dir = $(top_srcdir)/lib/engine/components/common-videooutput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@ libgmvideooutput_dx_la_SOURCES = \
 	$(videooutput_dir)/videooutput-main-dx.cpp    \
 	$(videooutput_dir)/videooutput-main-dx.h
 
-libgmvideooutput_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)
+libgmvideooutput_dx_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/components/echo/Makefile.am b/lib/engine/components/echo/Makefile.am
index 1aadfd0..f835de4 100644
--- a/lib/engine/components/echo/Makefile.am
+++ b/lib/engine/components/echo/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmechochat.la
 
 echochat_dir = $(top_srcdir)/lib/engine/components/echo
 
-AM_CXXFLAGS = $(SIGC_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -19,4 +19,4 @@ libgmechochat_la_SOURCES = \
 	$(echochat_dir)/echo-main.h		\
 	$(echochat_dir)/echo-main.cpp
 
-libgmechochat_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
+libgmechochat_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/components/evolution/Makefile.am b/lib/engine/components/evolution/Makefile.am
index 00a44d5..544c7a1 100644
--- a/lib/engine/components/evolution/Makefile.am
+++ b/lib/engine/components/evolution/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmevolution.la
 
 evolution_dir = $(top_srcdir)/lib/engine/components/evolution
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -22,4 +22,4 @@ libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmevolution_la_LIBADD =  \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
-	$(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
\ No newline at end of file
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/gmconf-personal-details/Makefile.am b/lib/engine/components/gmconf-personal-details/Makefile.am
index 8a17f01..510c6c3 100644
--- a/lib/engine/components/gmconf-personal-details/Makefile.am
+++ b/lib/engine/components/gmconf-personal-details/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmconfpersonaldetails.la
 
 gmconf_personal_details_dir = $(top_srcdir)/lib/engine/components/gmconf-personal-details
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = 					\
 	-I$(top_srcdir)/lib/gmconf	 	\
@@ -19,4 +19,4 @@ libgmconfpersonaldetails_la_SOURCES = 						\
 libgmconfpersonaldetails_la_LIBADD = 						\
 	$(top_builddir)/lib/engine/framework/libgmframework.la
 
-libgmconfpersonaldetails_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmconfpersonaldetails_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/components/gnome-session/Makefile.am b/lib/engine/components/gnome-session/Makefile.am
index 5da69e8..f2ddc06 100644
--- a/lib/engine/components/gnome-session/Makefile.am
+++ b/lib/engine/components/gnome-session/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmgnomesession.la
 
 gnomesession_dir = $(top_srcdir)/lib/engine/components/gnome-session
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -15,4 +15,4 @@ libgmgnomesession_la_SOURCES = \
 libgmgnomesession_la_LIBADD = \
 	$(top_builddir)/lib/engine/protocol/libgmprotocol.la
 
-libgmgnomesession_la_LDFLAGS = -export-dynamic -no-undefined $(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
+libgmgnomesession_la_LDFLAGS = -export-dynamic -no-undefined $(LDAP_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
diff --git a/lib/engine/components/gstreamer/Makefile.am b/lib/engine/components/gstreamer/Makefile.am
index 3710132..b2a7e10 100644
--- a/lib/engine/components/gstreamer/Makefile.am
+++ b/lib/engine/components/gstreamer/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmgstreamer.la
 
 gstreamer_dir = $(top_srcdir)/lib/engine/components/gstreamer/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
@@ -25,4 +25,4 @@ libgmgstreamer_la_SOURCES = \
 
 libgmgstreamer_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmgstreamer_la_LIBADD = \
-	$(SIGC_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/hal-dbus/Makefile.am b/lib/engine/components/hal-dbus/Makefile.am
index 8eed8cb..82b395b 100644
--- a/lib/engine/components/hal-dbus/Makefile.am
+++ b/lib/engine/components/hal-dbus/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libgmhal-dbus.la
 hal_dir = $(top_srcdir)/lib/engine/components/hal-dbus
 hal_builddir = $(top_builddir)/lib/engine/components/hal-dbus
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(PTLIB_CFLAGS)
 
 AM_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
 
@@ -35,7 +35,7 @@ BUILT_SOURCES = hal-marshal.h hal-marshal.c
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libgmhal_dbus_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(PTLIB_LIBS)
+libgmhal_dbus_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(PTLIB_LIBS)
 
 hal-marshal.h: hal-marshal.list
 	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $  tmp && mv $  tmp $@
diff --git a/lib/engine/components/kab/Makefile.am b/lib/engine/components/kab/Makefile.am
index 19a0d0b..6b0e12a 100644
--- a/lib/engine/components/kab/Makefile.am
+++ b/lib/engine/components/kab/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmkab.la
 
 kab_dir = $(top_srcdir)/lib/engine/components/kab
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(KAB_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(KAB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
diff --git a/lib/engine/components/kde/Makefile.am b/lib/engine/components/kde/Makefile.am
index aa37e6d..a40f487 100644
--- a/lib/engine/components/kde/Makefile.am
+++ b/lib/engine/components/kde/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmkde.la
 
 kde_dir = $(top_srcdir)/lib/engine/components/kde
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(KDE_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(KDE_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework
@@ -13,4 +13,4 @@ libgmkde_la_SOURCES = \
 
 libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmkde_la_LIBADD = \
-	$(SIGC_LIBS) $(KDE_LIBS)
\ No newline at end of file
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(KDE_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/ldap/Makefile.am b/lib/engine/components/ldap/Makefile.am
index ab978bf..054c4b2 100644
--- a/lib/engine/components/ldap/Makefile.am
+++ b/lib/engine/components/ldap/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmldap.la
 
 ldap_dir = $(top_srcdir)/lib/engine/components/ldap
 
-AM_CPPFLAGS = $(LDAP_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
+AM_CPPFLAGS = $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf 			\
@@ -23,4 +23,4 @@ libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmldap_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
-	$(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+	$(LDAP_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/components/libnotify/Makefile.am b/lib/engine/components/libnotify/Makefile.am
index 37a5763..4729649 100644
--- a/lib/engine/components/libnotify/Makefile.am
+++ b/lib/engine/components/libnotify/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmlibnotify.la
 
 libnotify_dir = $(top_srcdir)/lib/engine/components/libnotify
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(NOTIFY_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(NOTIFY_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -16,4 +16,4 @@ libgmlibnotify_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(top_builddir)/lib/engine/notification/libnotification.la
 
-libgmlibnotify_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(NOTIFY_LIBS)
+libgmlibnotify_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(NOTIFY_LIBS)
diff --git a/lib/engine/components/local-roster/Makefile.am b/lib/engine/components/local-roster/Makefile.am
index 0ee2dc1..3789e9d 100644
--- a/lib/engine/components/local-roster/Makefile.am
+++ b/lib/engine/components/local-roster/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = liblocal-roster.la
 
 local_roster_dir = $(top_srcdir)/lib/engine/components/local-roster
 
-AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(XML_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
@@ -28,4 +28,4 @@ liblocal_roster_la_LIBADD = \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
 	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
-liblocal_roster_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)
+liblocal_roster_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/components/loudmouth/Makefile.am b/lib/engine/components/loudmouth/Makefile.am
index bf627fd..7939e6d 100644
--- a/lib/engine/components/loudmouth/Makefile.am
+++ b/lib/engine/components/loudmouth/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmloudmouth.la
 
 loudmouth_dir = $(top_srcdir)/lib/engine/components/loudmouth
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -30,4 +30,4 @@ libgmloudmouth_la_SOURCES = \
 	$(loudmouth_dir)/loudmouth-dialect.cpp
 
 libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
-libgmloudmouth_la_LIBADD = $(SIGC_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
+libgmloudmouth_la_LIBADD = $(BOOST_LDFLAGS) $(SIGC_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/mlogo-videoinput/Makefile.am b/lib/engine/components/mlogo-videoinput/Makefile.am
index 7242613..0a9cbe2 100644
--- a/lib/engine/components/mlogo-videoinput/Makefile.am
+++ b/lib/engine/components/mlogo-videoinput/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmvideoinput-mlogo.la
 
 videoinput_dir = $(top_srcdir)/lib/engine/components/mlogo-videoinput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/pixmaps \
@@ -19,4 +19,4 @@ libgmvideoinput_mlogo_la_SOURCES = \
 	$(videoinput_dir)/videoinput-main-mlogo.h \
 	$(videoinput_dir)/videoinput-main-mlogo.cpp 
 
-libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/null-audioinput/Makefile.am b/lib/engine/components/null-audioinput/Makefile.am
index 91b2a8f..87c7f1e 100644
--- a/lib/engine/components/null-audioinput/Makefile.am
+++ b/lib/engine/components/null-audioinput/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmaudioinput-null.la
 
 audioinput_dir = $(top_srcdir)/lib/engine/components/null-audioinput/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -18,4 +18,4 @@ libgmaudioinput_null_la_SOURCES = \
 	$(audioinput_dir)/audioinput-main-null.h \
 	$(audioinput_dir)/audioinput-main-null.cpp 
 
-libgmaudioinput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudioinput_null_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/null-audiooutput/Makefile.am b/lib/engine/components/null-audiooutput/Makefile.am
index 3fca6e9..5bd9486 100644
--- a/lib/engine/components/null-audiooutput/Makefile.am
+++ b/lib/engine/components/null-audiooutput/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmaudiooutput-null.la
 
 audiooutput_dir = $(top_srcdir)/lib/engine/components/null-audiooutput/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -17,4 +17,4 @@ libgmaudiooutput_null_la_SOURCES = \
 	$(audiooutput_dir)/audiooutput-main-null.h \
 	$(audiooutput_dir)/audiooutput-main-null.cpp 
 
-libgmaudiooutput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudiooutput_null_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/opal/Makefile.am b/lib/engine/components/opal/Makefile.am
index 160fd22..454faee 100644
--- a/lib/engine/components/opal/Makefile.am
+++ b/lib/engine/components/opal/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmopal.la
 
 opal_dir = $(top_srcdir)/lib/engine/components/opal
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = 					        \
 	-I$(top_srcdir)/lib				\
@@ -62,4 +62,4 @@ libgmopal_la_SOURCES += \
 	$(opal_dir)/sip-endpoint.cpp
 endif
 
-libgmopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)
+libgmopal_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/ptlib/Makefile.am b/lib/engine/components/ptlib/Makefile.am
index 159e190..3b06edd 100644
--- a/lib/engine/components/ptlib/Makefile.am
+++ b/lib/engine/components/ptlib/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmptlib.la
 
 ptlib_dir = $(top_srcdir)/lib/engine/components/ptlib
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf                      \
@@ -30,4 +30,4 @@ libgmptlib_la_SOURCES = \
 	$(ptlib_dir)/audiooutput-main-ptlib.h           \
 	$(ptlib_dir)/audiooutput-main-ptlib.cpp 
 
-libgmptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmptlib_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/components/resource-list/Makefile.am b/lib/engine/components/resource-list/Makefile.am
index 44dc52e..88bfe0e 100644
--- a/lib/engine/components/resource-list/Makefile.am
+++ b/lib/engine/components/resource-list/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmresource_list.la
 
 resource_list_dir = $(top_srcdir)/lib/engine/components/resource-list/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
@@ -32,4 +32,4 @@ libgmresource_list_la_LDFLAGS = \
 	$(PLUGINS_LIBTOOL_FLAGS)
 libgmresource_list_la_LIBADD = \
 	$(top_builddir)/lib/engine/components/xcap/libgmxcap.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/components/x-videooutput/Makefile.am b/lib/engine/components/x-videooutput/Makefile.am
index f7d1c30..a3e834e 100644
--- a/lib/engine/components/x-videooutput/Makefile.am
+++ b/lib/engine/components/x-videooutput/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libgmvideooutput-x.la
 videooutput_dir = $(top_srcdir)/lib/engine/components/x-videooutput
 common_dir = $(top_srcdir)/lib/engine/components/common-videooutput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(GLIB_CFLAGS) $(XV_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(GLIB_CFLAGS) $(XV_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@ libgmvideooutput_x_la_SOURCES = \
 	$(videooutput_dir)/videooutput-main-x.cpp    \
 	$(videooutput_dir)/videooutput-main-x.h
 
-libgmvideooutput_x_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(GLIB_LIBS) $(XV_LIBS)
+libgmvideooutput_x_la_LDFLAGS = -export-dynamic -no-undefined $(BOOST_LDFLAGS) $(SIGC_LIBS) $(PTLIB_LIBS) $(GLIB_LIBS) $(XV_LIBS)
diff --git a/lib/engine/components/xcap/Makefile.am b/lib/engine/components/xcap/Makefile.am
index ee4d326..85965f8 100644
--- a/lib/engine/components/xcap/Makefile.am
+++ b/lib/engine/components/xcap/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgmxcap.la
 
 xcap_dir = $(top_srcdir)/lib/engine/components/xcap/
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(SOUP_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(SOUP_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework
@@ -16,4 +16,4 @@ libgmxcap_la_SOURCES = \
 	$(xcap_dir)/xcap-main.cpp
 
 libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
-libgmxcap_la_LIBADD = $(SIGC_LIBS) $(SOUP_LIBS)
\ No newline at end of file
+libgmxcap_la_LIBADD = $(BOOST_LDFLAGS) $(SIGC_LIBS) $(SOUP_LIBS)
\ No newline at end of file
diff --git a/lib/engine/framework/Makefile.am b/lib/engine/framework/Makefile.am
index 43c24db..2dc1b5f 100644
--- a/lib/engine/framework/Makefile.am
+++ b/lib/engine/framework/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmframework.la
 
 framework_dir = $(top_srcdir)/lib/engine/framework
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf			\
@@ -52,4 +52,4 @@ libgmframework_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmframework_la_LIBADD = \
 	$(top_builddir)/lib/gmconf/libgmconf.la \
 	$(top_builddir)/lib/platform/libgmplatform.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/friend-or-foe/Makefile.am b/lib/engine/friend-or-foe/Makefile.am
index aab2ac0..e991744 100644
--- a/lib/engine/friend-or-foe/Makefile.am
+++ b/lib/engine/friend-or-foe/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmfriendorfoe.la
 
 friend_or_foe_dir = $(top_srcdir)/lib/engine/friend-or-foe
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = -I$(top_srcdir)/lib/engine/framework
 
diff --git a/lib/engine/gui/gtk-core/Makefile.am b/lib/engine/gui/gtk-core/Makefile.am
index 654752d..8bba60a 100644
--- a/lib/engine/gui/gtk-core/Makefile.am
+++ b/lib/engine/gui/gtk-core/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmgtk-core.la
 
 gtk_core_dir = $(top_srcdir)/lib/engine/gui/gtk-core
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GTK_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/toolbox \
diff --git a/lib/engine/gui/gtk-frontend/Makefile.am b/lib/engine/gui/gtk-frontend/Makefile.am
index 8dcf47f..2e3905e 100644
--- a/lib/engine/gui/gtk-frontend/Makefile.am
+++ b/lib/engine/gui/gtk-frontend/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgmgtk-frontend.la
 
 gtk_frontend_dir = $(top_srcdir)/lib/engine/gui/gtk-frontend
 
-AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = $(XML_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GTK_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/ 					\
diff --git a/lib/engine/hal/Makefile.am b/lib/engine/hal/Makefile.am
index a11a59f..dad228c 100644
--- a/lib/engine/hal/Makefile.am
+++ b/lib/engine/hal/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmhal.la
 
 hal_dir = $(top_srcdir)/lib/engine/hal
 
-AM_CXXFLAGS = $(SIGC_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -13,4 +13,4 @@ libgmhal_la_SOURCES = \
 	$(hal_dir)/hal-core.h		\
 	$(hal_dir)/hal-core.cpp
 
-libgmhal_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS)
+libgmhal_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/notification/Makefile.am b/lib/engine/notification/Makefile.am
index e59c162..b79a8f7 100644
--- a/lib/engine/notification/Makefile.am
+++ b/lib/engine/notification/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libnotification.la
 
 notification_dir = $(top_srcdir)/lib/engine/notification
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -12,4 +12,4 @@ libnotification_la_SOURCES = \
 	$(notification_dir)/notification-core.h \
 	$(notification_dir)/notification-dummy.cpp
 
-libnotification_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
+libnotification_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/plugin/Makefile.am b/lib/engine/plugin/Makefile.am
index f0173b9..298c716 100644
--- a/lib/engine/plugin/Makefile.am
+++ b/lib/engine/plugin/Makefile.am
@@ -4,7 +4,7 @@ plugin_dir = $(top_srcdir)/lib/engine/plugin
 
 AM_CPPFLAGS = \
 	-DEKIGA_PLUGIN_DIR=\"$(PLUGIN_DIR)\" \
-	$(SIGC_CFLAGS) $(GLIB_CFLAGS)
+	$(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
@@ -15,4 +15,4 @@ libplugin_la_SOURCES = \
 	$(plugin_dir)/plugin-core.cpp
 
 libplugin_la_LDFLAGS = $(STACKLIB_LDFLAGS)
-libplugin_la_LIBADD = $(SIGC_LIBS) $(GLIB_LIBS)
\ No newline at end of file
+libplugin_la_LIBADD = $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/presence/Makefile.am b/lib/engine/presence/Makefile.am
index 9656eeb..8f1d736 100644
--- a/lib/engine/presence/Makefile.am
+++ b/lib/engine/presence/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmpresence.la
 
 presence_dir = $(top_srcdir)/lib/engine/presence
 
-AM_CXXFLAGS = $(SIGC_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -25,4 +25,4 @@ libgmpresence_la_SOURCES = \
 libgmpresence_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmpresence_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
-	$(SIGC_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/protocol/Makefile.am b/lib/engine/protocol/Makefile.am
index 1d6e0f8..4f14c79 100644
--- a/lib/engine/protocol/Makefile.am
+++ b/lib/engine/protocol/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmprotocol.la
 
 protocol_dir = $(top_srcdir)/lib/engine/protocol/
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework
@@ -17,4 +17,4 @@ libgmprotocol_la_SOURCES = \
 	$(protocol_dir)/codec-description.h		\
 	$(protocol_dir)/codec-description.cpp
 
-libgmprotocol_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
+libgmprotocol_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/videoinput/Makefile.am b/lib/engine/videoinput/Makefile.am
index 2a97515..bd40bb3 100644
--- a/lib/engine/videoinput/Makefile.am
+++ b/lib/engine/videoinput/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmvideoinput.la
 
 videoinput_dir = $(top_srcdir)/lib/engine/videoinput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -23,4 +23,4 @@ libgmvideoinput_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmvideoinput_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(top_builddir)/lib/engine/videooutput/libgmvideooutput.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/videooutput/Makefile.am b/lib/engine/videooutput/Makefile.am
index 1a8718e..54d48fa 100644
--- a/lib/engine/videooutput/Makefile.am
+++ b/lib/engine/videooutput/Makefile.am
@@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libgmvideooutput.la
 
 videooutput_dir = $(top_srcdir)/lib/engine/videooutput
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@ libgmvideooutput_la_SOURCES = \
 libgmvideooutput_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmvideooutput_la_LIBADD = \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
-	$(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+	$(BOOST_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index f0149b6..a503a95 100644
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -80,8 +80,8 @@ INCLUDES += -I$(top_srcdir)/lib/pixops
 endif
 
 AM_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) -std=c99
-AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS) $(SIGC_CFLAGS)
-AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) $(SIGC_LIBS)
+AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS)
+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS)
 
 libgmwidgets_la_LDFLAGS = -export-dynamic
 libgmwidgets_la_LIBADD = $(AM_LIBS)
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
new file mode 100644
index 0000000..b2a00b8
--- /dev/null
+++ b/m4/ax_boost_base.m4
@@ -0,0 +1,219 @@
+# ===========================================================================
+#          http://www.nongnu.org/autoconf-archive/ax_boost_base.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_BASE([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   Test for the Boost C++ libraries of a particular version (or newer)
+#
+#   If no path to the installed boost library is given the macro searchs
+#   under /usr, /usr/local, /opt and /opt/local and evaluates the
+#   $BOOST_ROOT environment variable. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+#
+#   And sets:
+#
+#     HAVE_BOOST
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas randspringer de>
+#
+#   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.
+
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+	AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]),
+	[
+    if test "$withval" = "no"; then
+		want_boost="no"
+    elif test "$withval" = "yes"; then
+        want_boost="yes"
+        ac_boost_path=""
+    else
+	    want_boost="yes"
+        ac_boost_path="$withval"
+	fi
+    ],
+    [want_boost="yes"])
+
+
+AC_ARG_WITH([boost-libdir],
+        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
+        [Force given directory for boost libraries. Note that this will overwrite library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+        [
+        if test -d $withval
+        then
+                ac_boost_lib_path="$withval"
+        else
+                AC_MSG_ERROR(--with-boost-libdir expected directory name)
+        fi
+        ],
+        [ac_boost_lib_path=""]
+)
+
+if test "x$want_boost" = "xyes"; then
+	boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+	boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+	boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+	boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+	boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+	if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+		boost_lib_version_req_sub_minor="0"
+    	fi
+	WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+	AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+	succeeded=no
+
+	dnl first we check the system location for boost libraries
+	dnl this location ist chosen if boost libraries are installed with the --layout=system option
+	dnl or if you install boost with RPM
+	if test "$ac_boost_path" != ""; then
+		BOOST_LDFLAGS="-L$ac_boost_path/lib"
+		BOOST_CPPFLAGS="-I$ac_boost_path/include"
+	else
+		for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+			if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+				BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+				BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+				break;
+			fi
+		done
+	fi
+
+    dnl overwrite ld flags if we have required special directory with
+    dnl --with-boost-libdir parameter
+    if test "$ac_boost_lib_path" != ""; then
+       BOOST_LDFLAGS="-L$ac_boost_lib_path"
+    fi
+
+	CPPFLAGS_SAVED="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+	export CPPFLAGS
+
+	LDFLAGS_SAVED="$LDFLAGS"
+	LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+	export LDFLAGS
+
+	AC_LANG_PUSH(C++)
+     	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	@%:@include <boost/version.hpp>
+	]], [[
+	#if BOOST_VERSION >= $WANT_BOOST_VERSION
+	// Everything is okay
+	#else
+	#  error Boost version is too old
+	#endif
+	]])],[
+        AC_MSG_RESULT(yes)
+	succeeded=yes
+	found_system=yes
+       	],[
+       	])
+	AC_LANG_POP([C++])
+
+
+
+	dnl if we found no boost with system layout we search for boost libraries
+	dnl built and installed without the --layout=system option or for a staged(not installed) version
+	if test "x$succeeded" != "xyes"; then
+		_version=0
+		if test "$ac_boost_path" != ""; then
+			if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+				for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+					_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+					V_CHECK=`expr $_version_tmp \> $_version`
+					if test "$V_CHECK" = "1" ; then
+						_version=$_version_tmp
+					fi
+					VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+					BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+				done
+			fi
+		else
+			for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+				if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+					for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+						_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+						V_CHECK=`expr $_version_tmp \> $_version`
+						if test "$V_CHECK" = "1" ; then
+							_version=$_version_tmp
+	               					best_path=$ac_boost_path
+						fi
+					done
+				fi
+			done
+
+			VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+			BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+            if test "$ac_boost_lib_path" = ""
+            then
+               BOOST_LDFLAGS="-L$best_path/lib"
+            fi
+
+	    		if test "x$BOOST_ROOT" != "x"; then
+				if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
+					version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+					stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+			        	stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+					V_CHECK=`expr $stage_version_shorten \>\= $_version`
+                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+						AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+						BOOST_CPPFLAGS="-I$BOOST_ROOT"
+						BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
+					fi
+				fi
+	    		fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+		AC_LANG_PUSH(C++)
+	     	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		@%:@include <boost/version.hpp>
+		]], [[
+		#if BOOST_VERSION >= $WANT_BOOST_VERSION
+		// Everything is okay
+		#else
+		#  error Boost version is too old
+		#endif
+		]])],[
+        	AC_MSG_RESULT(yes)
+		succeeded=yes
+		found_system=yes
+       		],[
+	       	])
+		AC_LANG_POP([C++])
+	fi
+
+	if test "$succeeded" != "yes" ; then
+		if test "$_version" = "0" ; then
+			AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+		else
+			AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+		fi
+	else
+		AC_SUBST(BOOST_CPPFLAGS)
+		AC_SUBST(BOOST_LDFLAGS)
+		AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+	fi
+
+        CPPFLAGS="$CPPFLAGS_SAVED"
+       	LDFLAGS="$LDFLAGS_SAVED"
+fi
+
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index 66fce4e..d974478 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,8 +152,8 @@ src/revision.h:
           fi \
         fi
 
-AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
-AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
+AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
 
 ekiga_LDADD = \
 	$(top_builddir)/lib/libekiga.la $(top_builddir)/lib/engine/libekiga_engine.la $(AM_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]