Merge branch 'mac-configure-fixes'

Miscellaneous improvements to configure under macOS, see
https://github.com/wxWidgets/wxWidgets/pull/568

configure

@@ -1129,7 +1129,6 @@ enable_macosx_arch
 enable_compat28
 enable_compat30
 enable_rpath
-enable_objc_uniquifying
 enable_visibility
 enable_tls
 enable_repro_build
@@ -2070,7 +2069,6 @@ Optional Features:
   --enable-compat28       enable wxWidgets 2.8 compatibility
   --disable-compat30      disable wxWidgets 3.0 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
-  --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
   --disable-tls           disable use of compiler TLS support
   --enable-repro-build    enable reproducible build mode
@@ -5123,6 +5121,8 @@ fi
           eval "$wx_cv_use_expat"
 
 
+if test "$USE_DARWIN" = 1; then
+
 
 # Check whether --with-macosx-sdk was given.
 if test "${with_macosx_sdk+set}" = set; then :
@@ -5143,6 +5143,7 @@ if test "${with_macosx_version_min+set}" = set; then :
 fi
 
 
+fi
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
@@ -5861,6 +5862,7 @@ fi
           eval "$wx_cv_use_vararg_macros"
 
 
+if test "$USE_DARWIN" = 1; then
 
           enablestring=
           # Check whether --enable-universal_binary was given.
@@ -5893,7 +5895,7 @@ fi
 
           eval "$wx_cv_use_macosx_arch"
 
-
+fi
 
           enablestring=
           defaultval=
@@ -5984,36 +5986,6 @@ fi
 
 
 
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          # Check whether --enable-objc_uniquifying was given.
-if test "${enable_objc_uniquifying+set}" = set; then :
-  enableval=$enable_objc_uniquifying;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
-                          else
-                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
-                          fi
-
-else
-
-                          wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_objc_uniquifying"
-
-
-
           enablestring=disable
           defaultval=
           if test -z "$defaultval"; then
@@ -17380,7 +17352,7 @@ fi
 fi
 
 
-if test "$wxUSE_MAC" = 1; then
+if test "$USE_DARWIN" = 1; then
 
 retest_macosx_linking=no
 
@@ -17432,6 +17404,8 @@ $as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary
     LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
 fi
 
+if test "$wxUSE_MAC" = 1; then
+
 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
 elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
@@ -17456,6 +17430,7 @@ $as_echo "exists" >&6; }
     retest_macosx_linking=yes
             fi
 
+fi
 if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
     wxUSE_MACOSX_VERSION_MIN=
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
@@ -32686,11 +32661,6 @@ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 
 fi
 
-if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
-  $as_echo "#define wxUSE_OBJC_UNIQUIFYING 1" >>confdefs.h
-
-fi
-
 
 if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
     $as_echo "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h

configure.in

@@ -553,6 +553,8 @@ WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
 
+if test "$USE_DARWIN" = 1; then
+
 AC_ARG_WITH(macosx-sdk,    [  --with-macosx-sdk=PATH  use an OS X SDK at PATH], [
         wxUSE_MACOSX_SDK=$withval
         wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
@@ -563,6 +565,8 @@ AC_ARG_WITH(macosx-version-min,    [  --with-macosx-version-min=VER   build bina
         wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
     ])
 
+fi dnl USE_DARWIN
+
 dnl ---------------------------------------------------------------------------
 dnl debugging options
 dnl ---------------------------------------------------------------------------
@@ -656,16 +660,16 @@ WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++
 WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
 WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
 
+if test "$USE_DARWIN" = 1; then
 WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures]], wxUSE_UNIVERSAL_BINARY)
 WX_ARG_ENABLE_PARAM(macosx_arch,      [[  --enable-macosx_arch=ARCH  build for just the specified architecture]], wxUSE_MAC_ARCH)
+fi dnl USE_DARWIN
 
 WX_ARG_ENABLE(compat28,      [  --enable-compat28       enable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8)
 WX_ARG_DISABLE(compat30,     [  --disable-compat30      disable wxWidgets 3.0 compatibility], WXWIN_COMPATIBILITY_3_0)
 
 WX_ARG_DISABLE(rpath,        [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
 
-WX_ARG_ENABLE(objc_uniquifying,[  --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
-
 WX_ARG_DISABLE(visibility,   [  --disable-visibility    disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
 WX_ARG_DISABLE(tls,          [  --disable-tls           disable use of compiler TLS support], wxUSE_COMPILER_TLS)
 
@@ -1121,7 +1125,10 @@ dnl ---------------------------------------------------------------------------
 dnl Mac-specific SDK/architectures checks
 dnl ---------------------------------------------------------------------------
 
-if test "$wxUSE_MAC" = 1; then
+dnl Note that some checks here are OS-specific, and need to be done for any
+dnl port, while others are wxOSX-specific and are performed only for it inside
+dnl another test below.
+if test "$USE_DARWIN" = 1; then
 
 retest_macosx_linking=no
 
@@ -1191,6 +1198,8 @@ if test "x$OSX_ARCH_OPTS" != "x"; then
     LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
 fi
 
+if test "$wxUSE_MAC" = 1; then
+
 dnl Set up the Mac OS X SDK.  We do this early so configure tests will occur
 dnl with the SDK in place.
 dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path
@@ -1217,6 +1226,8 @@ if test "x$wxUSE_MACOSX_SDK" != "x"; then
     dnl if we ever did, be aware that you don't need to worry about it.
 fi
 
+fi dnl wxUSE_MAC
+
 dnl Set up the deployment target
 dnl No   : Don't specify a min version even if using an SDK
 dnl Yes  : Use the version from the SDK if used, otherwise same as no
@@ -1294,7 +1305,7 @@ if test "x$retest_macosx_linking" = "xyes"; then
     AC_LANG_POP()
 fi
 
-fi dnl wxUSE_MAC
+fi dnl USE_DARWIN
 
 case "${host}" in
 
@@ -5788,10 +5799,6 @@ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
   AC_DEFINE(wxUSE_PRINTF_POS_PARAMS)
 fi
 
-if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
-  AC_DEFINE(wxUSE_OBJC_UNIQUIFYING)
-fi
-
 dnl ---------------------------------------------------------------------------
 dnl console event loop stuff
 dnl ---------------------------------------------------------------------------

docs/doxygen/mainpages/const_wxusedef.h

@@ -307,13 +307,6 @@ library:
 @endDefList
 
 
-@section page_wxusedef_cocoa Cocoa Symbols
-
-@beginDefList
-@itemdef{wxUSE_OBJC_UNIQUIFYING, Enable Objective-C class name uniquifying.}
-@endDefList
-
-
 @section page_wxusedef_msw wxMSW Symbols
 
 @beginDefList

setup.h.in

@@ -891,11 +891,6 @@
  */
 #define wxUSE_WEBKIT 0
 
-/*
- * Objective-C class name uniquifying
- */
-#define wxUSE_OBJC_UNIQUIFYING 0
-
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.

setup.h_vms

@@ -980,11 +980,6 @@ typedef pid_t GPid;
  */
 #define wxUSE_WEBKIT 1
 
-/*
- * Objective-C class name uniquifying
- */
-#define wxUSE_OBJC_UNIQUIFYING 0
-
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.