re-disable Universal Mac builds by default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index f5af2c1380e04fdd0a65508eaea49c057b7028e7..74940456e4f632c82141f833fffe40aa47b3fb5e 100755 (executable)
--- a/configure
+++ b/configure
@@ -2942,6 +2942,8 @@ DEFAULT_wxUSE_TAB_DIALOG=no
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 

+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+

 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 DEFAULT_wxUSE_GTK2=yes
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 DEFAULT_wxUSE_GTK2=yes

diff --git a/configure.in b/configure.in
index c796843a03a9b787c947f02b059f3d570b55e32b..4372b556b493f26ffaf70c045143ffee3e9ae9d6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -391,6 +391,9 @@ DEFAULT_wxUSE_TAB_DIALOG=no
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 

+dnl Mac/Cocoa users need to enable building universal binaries explicitly
+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+

 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 dnl Applicable only when --with-gtk was used:
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 dnl Applicable only when --with-gtk was used: