From 1d7472911e14e4885c9111aa21fc201c397be20f Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Sun, 27 Oct 2013 23:23:31 +0100
Subject: wx: Enable configure flags --with-wxdir --with-wx-prefix on windows

---
 lib/wx/configure.in | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'lib/wx')

diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 9c55e544a4..c65e45ca0d 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -413,7 +413,22 @@ define(wx_warn_text,[
     fi
 else
     AC_MSG_CHECKING(for wxWidgets in standard locations)
-		  
+
+    # Check whether --with-wxdir was given.
+    AC_MSG_NOTICE(OptionCheck: [$with_wxdir $with_wx_prefix])
+
+    if test "${with_wxdir+set}" = set; then :
+      withval=$with_wxdir;  CWXWIN0=$withval
+    else
+      # Check whether --with-wx-prefix was given.
+      if test "${with_wx_prefix+set}" = set; then :
+        withval=$with_wx_prefix; CWXWIN0=$withval
+      else
+        echo Setting it empty
+        CWXWIN0=""
+      fi
+    fi
+
     if test "x$MIXED_MSYS" = "xyes"; then
         CWXWIN_CONFIG=`win2msys_path.sh $wx_config_name 2>/dev/null`
     else
@@ -444,9 +459,10 @@ else
 		;;
     esac	
 			
-    CWXPATH="$CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*"
+    CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*"
 
     for dir in $CWXPATH; do
+        AC_MSG_NOTICE(Checking: [$dir])
 	if test -f $dir/include/wx/wx.h; then
 	    WXINCLUDE_MSVC=$dir/include/msvc
 	    WXINCLUDE_PLAIN=$dir/include
-- 
cgit v1.2.3