diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-05-11 06:53:14 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-05-12 11:19:04 +0000 |
| commit | 21090cab5d721906249c1f44f0c357cb845665a9 (patch) | |
| tree | 6f70c0518718d077119462405b21cc735af9dfb3 /acinclude.m4 | |
| parent | b9c7b126f79b8420e7efe5ff5fcb346d0fa466a1 (diff) | |
| download | wireshark-21090cab5d721906249c1f44f0c357cb845665a9.tar.gz wireshark-21090cab5d721906249c1f44f0c357cb845665a9.tar.bz2 wireshark-21090cab5d721906249c1f44f0c357cb845665a9.zip | |
autotools: Move OSX autoconf macros to ws_osx.m4
Change-Id: Icde077957810a0eb2a99cdfd6ec57dfd04b4ad47
Reviewed-on: https://code.wireshark.org/review/15354
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f1fe4bde36..23235d3d71 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1579,84 +1579,6 @@ AC_DEFUN([PKG_WIRESHARK_CHECK_SYSTEM_MODULES], AC_WIRESHARK_GCC_SYSTEM_INCLUDE($1_CFLAGS) ]) -# -# AC_WIRESHARK_OSX_INTEGRATION_CHECK -# -# Checks for the presence of OS X integration functions in the GTK+ framework -# or as a separate library. -# -# GTK+ for MAC OS X 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], -[ - 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 Mac OS X 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 Mac OS X 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 -]) - # Based on AM_PATH_GTK in gtk-2.0.m4. dnl AC_WIRESHARK_QT_MODULE_CHECK_WITH_QT_VERSION([MODULE, MINIMUM-VERSION, |