Update to work with the latest wxPython and to work with more shells. Also, get the script's directory

using $0 rather than relying on it to be run from the dir it lives in.


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

distrib/scripts/includes/configure_build.inc

@@ -19,45 +19,50 @@ UNICODE_OPTS="--enable-unicode"
 
 ANSI_OPTS="--enable-ansi"
 
-WXPYTHON_OPTS="--enable-monolithic \
-	--with-opengl \
-	--enable-sound \
-        --enable-mediactrl \
-	--enable-display \
-	--enable-geometry \
-	--enable-debug_flag \
-	--enable-optimise \
-	--disable-debugreport "
+WXPYTHON_OPTS="--with-opengl \
+    --enable-sound --with-sdl \
+    --with-gnomeprint \
+    --enable-graphics_ctx \
+    --enable-mediactrl \
+    --enable-display \
+    --enable-geometry \
+    --enable-debug_flag \
+    --enable-optimise \
+    --disable-debugreport "
 	
 	
 do_build(){
     OPTS=""
-    if [ "$WXPYTHON" == "1" ]; then
+    if [ "$WXPYTHON" = "1" ]; then
       OPTS="$WXPYTHON_OPTS"
     fi
     
-    if [ "$DEBUG" == "1" ]; then
+    if [ "$DEBUG" = "1" ]; then
       OPTS="$OPTS $DEBUG_OPTS "
     fi
     
-    if [ "$UNICODE" == "1" ]; then
+    if [ "$UNICODE" = "1" ]; then
       OPTS="$OPTS $UNICODE_OPTS "
     fi
     
     
     
-    if [ "$STATIC" == "1" ]; then
+    if [ "$STATIC" = "1" ]; then
       OPTS="$OPTS --enable-static"
     fi
     
     OPTS="$OPTS $OTHER_OPTS"
     
+    echo "$WXROOT/configure --prefix=$BUILDPREFIX $OPTS"
     $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
     make
+    if [ $? != 0 ]; then
+        echo "wxWidgets build failed."        
+        exit $?
+    fi
     
     # build the libs wxPython needs
-    if [ "$WXPYTHON" == "1" ]; then
-      make -C contrib/src/animate
+    if [ "$WXPYTHON" = "1" ]; then
       make -C contrib/src/gizmos
       make -C contrib/src/stc
     fi

distrib/scripts/unix/unixbuild

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# you need to change this if you run from outside this dir. 
 if [ "$WXROOT" = "" ]; then
-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
@@ -32,13 +32,19 @@ for i in "$@"; do
     esac
 done
 
-OTHER_OPTS="--with-$PORT "
+if [ "$PORT" != "" ]; then
+    OTHER_OPTS="--with-$PORT "
+fi
 
 do_build
 
+if [ $? != 0 ]; then
+    exit $?
+fi
+
 make prefix=$INSTALLDIR install
 
-if [ "$WXPYTHON" == "1" ]; then
+if [ "$WXPYTHON" = "1" ]; then
     make -C contrib/src/gizmos prefix=$INSTALLDIR install
     make -C contrib/src/stc prefix=$INSTALLDIR install
 fi