--- xml-xalan/c/runConfigure.orig	2005-08-17 11:48:26.000000000 +1200
+++ xml-xalan/c/runConfigure	2008-02-17 22:23:28.350947196 +1300
@@ -197,8 +197,9 @@
 locale=en_US             # by default use US locale
 
 # Get the command line parameters
-if test -x /bin/getopt -o -x /usr/bin/getopt; then
-    set -- `getopt C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h $*`
+if test -x /usr/gnu/bin/getopt; then
+    temp=`/usr/gnu/bin/getopt -o C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h "${@}"`
+    eval set -- "$temp"
 
     if [ $? != 0 ]
         then
@@ -208,7 +209,7 @@
 
 while [ $# -gt 0 ]
    do
-   case $1 in
+   case "$1" in
    -p) 
         platform=$2; shift 2;;
 
@@ -387,8 +388,7 @@
     if test $platform; then
         case $platform in
            solaris)
-              bitstobuildDefines=" $bitstobuildDefines -xarch=v9 "
-              bitstobuildLink=" -xarch=v9 " ;;
+              bitstobuildDefines=" $bitstobuildDefines " ;;
            aix)
               bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 " ;;
            hp-11)