--- configure.orig	2008-10-19 18:21:23.000000000 +0200
+++ configure	2009-07-23 09:44:48.000000000 +0200
@@ -5408,7 +5408,7 @@
     CPU_ARCH=sparc
     ;;
 
-x86_64 | sparc | ppc | ia64)
+amd64 | x86_64 | sparc | ppc | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
 esac
@@ -20065,7 +20065,7 @@
 LIBS_PATH=
 for lib_arg in $NSPR_LIBS $TK_LIBS; do
   case $lib_arg in
-    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr $lib_arg : "-L\(.*\)"` ;;
+    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr -- $lib_arg : "-L\(.*\)"` ;;
       * ) ;;
   esac
 done