--- cfg/configure.orig	Sat May 19 23:45:26 2001
+++ cfg/configure	Sat May 19 23:54:28 2001
@@ -90,6 +90,12 @@
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
     cache_file="$ac_optarg" ;;
 
+  --cc=*)
+    ac_cv_prog_CC="$ac_optarg" ;;
+
+  --cxx=*)
+    ac_cv_prog_CXX="$ac_optarg" ;;
+
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
@@ -952,7 +958,7 @@
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 echo "configure:954: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
+cross_compiling="no"
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
 echo "configure:959: checking whether we are using GNU C++" >&5
@@ -1065,14 +1071,7 @@
 echo
 
 
-if test -z "$ac_cv_use_pthread"; then
-  ac_cv_use_pthread="yes"
-fi
-echo "Make iperf multi-threaded (using pthreads)? [$ac_cv_use_pthread] "
-read tmp
-if test -n "$tmp"; then  
-  ac_cv_use_pthread="$tmp"
-fi
+ac_cv_use_pthread="no"
 
 
 if test "$ac_cv_use_pthread" = yes ; then