GNOME.org
 

[ekiga] Made the autotools files use BOOST signals2

commit 44ef7c66d055d01bede6627a8b31e4135f54f807
Author: Julien Puydt <jpuydt free fr>
Date:   Sat Sep 14 16:59:46 2013 +0200

    Made the autotools files use BOOST signals2

 configure.ac                      |   15 ++++++++-------
 lib/Makefile.am                   |   16 +++++++---------
 plugins/avahi/Makefile.am         |    7 +++----
 plugins/evolution/Makefile.am     |    7 +++----
 plugins/gstreamer/Makefile.am     |    7 +++----
 plugins/kab/Makefile.am           |    7 +++----
 plugins/kde/Makefile.am           |    7 +++----
 plugins/ldap/Makefile.am          |    8 ++++----
 plugins/libnotify/Makefile.am     |    7 +++----
 plugins/loudmouth/Makefile.am     |    7 +++----
 plugins/resource-list/Makefile.am |    9 ++++-----
 plugins/xcap/Makefile.am          |    7 +++----
 src/Makefile.am                   |   10 +++++-----
 13 files changed, 52 insertions(+), 62 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 977b323..44b734a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,15 +173,16 @@ AC_SUBST(GLIB_LIBS)
 dnl ###############################
 dnl   Mandatory BOOST support
 dnl ###############################
-AX_BOOST_BASE([1.34])
-AX_BOOST_SIGNALS
+AX_BOOST_BASE([1.53])
 
-if test "x${ax_cv_boost_signals}" == "xno"; then
-   AC_MSG_ERROR([You need the boost signals library to compile Ekiga])
-fi
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no)
+CPPFLAGS="$CPPFLAGS_save"
 
-BOOST_LIBS="${BOOST_SIGNALS_LIB}"
-AC_SUBST(BOOST_LIBS)
+if test "x$found_signals2" = "xno"; then
+   AC_MSG_ERROR([Could not find BOOST signals2 headers])
+fi
 
 
 dnl ###############################
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 69abe22..1854452 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 stacklib_LTLIBRARIES = libekiga.la
 stacklib_dir = $(stacklibdir)
 
-libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
+libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
 
 if !WIN32
 libekiga_la_LDFLAGS += -lX11
@@ -9,7 +9,9 @@ endif
 
 CLEANFILES =
 
-INCLUDES = \
+AM_CPPFLAGS = \
+       $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
+       $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS) \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DEKIGA_PLUGIN_DIR=\"$(PLUGIN_DIR)\" \
        -I$(top_srcdir) \
@@ -50,11 +52,7 @@ INCLUDES = \
 AM_CFLAGS = \
        $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS)
 
-AM_CPPFLAGS = \
-       $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
-       $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
-AM_LIBS = \
-       $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
+AM_LIBS = $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
 
 engine_dir = $(top_srcdir)/lib/engine
 components_dir = $(top_srcdir)/lib/engine/components
@@ -88,7 +86,7 @@ endif
 ##
 if !WIN32
 
-INCLUDES += -I$(top_srcdir)/lib/pixops
+AM_CPPFLAGS += -I$(top_srcdir)/lib/pixops
 EXTRA_DIST += $(top_srcdir)/lib/pixops/README
 
 libekiga_la_SOURCES += \
@@ -669,7 +667,7 @@ libekiga_la_SOURCES += \
 
 if !WIN32
 
-INCLUDES += \
+AM_CPPFLAGS += \
        -I$(top_srcdir)/lib/engine/components/x-videooutput
 
 libekiga_la_SOURCES += \
diff --git a/plugins/avahi/Makefile.am b/plugins/avahi/Makefile.am
index fc8f49c..404d78c 100644
--- a/plugins/avahi/Makefile.am
+++ b/plugins/avahi/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmavahi.la
 
 avahi_dir = $(top_srcdir)/plugins/avahi
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(AVAHI_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(AVAHI_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/account \
        -I$(top_srcdir)/lib/engine/presence \
@@ -22,4 +21,4 @@ libgmavahi_la_SOURCES = \
 libgmavahi_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmavahi_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(AVAHI_LIBS)
+       $(BOOST_LDFLAGS) $(AVAHI_LIBS)
diff --git a/plugins/evolution/Makefile.am b/plugins/evolution/Makefile.am
index 08a5009..368b230 100644
--- a/plugins/evolution/Makefile.am
+++ b/plugins/evolution/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmevolution.la
 
 evolution_dir = $(top_srcdir)/plugins/evolution
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/addressbook
 
@@ -21,4 +20,4 @@ libgmevolution_la_SOURCES = \
 libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmevolution_la_LIBADD =  \
        $(top_builddir)/lib/libekiga.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
+       $(BOOST_LDFLAGS) $(EDS_LIBS) $(GLIB_LIBS)
diff --git a/plugins/gstreamer/Makefile.am b/plugins/gstreamer/Makefile.am
index 2a8396b..cd7f673 100644
--- a/plugins/gstreamer/Makefile.am
+++ b/plugins/gstreamer/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmgstreamer.la
 
 gstreamer_dir = $(top_srcdir)/plugins/gstreamer/
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS) \
        -I$(top_srcdir)/lib/gmconf \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/notification \
@@ -28,4 +27,4 @@ libgmgstreamer_la_SOURCES = \
 
 libgmgstreamer_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmgstreamer_la_LIBADD = \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
+       $(BOOST_LDFLAGS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
diff --git a/plugins/kab/Makefile.am b/plugins/kab/Makefile.am
index 99530c4..4275411 100644
--- a/plugins/kab/Makefile.am
+++ b/plugins/kab/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmkab.la
 
 kab_dir = $(top_srcdir)/plugins/kab
 
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(KAB_CFLAGS)
-
-INCLUDES = \
+AM_CPPFLAGS = \
+       $(BOOST_CPPFLAGS) $(KAB_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/addressbook
 
@@ -20,4 +19,4 @@ libgmkab_la_SOURCES = \
 
 libgmkab_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmkab_la_LIBADD = \
-       $(KAB_LIBS)
\ No newline at end of file
+       $(KAB_LIBS)
diff --git a/plugins/kde/Makefile.am b/plugins/kde/Makefile.am
index 3d81577..e0bee3d 100644
--- a/plugins/kde/Makefile.am
+++ b/plugins/kde/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmkde.la
 
 kde_dir = $(top_srcdir)/plugins/kde
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(KDE_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(KDE_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework
 
 libgmkde_la_SOURCES = \
@@ -13,4 +12,4 @@ libgmkde_la_SOURCES = \
 
 libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmkde_la_LIBADD = \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(KDE_LIBS)
\ No newline at end of file
+       $(BOOST_LDFLAGS) $(KDE_LIBS)
diff --git a/plugins/ldap/Makefile.am b/plugins/ldap/Makefile.am
index b27719b..eb8d952 100644
--- a/plugins/ldap/Makefile.am
+++ b/plugins/ldap/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmldap.la
 
 ldap_dir = $(top_srcdir)/plugins/ldap
 
-AM_CPPFLAGS = $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
-
-INCLUDES = \
+AM_CPPFLAGS = \
+       $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
        -I$(top_srcdir)/lib/gmconf                      \
        -I$(top_srcdir)/lib/engine/framework            \
        -I$(top_srcdir)/lib/engine/addressbook
@@ -20,6 +19,7 @@ libgmldap_la_SOURCES = \
        $(ldap_dir)/ldap-main.cpp
 
 libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
+
 libgmldap_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
-       $(LDAP_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+       $(LDAP_LIBS) $(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/plugins/libnotify/Makefile.am b/plugins/libnotify/Makefile.am
index 5ebdb06..eb9b6e8 100644
--- a/plugins/libnotify/Makefile.am
+++ b/plugins/libnotify/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmlibnotify.la
 
 libnotify_dir = $(top_srcdir)/plugins/libnotify
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(NOTIFY_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(NOTIFY_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/notification \
        -I$(top_srcdir)/lib/engine/protocol
@@ -15,4 +14,4 @@ libgmlibnotify_la_SOURCES = \
 libgmlibnotify_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmlibnotify_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(NOTIFY_LIBS)
+       $(BOOST_LDFLAGS) $(NOTIFY_LIBS)
diff --git a/plugins/loudmouth/Makefile.am b/plugins/loudmouth/Makefile.am
index 1dde557..82e672d 100644
--- a/plugins/loudmouth/Makefile.am
+++ b/plugins/loudmouth/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmloudmouth.la
 
 loudmouth_dir = $(top_srcdir)/plugins/loudmouth
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS) \
        -I$(top_srcdir)/lib/gmconf \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/account \
@@ -36,4 +35,4 @@ libgmloudmouth_la_SOURCES = \
 libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmloudmouth_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
+       $(BOOST_LDFLAGS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
diff --git a/plugins/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
index 263c761..d561ecf 100644
--- a/plugins/resource-list/Makefile.am
+++ b/plugins/resource-list/Makefile.am
@@ -2,12 +2,11 @@ plugin_LTLIBRARIES = libgmresource_list.la
 
 resource_list_dir = $(top_srcdir)/plugins/resource-list
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
-
-INCLUDES =                                             \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
        -I$(top_srcdir)/lib/gmconf                      \
        -I$(top_srcdir)/lib/engine/framework            \
-       -I$(top_srcdir)/lib/engine/presence     \
+       -I$(top_srcdir)/lib/engine/presence             \
        -I$(top_srcdir)/lib/engine/account              \
        -I$(top_srcdir)/plugins/xcap
 
@@ -33,4 +32,4 @@ libgmresource_list_la_LDFLAGS = \
 libgmresource_list_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
        $(top_builddir)/plugins/xcap/libgmxcap.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+       $(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/plugins/xcap/Makefile.am b/plugins/xcap/Makefile.am
index 612c69e..a870455 100644
--- a/plugins/xcap/Makefile.am
+++ b/plugins/xcap/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmxcap.la
 
 xcap_dir = $(top_srcdir)/plugins/xcap
 
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SOUP_CFLAGS)
-
-INCLUDES = \
+AM_CXXFLAGS = \
+       $(BOOST_CPPFLAGS) $(SOUP_CFLAGS) \
        -I$(top_srcdir)/lib/engine/framework
 
 libgmxcap_la_SOURCES = \
@@ -18,4 +17,4 @@ libgmxcap_la_SOURCES = \
 libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmxcap_la_LIBADD = \
        $(top_builddir)/lib/libekiga.la \
-       $(BOOST_LDFLAGS) $(BOOST_LIBS) $(SOUP_LIBS)
+       $(BOOST_LDFLAGS) $(SOUP_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index c086640..f74faf3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/lib                             \
        -I$(top_srcdir)/lib/gmconf                      \
        -I$(top_srcdir)/lib/gui                         \
@@ -31,14 +31,14 @@ BUILT_SOURCES = src/revision.h
 
 # XVideo/X
 if !WIN32
-INCLUDES +=                                            \
+AM_CPPFLAGS +=                                                 \
        -I$(top_srcdir)/lib/engine/videooutput/common   \
        -I$(top_srcdir)/lib/engine/videooutput/x
 endif
 
 # DirectX
 if HAVE_DX
-INCLUDES +=                                            \
+AM_CPPFLAGS +=                                                 \
        -I$(top_srcdir)/lib/engine/videooutput/common   \
        -I$(top_srcdir)/lib/engine/videooutput/dx
 endif
@@ -75,7 +75,7 @@ ekiga_SOURCES +=              \
        dbus-helper/dbus.cpp
 
 # find gmmarshallers.h
-INCLUDES += \
+AM_CPPFLAGS += \
        -I$(top_builddir)/lib
 
 nodist_ekiga_SOURCES +=                \
@@ -134,7 +134,7 @@ src/revision.h:
         fi
 
 AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) 
$(XML_CFLAGS)
-AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) 
$(XML_LIBS)
+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(XML_LIBS)
 
 ekiga_LDADD = \
        $(top_builddir)/lib/libekiga.la $(AM_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]