aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-10-15 12:16:46 +0100
committerJoão Valverde <j@v6e.pt>2017-10-17 18:50:09 +0000
commit55b0c251a0379a5a0a0d713c48717019acc965c6 (patch)
tree1f004683466f8cbad2a5337511cd42363c498ab6
parent1d238ec636ff051635a7ed194df5c49752788d69 (diff)
autotools: remove macOS Frameworks support
This treats macOS/OSX like any other Unix-like build target (Darwin), thus removing autotools support for macOS-specific build options. Anyone needing that is advised to use the fully-supported-on-macOS CMake build. Change-Id: I88e2fa7a8eea42241efcf84223ac2362d38b1e12 Reviewed-on: https://code.wireshark.org/review/23951 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--Makefile.am23
-rw-r--r--caputils/capture-pcap-util.c2
-rw-r--r--configure.ac42
-rw-r--r--wsutil/Makefile.am9
4 files changed, 6 insertions, 70 deletions
diff --git a/Makefile.am b/Makefile.am
index aaf17f3..42d7d2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -445,10 +445,7 @@ wireshark_common_ldadd = \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@PCAP_LIBS@ \
- @APPLICATIONSERVICES_FRAMEWORKS@ \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@ \
- $(EPAN_EXTRA_LIBS) \
+ $(EPAN_EXTRA_LIBS) \
@LIBNL_LIBS@
if HAVE_Qt
@@ -505,9 +502,7 @@ tshark_LDADD = \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
- ${EPAN_EXTRA_LIBS} \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@
+ ${EPAN_EXTRA_LIBS}
tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \
@@ -528,9 +523,7 @@ tfshark_LDADD = \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
- ${EPAN_EXTRA_LIBS} \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@
+ ${EPAN_EXTRA_LIBS}
rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \
@@ -551,9 +544,7 @@ rawshark_LDADD = \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
- ${EPAN_EXTRA_LIBS} \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@
+ ${EPAN_EXTRA_LIBS}
sharkd_SOURCES = \
$(SHARK_COMMON_SRC) \
@@ -582,9 +573,7 @@ sharkd_LDADD = \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
- ${EPAN_EXTRA_LIBS} \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@
+ ${EPAN_EXTRA_LIBS}
if HAVE_SPEEXDSP
sharkd_LDADD += $(SPEEXDSP_LIBS)
@@ -731,8 +720,6 @@ dumpcap_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
- @SYSTEMCONFIGURATION_FRAMEWORKS@ \
- @COREFOUNDATION_FRAMEWORKS@ \
@LIBCAP_LIBS@ \
@LIBNL_LIBS@
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c
index 87e0516..48d596f 100644
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@@ -103,7 +103,7 @@ static const char please_report[] =
* type for the interface.
*/
-#if defined(__APPLE__)
+#if defined(HAVE_MACOS_FRAMEWORKS)
#include <CoreFoundation/CoreFoundation.h>
#include <SystemConfiguration/SystemConfiguration.h>
diff --git a/configure.ac b/configure.ac
index 447e90a..d4baf70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1042,48 +1042,6 @@ AC_SUBST(LDFLAGS_BIGSHAREDLIB)
AC_SUBST(LDFLAGS_SHAREDLIB)
#
-# On "Darwin", which we assume to mean "macOS" rather than "iOS" or
-# "just Darwin" (as we don't currently support iOS, and as I don't
-# think you can build and run "just Darwin" as an OS for PCs), we
-# arrange to build some programs with Application Services so they
-# can launch Web browsers and Finder windows, arrange to build some
-# programs with System Configuration so they can get "friendly names"
-# and other information about interfaces, and build any programs that
-# use either of those frameworks or that report version information
-# with Core Foundation as the frameworks in question use it and as we
-# get version information from plists and thus need Core Foundation
-# to process those plists.
-#
-have_macos_frameworks=no
-case "$host_os" in
-darwin*)
- have_macos_frameworks=yes
- AC_DEFINE(HAVE_MACOS_FRAMEWORKS, 1, [Define to 1 if you have macOS frameworks])
- APPLICATIONSERVICES_FRAMEWORKS="-framework ApplicationServices"
- SYSTEMCONFIGURATION_FRAMEWORKS="-framework SystemConfiguration"
- COREFOUNDATION_FRAMEWORKS="-framework CoreFoundation"
-
- #
- # OK, so we have the macOS frameworks; do they include
- # CFPropertyListCreateWithStream, or do we have
- # to fall back on CFPropertyListCreateFromStream?
- # (They only differ in the error return, which we
- # don't care about. And, no, we shouldn't just
- # use CFPropertyListCreateFromStream, because it's
- # deprecated in newer releases.)
- #
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $COREFOUNDATION_FRAMEWORKS"
- AC_CHECK_FUNCS(CFPropertyListCreateWithStream)
- LIBS="$ac_save_LIBS"
- ;;
-esac
-AC_SUBST(APPLICATIONSERVICES_FRAMEWORKS)
-AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS)
-AC_SUBST(COREFOUNDATION_FRAMEWORKS)
-AM_CONDITIONAL(HAVE_MACOS_FRAMEWORKS, [test "x$have_macos_frameworks" = "xyes"])
-
-#
# If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a
# link directory.
#
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 62580c0..a0fcb5c 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -34,10 +34,6 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \
# Optional headers for ABI checking
wsutil_optional_abi_includes =
-if HAVE_MACOS_FRAMEWORKS
-wsutil_optional_abi_includes += cfutils.h
-endif
-
# Header files that don't declare replacement functions for functions
# present in the APIs/ABIs of some, but not all, targets.
libwsutil_nonrepl_INCLUDES = \
@@ -167,10 +163,6 @@ libwsutil_la_SOURCES = \
wsjsmn.c \
xtea.c
-if HAVE_MACOS_FRAMEWORKS
-libwsutil_la_SOURCES += cfutils.c cfutils.h
-endif
-
libwsutil_sse42_la_SOURCES = \
ws_mempbrk_sse42.c
@@ -181,7 +173,6 @@ libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
libwsutil_la_LIBADD = \
$(LTLIBOBJS) \
- @COREFOUNDATION_FRAMEWORKS@ \
@GLIB_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \