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
This commit is contained in:
Jeff Morriss 2012-01-24 03:16:33 +00:00
parent 13316398dd
commit a2c21a2b53
3 changed files with 6 additions and 12 deletions

View File

@ -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=""

View File

@ -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=""

View File

@ -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