Check for GLib 2.14 and gmodule support no matter what.
svn path=/trunk/; revision=31881
This commit is contained in:
parent
32ec99bc62
commit
e84e742d86
|
@ -677,7 +677,8 @@ if test "$GTK_OK" = "no" ; then
|
|||
wireshark_man=""
|
||||
# Honor GLIB_CFLAGS
|
||||
AM_PATH_GLIB_2_0(2.4.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gmodule)
|
||||
|
||||
# It's possible to compile GLib without GRegex but it doesn't look like anyone does.
|
||||
AM_PATH_GLIB_2_0(2.14.0, have_gregex=yes, have_gregex=no, gmodule)
|
||||
else
|
||||
wireshark_bin="wireshark\$(EXEEXT)"
|
||||
wireshark_man="wireshark.1"
|
||||
|
@ -685,7 +686,7 @@ else
|
|||
# Honor GLIB_CFLAGS
|
||||
AM_PATH_GLIB_2_0(2.4.0, , AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gmodule)
|
||||
# It's possible to compile GLib without GRegex but it doesn't look like anyone does.
|
||||
AM_PATH_GLIB_2_0(2.14.0, have_gregex=yes, have_gregex=no)
|
||||
AM_PATH_GLIB_2_0(2.14.0, have_gregex=yes, have_gregex=no, gmodule)
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue