aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-10-15 19:58:55 +0100
committerJoão Valverde <j@v6e.pt>2017-10-16 20:31:00 +0000
commit356d6b8db04bfc15a1d0a5fabbc79aad0e81d592 (patch)
treeb346c363b55304db2fc5a81b0498c5e4027063d0 /m4
parent0a3cf5d5cf09c17afd06c64172780b4a02acdb62 (diff)
GTK: Remove OSX integration library support
Only Wireshark Qt is officially supported on macOS. Change-Id: Id0e3429891173d4b91e99061bcf11df2e38bc0bf Reviewed-on: https://code.wireshark.org/review/23931 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'm4')
-rw-r--r--m4/ws_osx_integration_check.m481
1 files changed, 0 insertions, 81 deletions
diff --git a/m4/ws_osx_integration_check.m4 b/m4/ws_osx_integration_check.m4
deleted file mode 100644
index 8c72538..0000000
--- a/m4/ws_osx_integration_check.m4
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Autoconf script for Wireshark
-#
-
-#
-# AC_WIRESHARK_OSX_INTEGRATION_CHECK
-#
-# Checks for the presence of macOS integration functions in the GTK+ framework
-# or as a separate library.
-#
-# GTK+ for macOS now lives on www.gtk.org at:
-#
-# http://www.gtk.org/download/macos.php
-#
-# Details on building with GTK-OSX are available at:
-#
-# http://live.gnome.org/GTK%2B/OSX/Building
-#
-# The GTK-OSX library has been renamed to gtkmacintegration.
-# It was previously named igemacintegration.
-#
-# http://live.gnome.org/GTK%2B/OSX/Integration
-# for the old Carbon-based integration functions
-#
-AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
-[dnl
- AC_WIRESHARK_PUSH_FLAGS
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-
- #
- # Check for the new integration functions in a -lgtkmacintegration
- # library.
- #
- AC_CHECK_LIB(gtkmacintegration, gtkosx_application_set_menu_bar,
- [
- AC_DEFINE(HAVE_GTKOSXAPPLICATION, 1,
- [Define to 1 if -lgtkmacintegration includes the GtkOSXApplication Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
- ])
-
- if test x$have_ige_mac = x
- then
- #
- # Not found - check for the old integration functions in
- # the Gtk framework.
- #
- AC_CHECK_LIB(Gtk, gtk_mac_menu_set_menu_bar,
- [
- AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE macOS Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lGtk"
- ])
- fi
-
- if test x$have_ige_mac = x
- then
- #
- # Not found - check for the old integration functions in
- # a -lgtkmacintegration library.
- #
- AC_CHECK_LIB(gtkmacintegration, gtk_mac_menu_set_menu_bar,
- [
- AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE macOS Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
- ])
- fi
- LIBS="$ac_save_LIBS"
- AC_WIRESHARK_POP_FLAGS
-])