diff options
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | m4/ws_osx.m4 | 49 |
3 files changed, 45 insertions, 28 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 040d774454..97d3f8aaa4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1829,7 +1829,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK], # # While we're at it, look for QtMacExtras. (Presumably - # if we're not building for OS X, it won't be present.) + # if we're not building for macOS, it won't be present.) # # XXX - is there anything in QtX11Extras or QtWinExtras # that we should be using? diff --git a/configure.ac b/configure.ac index a1990893d4..13ed6076f0 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ if test ! -z "$CXX"; then # system, and AC_PROG_CXX looks for, among other things, # "CC" as a C++ compiler, and, if you have a case-insensitive # file system and a C compiler named "cc" (both true, by - # default, on OS X), AC_PROG_CXX may end up thinking it's + # default, on macOS), AC_PROG_CXX may end up thinking it's # the C++ compiler. # # So we check by feeding the purported C++ compiler a @@ -222,7 +222,7 @@ if test -z "$PKG_CONFIG"; then fi # -# Add configure argument to select OSX deployment target. +# Add configure argument to select macOS deployment target. # AC_WIRESHARK_OSX_DEPLOY_TARGET @@ -523,7 +523,7 @@ AM_CONDITIONAL(HAVE_RPM, [test "x$have_rpm" = xyes]) # Debian AC_CHECK_PROG(HAVE_DPKG_BUILDPACKAGE, dpkg-buildpackage, "yes", "no") -# OS X +# macOS AC_CHECK_PROG(HAVE_XCODEBUILD, xcodebuild, "yes", "no") AC_CHECK_PROG(HAVE_HDIUTIL, hdiutil, "yes", "no") AC_CHECK_PROG(HAVE_BLESS, bless, "yes", "no") @@ -537,7 +537,7 @@ fi AC_SUBST(HAVE_OSX_PACKAGING) # -# Use this as a proxy for "is this OS X" (just in case somebody actually +# Use this as a proxy for "is this macOS" (just in case somebody actually # built and installed Darwin as an OS, perhaps with some X11-based GUI, # don't look for Darwin). # @@ -1118,7 +1118,7 @@ AC_SUBST(LDFLAGS_BIGSHAREDLIB) AC_SUBST(LDFLAGS_SHAREDLIB) # -# On "Darwin", which we assume to mean "OS X" rather than "iOS" or +# 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 @@ -1134,13 +1134,13 @@ have_os_x_frameworks=no case "$host_os" in darwin*) have_os_x_frameworks=yes - AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have OS X frameworks]) + AC_DEFINE(HAVE_OS_X_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 OS X frameworks; do they include + # 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 @@ -1599,15 +1599,15 @@ fi if test "x$have_gtk" = "xyes" then # - # We have GTK+; do we want the OS X integration functions and, + # We have GTK+; do we want the macOS integration functions and, # if so, do we have them and, if so, which versions do we have, # the old Carbon-based ones or the new Cocoa-based ones? # - AC_MSG_CHECKING(whether to use OS X integration functions) + AC_MSG_CHECKING(whether to use macOS integration functions) AC_ARG_WITH(osx-integration, AC_HELP_STRING( [--with-osx-integration], - [use OS X integration functions @<:@default=yes, if available@:>@]), + [use macOS integration functions @<:@default=yes, if available@:>@]), [ if test $withval = no then @@ -3028,7 +3028,7 @@ AC_OUTPUT if test "x$have_gtk" = "xyes"; then gtk_lib_message=" (with GTK+ v$GTK_VERSION" if test "x$have_ige_mac" = "xyes"; then - gtk_lib_message="$gtk_lib_message and OS X integration)" + gtk_lib_message="$gtk_lib_message and macOS integration)" else gtk_lib_message="$gtk_lib_message)" fi diff --git a/m4/ws_osx.m4 b/m4/ws_osx.m4 index ff08adcd82..5ad9bc5b69 100644 --- a/m4/ws_osx.m4 +++ b/m4/ws_osx.m4 @@ -5,23 +5,23 @@ # # AC_WIRESHARK_OSX_DEPLOY_TARGET # -# Checks for OSX deployment target and selects version. +# Checks for macOS deployment target and selects version. # AC_DEFUN([AC_WIRESHARK_OSX_DEPLOY_TARGET], [dnl AC_ARG_ENABLE(osx-deploy-target, AC_HELP_STRING( [--enable-osx-deploy-target], - [choose an OS X deployment target @<:@default=major release on which you're building@:>@]), + [choose a macOS deployment target @<:@default=major release on which you're building@:>@]), [ # - # Is this OS X? + # Is this macOS? # case "$host_os" in darwin*) # # Yes. # - # Let the user specify an OS X release to use as a + # Let the user specify an macOS release to use as a # deplayment target; if they specify that we should # have a deployment target but don't specify the # deployment target, then, if we have SDKs available, @@ -30,7 +30,7 @@ AC_ARG_ENABLE(osx-deploy-target, # rather than against the headers and libraries in # /usr/include and /usr/lib. # - # Check for an OS X deployment target early, so that + # Check for an macOS deployment target early, so that # as many tests using the compiler are done using the # flags that we'll be using when building. # @@ -47,7 +47,7 @@ AC_ARG_ENABLE(osx-deploy-target, # # The user said --enable-osx-deploy-target, but # didn't say what version to target; target the - # major version number of the version of OS X on + # major version number of the version of macOS on # which we're running. # # (We quote the command so that we can use @@ -65,12 +65,12 @@ AC_ARG_ENABLE(osx-deploy-target, # No. Fail, because whatever the user intended for us to # do, we can't do it. # - AC_MSG_ERROR([--enable-osx-deploy-target specified on an OS other than OS X]) + AC_MSG_ERROR([--enable-osx-deploy-target specified on an OS other than macOS]) ;; esac ],[ # - # Is this OS X? + # Is this macOS? # case "$host_os" in darwin*) @@ -78,7 +78,7 @@ AC_ARG_ENABLE(osx-deploy-target, # Yes. # # If we have SDKs available, default to targeting the major - # version number of the version of OS X on which we're + # version number of the version of macOS on which we're # running. # # (We quote the command so that we can use autoconf's @@ -106,7 +106,24 @@ AC_ARG_ENABLE(osx-deploy-target, if test ! -z "$deploy_target" then - AC_MSG_CHECKING([whether we can build for OS X $deploy_target]) + # + # Avoid anachronisms. + # + case $deploy_target in + + 10.0|10.1|10.2|10.3|10.4|10.5|10.6|10.7) + osname="Mac OS X" + ;; + + 10.8|10.9|10.10|10.11) + osname="OS X" + ;; + + *) + osname="macOS" + ;; + esac + AC_MSG_CHECKING([whether we can build for $osname $deploy_target]) case $deploy_target in 10.0|10.1|10.2) @@ -114,7 +131,7 @@ then # I'm not sure this would even work. # AC_MSG_RESULT(no) - AC_MSG_ERROR([We don't support building for OS X $deploy_target]) + AC_MSG_ERROR([We don't support building for Mac OS X $deploy_target]) ;; 10.3) @@ -198,7 +215,7 @@ then if test -z "$sdkpath" then AC_MSG_RESULT(no) - AC_MSG_ERROR([We couldn't find an SDK for OS X $deploy_target or later]) + AC_MSG_ERROR([We couldn't find an SDK for $osname $deploy_target or later]) fi SDKPATH="$sdkpath" AC_MSG_RESULT([yes, with the 10.$sdk_real_version SDK]) @@ -251,7 +268,7 @@ then esac else # - # Is this OS X? + # Is this macOS? # case "$host_os" in darwin*) @@ -274,7 +291,7 @@ AC_SUBST(OSX_MIN_VERSION) # # AC_WIRESHARK_OSX_INTEGRATION_CHECK # -# Checks for the presence of OS X integration functions in the GTK+ framework +# Checks for the presence of macOS integration functions in the GTK+ framework # or as a separate library. # # GTK+ for MAC OS X now lives on www.gtk.org at: @@ -321,7 +338,7 @@ AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK], 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.]) + [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) @@ -338,7 +355,7 @@ AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK], 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.]) + [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) |