Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6737

As suggested by njtaylor0101 [AT] gmail.com: we (always) check for the gthread
module when checking glib so there's no need to check for it when checking GTK.
This prevents us, when configuring with gtk3, for checking for gthread-2.0
version 3.0.0 or later.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40684 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/aclocal-fallback/gtk-2.0.m4 b/aclocal-fallback/gtk-2.0.m4
index 144eadec8929e5e25bc9793cabeb5c94f53db345..b59ea4b16a1524bc0bb682ca7a67b26402970fa5 100644 (file)
--- a/aclocal-fallback/gtk-2.0.m4
+++ b/aclocal-fallback/gtk-2.0.m4
@@ -15,11 +15,8 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
   pkg_config_args=gtk+-2.0
   for module in . $4
   do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
+      # No modules to check for now
+      :
   done
 
   no_gtk=""

diff --git a/aclocal-fallback/gtk-3.0.m4 b/aclocal-fallback/gtk-3.0.m4
index 7d00bc1f6c2e625db4ca8df02935cd4c10b1e994..576cab368253fe93cbe12abea1317408484bc42e 100644 (file)
--- a/aclocal-fallback/gtk-3.0.m4
+++ b/aclocal-fallback/gtk-3.0.m4
@@ -15,11 +15,8 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
   pkg_config_args=gtk+-3.0
   for module in . $4
   do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
+      # No modules to check for now
+      :
   done
 
   no_gtk=""

diff --git a/configure.in b/configure.in
index 73ebc2aac1bffde177ca84b9a137c1f1fd9ca632..a1022898988e104323a60f977a51bc08bc454bb9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -801,7 +801,7 @@ if test "x$enable_wireshark" = "xyes"; then
                        have_gtk=yes
                        AC_DEFINE(HAVE_GTK, 1,
                            [Define to 1 if compiling with GTK])
-               ], have_gtk=no, gthread)
+               ], have_gtk=no)
 
        else
                AM_PATH_GTK_2_0(2.12.0,
@@ -811,7 +811,7 @@ if test "x$enable_wireshark" = "xyes"; then
                        have_gtk=yes
                        AC_DEFINE(HAVE_GTK, 1,
                            [Define to 1 if compiling with GTK])
-               ], have_gtk=no, gthread)
+               ], have_gtk=no)
        fi
 else
        have_gtk=no