From e36874d4f96438eebdc637c75c23e924e3278a70 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 31 Aug 2015 01:57:48 +0200
Subject: [PATCH] Fix nonsensical handling of TOOLKIT in wxwin.m4

The code set WX_PORT to $TOOLKIT only if the latter was empty which made no
sense and also set WX_PORT to the never used nor documented anywhere else
$PORT if $TOOLKIT was not empty which made even less of it.

Just assign $TOOLKIT to WX_PORT if the former has a valid value.
---
 wxwin.m4 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/wxwin.m4 b/wxwin.m4
index 63b9f2af20..6a3e9b27b0 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -899,14 +899,8 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
 
             AC_MSG_RESULT([$WX_PORT])
         else
-
             dnl Use the setting given by the user
-            if test -z "$TOOLKIT" ; then
-                WX_PORT=$TOOLKIT
-            else
-                dnl try with PORT
-                WX_PORT=$PORT
-            fi
+            WX_PORT=$TOOLKIT
         fi
 
         AC_SUBST(WX_PORT)