[Iaxclient-cvs] SF.net SVN: iaxclient: [1050] trunk/configure.ac

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

Revision: 1050
          http://svn.sourceforge.net/iaxclient/?rev=1050&view=rev
Author:   jpgrayson
Date:     2007-07-02 13:40:30 -0700 (Mon, 02 Jul 2007)

Log Message:
-----------
Invoke PKG_CHECK_MODULES correctly for gtk+-2.0.
Improve automatic client detection. 

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-07-02 19:58:17 UTC (rev 1049)
+++ trunk/configure.ac	2007-07-02 20:40:30 UTC (rev 1050)
@@ -196,7 +196,7 @@
 ]))
 
 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(GTK2, [gtk+-2.0 >= 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)
 
@@ -307,7 +307,10 @@
    clients="$clients testcall"
 
    if test ! x$has_wx = xno; then
-      clients="$clients iaxphone wx"
+      clients="$clients iaxphone"
+      if test "x$has_gdk2" = xyes; then
+         clients="$clients wx"
+      fi
 
       if test x$has_wx_xrc = xyes; then
          clients="$clients iaxcomm"
@@ -322,7 +325,7 @@
       clients="$clients WinIAX"
    fi
 
-   if test ! x$WISH = x; then
+   if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then
       clients="$clients tkphone"
    fi
 fi
@@ -346,6 +349,12 @@
          CLIENTS="$CLIENTS $client";;
 
       tkphone)
+         if ! test "x$has_gtk2" = "xyes"; then
+            AC_MSG_ERROR([tkphone requires GTK2])
+         fi
+         if ! test "x$has_gdk2" = "xyes"; then
+            AC_MSG_ERROR([tkphone requires GDK2])
+         fi
          CLIENTS="$CLIENTS $client";;
 
       WinIAX)
@@ -355,6 +364,9 @@
          if test "x$has_wx" = "xno"; then
             AC_MSG_ERROR([wx client requires wxWidgets])
          fi
+         if ! test "x$has_gtk2" = "xyes"; then
+            AC_MSG_ERROR([wx client requires GTK2])
+         fi
          if ! test "x$has_gdk2" = "xyes"; then
             AC_MSG_ERROR([wx client requires GDK2])
          fi


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