diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-01-24 03:16:33 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-01-24 03:16:33 +0000 |
| commit | a2c21a2b53ea64532b3a451c9569be8fde85aacf (patch) | |
| tree | 86598b6d3723577346d3264828599dbad6eda7b2 | |
| parent | 13316398dd3a0e1258633bd92f4ff07f40fb0386 (diff) | |
| download | wireshark-a2c21a2b53ea64532b3a451c9569be8fde85aacf.tar.gz wireshark-a2c21a2b53ea64532b3a451c9569be8fde85aacf.tar.bz2 wireshark-a2c21a2b53ea64532b3a451c9569be8fde85aacf.zip | |
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.
svn path=/trunk/; revision=40684
| -rw-r--r-- | aclocal-fallback/gtk-2.0.m4 | 7 | ||||
| -rw-r--r-- | aclocal-fallback/gtk-3.0.m4 | 7 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/aclocal-fallback/gtk-2.0.m4 b/aclocal-fallback/gtk-2.0.m4 index 144eadec89..b59ea4b16a 100644 --- 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 7d00bc1f6c..576cab3682 100644 --- 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 73ebc2aac1..a102289898 100644 --- 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 |