From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jan 2012 11:27:57 +0000 (+0000)
Subject: Update OS X toolkit names list in wxwin.m4.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eff97cba045d5d4846b3b8aba38e1c9ba31c26f2

Update OS X toolkit names list in wxwin.m4.

There is no more "mac" toolkit in 2.9, we have "osx_carbon" and "osx_cocoa"
instead (and also "osx_iphone" but it's not used with configure so far).

Closes #13817.

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

diff --git a/wxwin.m4 b/wxwin.m4
index 4f6a2eb460..1c50dcc272 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -605,10 +605,10 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
                     dnl PORT must be one of the allowed values
                     if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
-                            "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
-                            -a "$TOOLKIT" != "dfb" ; then
+                            "$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \
+                            "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11"; then
                         AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, dfb)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, osx_carbon, osx_cocoa, dfb, x11)
                         ])
                     fi