--- configure.orig	Mon Apr  5 01:46:35 1999
+++ configure	Tue Apr  6 23:08:43 1999
@@ -2199,30 +2199,7 @@
 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
 echo "configure:2201: checking "how to check if pid exists"" >&5
 PS=$ac_cv_path_PS
-# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
-# Solaris
-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
-# BSD style
-elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# SysV style
-elif $PS -ef 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# Do anybody use this?
-elif $PS $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
-else
-  { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
-fi
-
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
 echo "$ac_t"""$FIND_PROC"" 1>&6
 
 # Check if a pid is valid
@@ -3684,8 +3661,6 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lc_r $LIBS"
-
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -3935,14 +3910,6 @@
 else
   CFLAGS="$CFLAGS -DDBUG_OFF"
   CXXFLAGS="$CXXFLAGS -DDBUG_OFF"
-  if test "$ac_cv_prog_gcc" = "yes"
-  then
-    CFLAGS="-O6 $CFLAGS"
-    CXXFLAGS="-O $CXXFLAGS"	# Should be -O3 with gcc or g++
-  else
-    CFLAGS="-O $CFLAGS"
-    CXXFLAGS="-O $CXXFLAGS"
-  fi
 fi
 
 # Force static compilation to avoid linking probles/get more speed
@@ -7004,7 +6971,7 @@
     echo ""
     echo "Configuring MIT Pthreads"
     # We will never install so installation paths are not needed.
-    (cd mit-pthreads; sh ./configure)
+    (cd mit-pthreads; sh ./configure ${CONFIGURE_ARGS})
     echo "End of MIT Pthreads configuration"
     echo ""
   fi