--- a/configure.orig	Thu Jun  8 15:30:16 2006
+++ b/configure	Thu Jun  8 15:30:34 2006
@@ -8095,7 +8095,7 @@
 
 
 
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+for ac_header in argz.h limits.h locale.h nl_types.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -16641,7 +16641,7 @@
 fi
 { echo "$as_me:$LINENO: checking for unified diff option" >&5
 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
-if diff -u $0 $0 >& /dev/null ; then
+if diff -u $0 $0 >/dev/null 2>&1 ; then
    UNI_DIFF_OPTS=-u
 else
    UNI_DIFF_OPTS=-c