use UNICODE=1 by default

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

diff --git a/wxPython/b b/wxPython/b
index ffa2477fb1a2eb45b3204649304e8a5a4d70cecb..19f3569512b8638526fc1e8a614ee8ec50ad29de 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -36,18 +36,28 @@ SETUP="python$PYVER -u setup.py"
 FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" 
 OTHERFLAGS=""
 PORTFLAGS=""
+UNIFLAG="UNICODE=1"
 
 
 
 if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
-    PORTFLAGS="WXPORT=gtk UNICODE=0"
+    PORTFLAGS="WXPORT=gtk"
+    UNIFLAG="UNICODE=0"
     shift
 elif [ "$1" = "gtk2" ]; then 
-    PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+    PORTFLAGS="WXPORT=gtk2"
+    UNIFLAG="UNICODE=1"
     shift
 fi
 
-FLAGS="$FLAGS $PORTFLAGS"
+for p in $*; do
+    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+       UNIFLAG=""
+       break
+    fi
+done
+
+FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"