diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-17 13:47:17 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-12 07:14:32 +0000 |
| commit | 2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738 (patch) | |
| tree | 8b14d373b97ea9162a46e8b61f42919f2a6c5514 /configure.ac | |
| parent | 1ab019f409f2855d3b51717a237cc482242887e9 (diff) | |
| download | wireshark-2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738.tar.gz | |
[GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).
Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.
Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).
Add missing 'expert_ok.png' file to distribution (GTK only).
Minor improvements to style/structure of ui/gtk/Makefile.am.
Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index cee651ea00..ae257e920c 100644 --- a/configure.ac +++ b/configure.ac @@ -1786,6 +1786,13 @@ AC_SUBST(GLIB_MIN_VERSION) # 2.42.0: 22 Sep 2014 # 2.44.0: 23 Mar 2014 +# Check for GResource support +PKG_CHECK_MODULES([GRESOURCE], [gio-2.0 >= 2.32 gdk-pixbuf-2.0 >= 2.26], [have_gresource=yes], [have_gresource=no]) +AM_CONDITIONAL(HAVE_GRESOURCE, test "x$have_gresource" = "xyes") +if test "x$have_gresource" = "xyes"; then + AC_DEFINE(HAVE_GRESOURCE, 1, [Defined if GLib GResource is supported]) +fi + use_glib_cflags="true" if test "$have_gtk" = "yes" -a "$have_qt" = "yes" ; then # We have both GTK and Qt and thus will be building both wireshark @@ -3411,3 +3418,4 @@ echo " Use POSIX capabilities library : $libcap_message" echo " Use GeoIP library : $geoip_message" echo " Use nl library : $libnl_message" echo " Use SBC codec library : $have_sbc" +#echo " Use GResource : $have_gresource" |