From 1fa140e554bc0e13fd51d0a730e704a7c2e5a5e1 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Sun, 20 Sep 2009 03:11:45 +0200
Subject: [PATCH] Upstream tarball 9815

---
 .svn-revision |  2 +-
 configure     | 11 +++++++----
 m4/wxwin.m4   | 11 +++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index a9bf31d2..8ea90d26 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9814
+9815
diff --git a/configure b/configure
index ad7a40ae..e5570cc5 100755
--- a/configure
+++ b/configure
@@ -7094,12 +7094,13 @@ echo "${ECHO_T}will be automatically detected" >&6
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                             "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
                             "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" -a \
-                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa"; then
+                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa" -a \
+                            "$TOOLKIT" != "osx_cocoa"; then
                         { { echo "$as_me:$LINENO: error:
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa, osx_cocoa)
                         " >&5
 echo "$as_me: error:
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa, osx_cocoa)
                         " >&2;}
    { (exit 1); exit 1; }; }
                     fi
@@ -7686,6 +7687,7 @@ echo $ECHO_N "checking which wxWidgets toolkit was selected... $ECHO_C" >&6
             WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
             WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*")
             WX_COCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*cocoa.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
 
             WX_PORT="unknown"
             if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
@@ -7698,6 +7700,7 @@ echo $ECHO_N "checking which wxWidgets toolkit was selected... $ECHO_C" >&6
             if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
             if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi
             if test "$WX_COCOAPORT" != "0"; then WX_PORT="cocoa"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
 
 
             if test "$WX_PORT" = "unknown" ; then
@@ -7716,7 +7719,7 @@ echo "$as_me: error:
 echo "${ECHO_T}$WX_PORT" >&6
         else
 
-                        if test -z "$TOOLKIT" ; then
+                        if test -n "$TOOLKIT" ; then
                 WX_PORT=$TOOLKIT
             else
                                 WX_PORT=$PORT
diff --git a/m4/wxwin.m4 b/m4/wxwin.m4
index ff3bcfc6..b24da04f 100644
--- a/m4/wxwin.m4
+++ b/m4/wxwin.m4
@@ -3,7 +3,7 @@ dnl Author:          wxWidgets development team,
 dnl                  Francesco Montorsi,
 dnl                  Bob McCown (Mac-testing)
 dnl Creation date:   24/11/2001
-dnl RCS-ID:          $Id: wxwin.m4 8751 2008-06-27 13:11:42Z kry $
+dnl RCS-ID:          $Id: wxwin.m4 9815 2009-09-20 01:09:03Z gonosztopi $
 dnl ---------------------------------------------------------------------------
 
 dnl ===========================================================================
@@ -602,9 +602,10 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                             "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
                             "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" -a \
-                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa"; then
+                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa" -a \
+                            "$TOOLKIT" != "osx_cocoa"; then
                         AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa, osx_cocoa)
                         ])
                     fi
 
@@ -869,6 +870,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
             WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
             WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*")
             WX_COCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*cocoa.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
 
             WX_PORT="unknown"
             if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
@@ -881,6 +883,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
             if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
             if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi
             if test "$WX_COCOAPORT" != "0"; then WX_PORT="cocoa"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
 
             dnl check at least one of the WX_*PORT has been set !
 
@@ -895,7 +898,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
         else
 
             dnl Use the setting given by the user
-            if test -z "$TOOLKIT" ; then
+            if test -n "$TOOLKIT" ; then
                 WX_PORT=$TOOLKIT
             else
                 dnl try with PORT
-- 
2.11.4.GIT