ekiga r7004 - in trunk: . lib/engine/protocol/skel lib/gui

[mschneid svn gnome org]

Author: mschneid
Date: Tue Sep 16 09:36:02 2008
New Revision: 7004
URL: http://svn.gnome.org/viewvc/ekiga?rev=7004&view=rev

Log:
Allow linkage to debug versions of ptlib and opal
via --enable-debug. Fix headers of codecsbox.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/protocol/skel/call.h
   trunk/lib/gui/codecsbox.cpp
   trunk/lib/gui/codecsbox.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Sep 16 09:36:02 2008
@@ -518,19 +518,22 @@
 
 AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x${enable_gdu}" = "xyes")
 
-
+                                                                                  
 dnl ###########################################################################
-dnl PTLib Headers and Libraries
+dnl PTLib + OPAL Headers and Libraries
 dnl ###########################################################################
 PKG_CHECK_MODULES([PTLIB], [ptlib >= ${PTLIB_REC_VERSION}])
+PKG_CHECK_MODULES([OPAL], [opal >= ${OPAL_REC_VERSION}])
+
+AC_ARG_ENABLE([debug],
+              [AC_HELP_STRING([--enable-debug],[Link to debug versions of opal and ptlib (opal_d and ptlib_d)])],
+              [if test "x$enableval" = xyes; then 
+                 OPAL_LIBS=`$PKG_CONFIG opal --define-variable=suffix=_d --libs`
+                 PTLIB_LIBS=`$PKG_CONFIG ptlib --define-variable=suffix=_d --libs`
+              fi])
+
 AC_SUBST(PTLIB_CFLAGS)
 AC_SUBST(PTLIB_LIBS)
-                  
-
-dnl ###########################################################################
-dnl Opal Headers and Libraries
-dnl ###########################################################################
-PKG_CHECK_MODULES([OPAL], [opal >= ${OPAL_REC_VERSION}])
 AC_SUBST(OPAL_CFLAGS)
 AC_SUBST(OPAL_LIBS)
 

Modified: trunk/lib/engine/protocol/skel/call.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call.h	(original)
+++ trunk/lib/engine/protocol/skel/call.h	Tue Sep 16 09:36:02 2008
@@ -40,6 +40,8 @@
 
 #include <sigc++/sigc++.h>
 #include <time.h>
+#include <string>
+#include <sstream>
 
 namespace Ekiga
 {

Modified: trunk/lib/gui/codecsbox.cpp
==============================================================================
--- trunk/lib/gui/codecsbox.cpp	(original)
+++ trunk/lib/gui/codecsbox.cpp	Tue Sep 16 09:36:02 2008
@@ -40,7 +40,8 @@
 
 #include "gmconf.h"
 #include "codec-description.h"
-
+#include <stdlib.h>
+#include <string.h>
 
 /* Columns for the codecs page */
 enum {

Modified: trunk/lib/gui/codecsbox.h
==============================================================================
--- trunk/lib/gui/codecsbox.h	(original)
+++ trunk/lib/gui/codecsbox.h	Tue Sep 16 09:36:02 2008
@@ -43,9 +43,6 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <ptlib.h>
-#include <opal/manager.h>
-
 #include "call.h"