osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

As suggested by Anders: only compile with GSEAL_ENABLE if we're using GTK 2.22 or higher (and not GTK3) 

svn path=/trunk/; revision=38341
This commit is contained in:
Jeff Morriss 2011-08-04 21:38:31 +00:00
parent 78ef4cdd88
commit c330acaa8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@ -730,13 +730,6 @@ AC_ARG_ENABLE(wireshark,
AC_HELP_STRING( [--enable-wireshark],
[build GTK+-based Wireshark @<:@default=yes, if GTK+ available@:>@]),
enable_wireshark=$enableval,enable_wireshark=yes)
if test x$enable_wireshark = xyes; then
CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
if test "x$with_gtk3" != "xyes"; then
# Enable GSEAL when not building with GTK3
CFLAGS="-DGSEAL_ENABLE $CFLAGS"
fi
fi
AC_ARG_ENABLE(ui-manager,
AC_HELP_STRING( [--enable-ui-manager],
@ -875,6 +868,13 @@ else
wireshark_SUBDIRS="codecs gtk"
# Don't use GLIB_CFLAGS
AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
if test $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -ge 22; then
# Enable GSEAL when building with GTK > 2.22 and < 3.0
# (Versions prior to 2.22 lacked some necessary accessors.)
CFLAGS="-DGSEAL_ENABLE $CFLAGS"
fi
fi
#