--- configure.orig	Wed May 20 03:50:43 1998
+++ configure	Wed Jul  1 18:48:48 1998
@@ -526,14 +526,11 @@
 
 ac_aux_dir=
 for ac_dir in ./ $srcdir/./; do
-  if test -f $ac_dir/install-sh -o -f $ac_dir/config.guess -o -f $ac_dir/config.sub; then
+  if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
-    if test -f $ac_dir/install-sh; then
-      ac_install_sh="$ac_aux_dir/install-sh -c"
-    fi
+    ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  fi
-  if test -f $ac_dir/install.sh; then
+  elif test -f $ac_dir/install.sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
@@ -669,7 +666,7 @@
 EOF
 
 cat >> confdefs.h <<\EOF
-#define SHUTMSG_PATH "/etc/shutmsg"
+#define SHUTMSG_PATH "/var/run/shutmsg"
 EOF
 
 cat >> confdefs.h <<\EOF
@@ -944,7 +941,7 @@
 
 echo $ac_n "checking whether the C compiler accepts -O2""... $ac_c" 1>&6
 echo "configure:947: checking whether the C compiler accepts -O2" >&5
-CFLAGS="-O2"
+CFLAGS+=""
 cat > conftest.$ac_ext <<EOF
 #line 950 "configure"
 #include "confdefs.h"
