--- configure.orig	2001-06-14 16:41:51 UTC
+++ configure
@@ -1397,14 +1397,8 @@ case "$host_os" in
     if test "$use_sharedlib" != no
     then
       sharedlib=fbsd
-      if test -x /usr/bin/objformat
-      then
-	if test x`/usr/bin/objformat` = xelf
-	then
 	  sharedlib=gnuelf
-	  make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
-	fi
-      fi
+	  make_mhconfig='CFLAGS="-O2 -pipe  -Wno-return-type -fstack-protector -fno-strict-aliasing -DMHSLIB_NOMINVER"'
       echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
       slflags="-fpic"
       slibdir=$libdir
@@ -1748,34 +1742,6 @@ test -n "$pager" || pager="/usr/ucb/more
   pagerpath="$ac_cv_path_pager"
 fi
 
-echo $ac_n "checking for broken vi""... $ac_c" 1>&6
-echo "configure:1753: checking for broken vi" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_vi_bug'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_prog_vi_bug=no
-  echo 'r /nonexist-file
-r /nonexist-file
-q' | ex > /dev/null 2>&1
-  if test $? = 2
-  then
-    echo 'r /nonexist-file
-r /nonexist-file
-r /nonexist-file
-q' | ex > /dev/null 2>&1
-    if test $? = 3
-    then
-      ac_cv_prog_vi_bug=yes
-    fi
-  fi
-fi
-
-echo "$ac_t""$ac_cv_prog_vi_bug" 1>&6
-if test "$ac_cv_prog_vi_bug" = yes
-then
-  ATTVIBUG=ATTVIBUG
-fi
-
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
 echo "configure:1781: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then