GNOME.org
 

[ekiga] Added code to init loudmouth code -- doesn't do anything more yet

commit 96904b2d3e987c882beabb3886b19c8490179972
Author: Julien Puydt <jpuydt noether localdomain>
Date:   Sat Nov 29 10:41:20 2008 +0100

    Added code to init loudmouth code -- doesn't do anything more yet

 configure.ac                                       |   23 ++++++++-
 lib/engine/Makefile.am                             |    9 ++++
 lib/engine/components/Makefile.am                  |    9 ++--
 lib/engine/components/loudmouth/Makefile.am        |   14 +++++
 lib/engine/components/loudmouth/loudmouth-main.cpp |   51 ++++++++++++++++++++
 lib/engine/components/loudmouth/loudmouth-main.h   |   47 ++++++++++++++++++
 lib/engine/engine.cpp                              |    9 +++-
 7 files changed, 156 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 801aa33..1d6508b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -685,6 +685,23 @@ fi
 AM_CONDITIONAL(HAVE_XCAP, test "x$found_xcap" = "xyes")
 
 
+dnl   LOUDMOUTH support
+dnl ###############################
+LOUDMOUTH="disabled"
+
+AC_ARG_ENABLE(loudmouth, [  --enable-loudmouth           Enable Loudmouth support],enable_loudmouth=yes,)
+
+if test "x$enable_loudmouth" = "xyes"; then
+   PKG_CHECK_MODULES([LOUDMOUTH], [loudmouth-1.0])
+   found_loudmouth=yes
+   LOUDMOUTH="enabled"
+   AC_SUBST(LOUDMOUTH_CFLAGS)
+   AC_SUBST(LOUDMOUTH_LIBS)
+  AC_DEFINE(HAVE_LOUDMOUTH,1,[Loudmouth support])
+fi
+
+AM_CONDITIONAL(HAVE_LOUDMOUTH, test "x$found_loudmouth" = "xyes")
+
 dnl ###############################
 dnl   Gnome-Doc-Utils
 dnl ###############################
@@ -845,11 +862,14 @@ lib/engine/gui/Makefile
 lib/engine/gui/gtk-core/Makefile
 lib/engine/gui/gtk-frontend/Makefile
 lib/engine/components/Makefile
-lib/engine/components/gmconf-personal-details/Makefile
 lib/engine/components/avahi-publisher/Makefile
+lib/engine/components/evolution/Makefile
+lib/engine/components/gmconf-personal-details/Makefile
 lib/engine/components/gstreamer/Makefile
 lib/engine/components/kde/Makefile
 lib/engine/components/libnotify/Makefile
+lib/engine/components/loudmouth/Makefile
+lib/engine/components/opal/Makefile
 lib/engine/components/resource-list/Makefile
 lib/engine/components/gnome-session/Makefile
 lib/engine/components/xcap/Makefile
@@ -900,6 +920,7 @@ echo "               GStreamer support  :  $GSTREAMER"
 echo "            KAddressBook support  :  $KAB"
 echo "                     KDE support  :  $KDE"
 echo "                    XCAP support  :  $XCAP"
+echo "                Loudmouth support :  $LOUDMOUTH"
 echo ""
 echo "                         OS Type  :  $target_os"
 echo "                    Machine Type  :  $target_cpu"
diff --git a/lib/engine/Makefile.am b/lib/engine/Makefile.am
index 8ad8b40..eb73f0e 100644
--- a/lib/engine/Makefile.am
+++ b/lib/engine/Makefile.am
@@ -22,8 +22,14 @@ INCLUDES = 								\
 	-I$(top_srcdir)/lib/engine/protocol				\
 	-I$(top_srcdir)/lib/engine/components/gmconf-personal-details	\
 	-I$(top_srcdir)/lib/engine/components/avahi-publisher		\
+	-I$(top_srcdir)/lib/engine/components/call-history		\
+	-I$(top_srcdir)/lib/engine/components/evolution		        \
+	-I$(top_srcdir)/lib/engine/components/gmconf-personal-details	\
 	-I$(top_srcdir)/lib/engine/components/gstreamer			\
+	-I$(top_srcdir)/lib/engine/components/kab			\
 	-I$(top_srcdir)/lib/engine/components/kde			\
+	-I$(top_srcdir)/lib/engine/components/ldap			\
+	-I$(top_srcdir)/lib/engine/components/loudmouth			\
 	-I$(top_srcdir)/lib/engine/components/opal	                \
 	-I$(top_srcdir)/lib/engine/components/ptlib	                \
 	-I$(top_srcdir)/lib/engine/components/call-history		\
@@ -167,6 +173,9 @@ endif
 if HAVE_NOTIFY
 INCLUDES += -I$(top_srcdir)/lib/engine/components/libnotify/
 libekiga_engine_la_LIBADD += components/libnotify/libgmlibnotify.la
+
+if HAVE_LOUDMOUTH
+libekiga_engine_la_LIBADD += components/loudmouth/libgmloudmouth.la
 endif
 
 #### FIXME should be removed at a later stage
diff --git a/lib/engine/components/Makefile.am b/lib/engine/components/Makefile.am
index c40df7d..0a5e8af 100644
--- a/lib/engine/components/Makefile.am
+++ b/lib/engine/components/Makefile.am
@@ -28,7 +28,7 @@ EDS_DIR = evolution
 endif
 
 if HAVE_AVAHI
-AVAHI_DIR = avahi-publisher
+AVAHI_DIR = avahi-publisher avahi
 endif
 
 if HAVE_GSTREAMER
@@ -47,8 +47,8 @@ if HAVE_XCAP
 XCAP_DIRS = xcap resource-list
 endif
 
-if HAVE_AVAHI
-AVAHI_DIR += avahi
+if HAVE_LOUDMOUTH
+LOUDMOUTH_DIR = loudmouth
 endif
 
 SUBDIRS =                       \
@@ -72,4 +72,5 @@ SUBDIRS =                       \
 	$(KAB_DIR)              \
 	$(DX_DIR)               \
 	$(X_DIR)                \
-	$(XCAP_DIRS)
+	$(XCAP_DIRS)		\
+	$(LOUDMOUTH_DIR)
diff --git a/lib/engine/components/loudmouth/Makefile.am b/lib/engine/components/loudmouth/Makefile.am
new file mode 100644
index 0000000..303023a
--- /dev/null
+++ b/lib/engine/components/loudmouth/Makefile.am
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libgmloudmouth.la
+
+loudmouth_dir = $(top_srcdir)/lib/engine/components/loudmouth
+
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(LOUDMOUTH_CFLAGS)
+
+INCLUDES = \
+	-I$(top_srcdir)/lib/engine/framework
+
+libgmloudmouth_la_SOURCES = \
+	$(loudmouth_dir)/loudmouth-main.h \
+	$(loudmouth_dir)/loudmouth-main.cpp
+
+libgmloudmouth_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/loudmouth/loudmouth-main.cpp b/lib/engine/components/loudmouth/loudmouth-main.cpp
new file mode 100644
index 0000000..da46fad
--- /dev/null
+++ b/lib/engine/components/loudmouth/loudmouth-main.cpp
@@ -0,0 +1,51 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                         loudmouth-main.cpp  -  description
+ *                         ------------------------------------------
+ *   begin                : written in 2008 by Julien Puydt
+ *   copyright            : (c) 2008 by Julien Puydt
+ *   description          : code to hook loudmouth into the main program
+ *
+ */
+
+#include "loudmouth-main.h"
+
+bool
+loudmouth_init (Ekiga::ServiceCore &/*services*/,
+		int */*argc*/,
+		char **/*argv*/[])
+{
+  bool result = false;
+
+  // nothing yet
+  result = true;
+
+  return result;
+}
diff --git a/lib/engine/components/loudmouth/loudmouth-main.h b/lib/engine/components/loudmouth/loudmouth-main.h
new file mode 100644
index 0000000..0b851d3
--- /dev/null
+++ b/lib/engine/components/loudmouth/loudmouth-main.h
@@ -0,0 +1,47 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                         loudmouth-main.h  -  description
+ *                         ------------------------------------------
+ *   begin                : written in 2008 by Julien Puydt
+ *   copyright            : (c) 2008 by Julien Puydt
+ *   description          : code to hook loudmouth into the main program
+ *
+ */
+
+#ifndef __LOUDMOUTH_MAIN_H__
+#define __LOUDMOUTH_MAIN_H__
+
+#include "services.h"
+
+bool loudmouth_init (Ekiga::ServiceCore &services,
+		     int *argc,
+		     char **argv[]);
+
+#endif
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 3f96ffa..338e71a 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -120,11 +120,14 @@
 #include "resource-list-main.h"
 #endif
 
+#ifdef HAVE_LOUDMOUTH
+#include "loudmouth-main.h"
+#endif
+
 #define DEBUG_STARTUP 0
 
 #if DEBUG_STARTUP
 #include <iostream>
-#endif
 
 static Ekiga::ServiceCore *service_core = NULL;
 
@@ -275,6 +278,10 @@ engine_init (int argc,
 
   local_roster_bridge_init (kickstart);
 
+#ifdef HAVE_LOUDMOUTH
+  loudmouth_init (*core, &argc, &argv);
+#endif
+
   plugin_init (kickstart);
 
   kickstart.kick (*service_core, &argc, &argv);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]