[Iaxclient-cvs] SF.net SVN: iaxclient: [1049] trunk

[<jpg...@us...>]

Revision: 1049
          http://svn.sourceforge.net/iaxclient/?rev=1049&view=rev
Author:   jpgrayson
Date:     2007-07-02 12:58:17 -0700 (Mon, 02 Jul 2007)

Log Message:
-----------
Add test for GDK2.
Improve buildability of simpleclient/wx.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/simpleclient/wx/Makefile.am

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-07-02 19:48:05 UTC (rev 1048)
+++ trunk/configure.ac	2007-07-02 19:58:17 UTC (rev 1049)
@@ -197,6 +197,8 @@
 
 PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
 PKG_CHECK_MODULES(GTK2, [gtk >= 2.0], has_gtk2=yes, has_gtk2=no)
+PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)
+PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
 
 has_iax2=no
 if test ! x$enable_local_iax = xyes; then
@@ -350,6 +352,12 @@
          CLIENTS="$CLIENTS $client";;
 
       wx)
+         if test "x$has_wx" = "xno"; then
+            AC_MSG_ERROR([wx client requires wxWidgets])
+         fi
+         if ! test "x$has_gdk2" = "xyes"; then
+            AC_MSG_ERROR([wx client requires GDK2])
+         fi
          CLIENTS="$CLIENTS $client";;
 
       *) ;;

Modified: trunk/simpleclient/wx/Makefile.am
===================================================================
--- trunk/simpleclient/wx/Makefile.am	2007-07-02 19:48:05 UTC (rev 1048)
+++ trunk/simpleclient/wx/Makefile.am	2007-07-02 19:58:17 UTC (rev 1049)
@@ -2,11 +2,24 @@
 bin_PROGRAMS = wxiax
 wxiax_SOURCES = wx.cc
 
-AM_CPPFLAGS = -DDEFAULT_DESTSERV=\"guest@ast1\" -DDEFAULT_DESTEXT=\"1001\" \
-  -DDEFAULT_NUM_CALLS=1 -I$(top_srcdir)/lib $(WX_CPPFLAGS)
-AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY)
-LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)
+AM_CPPFLAGS =					\
+	-DDEFAULT_DESTSERV=\"guest@ast1\"	\
+	-DDEFAULT_DESTEXT=\"1001\"		\
+	-DDEFAULT_NUM_CALLS=1			\
+	-I$(top_srcdir)/lib			\
+	$(WX_CPPFLAGS)
 
+AM_CXXFLAGS =					\
+	$(GTK_CFLAGS)				\
+	$(WX_CXXFLAGS_ONLY)			\
+	$(GDK2_CFLAGS)
+
+LDADD =						\
+	$(top_builddir)/lib/libiaxclient.la	\
+	$(GTK_LIBS)				\
+	$(WX_LIBS)				\
+	$(GDK2_LIBS)
+
 if ! WIN32
 AM_CPPFLAGS += -DPOSIXSLEEP
 endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.