--- configure.orig	Wed Jan  3 10:03:39 2001
+++ configure	Thu Mar  1 22:34:57 2001
@@ -11,7 +11,7 @@
 ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
-ac_default_prefix=/usr/local/netsaint
+#ac_default_prefix=/usr/local/netsaint
 ac_help="$ac_help
 --with-cgiurl=<dir> sets URL for cgi programs"
 ac_help="$ac_help
@@ -53,12 +53,12 @@
 x_includes=NONE
 x_libraries=NONE
 bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
+sbindir='${exec_prefix}/share/netsaint/sbin'
+libexecdir='${exec_prefix}/libexec/netsaint'
+datadir='${prefix}/share/netsaint'
+sysconfdir='${prefix}/etc/netsaint'
 sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
+localstatedir='${prefix}/var/netsaint'
 libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1133,7 +1133,7 @@
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -3718,7 +3718,7 @@
 EOF
 
         echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
-elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
+elif ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
 #define USE_PS_VARS 1
@@ -3729,12 +3729,12 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 's user ppid args'"
+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 's user ppid args'"
 EOF
 
 	EXTRAS="$EXTRAS check_netsaint"
 	cat >> confdefs.h <<EOF
-#define PS_COMMAND "$PATH_TO_PS -Ao 's uid ppid comm args'"
+#define PS_COMMAND "$PATH_TO_PS -axo 's uid ppid comm args'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3742,7 +3742,7 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3750,15 +3750,15 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
-elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
+	echo "      ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
+elif ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
 #define USE_PS_VARS 1
@@ -3769,12 +3769,12 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'status user ppid args'"
+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'status user ppid args'"
 EOF
 
 	EXTRAS="$EXTRAS check_netsaint"
 	cat >> confdefs.h <<EOF
-#define PS_COMMAND "$PATH_TO_PS -Ao 'status uid ppid comm args'"
+#define PS_COMMAND "$PATH_TO_PS -axo 'status uid ppid comm args'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3782,7 +3782,7 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3790,15 +3790,15 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
-elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
+	echo "      ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
+elif ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
 #define USE_PS_VARS 1
@@ -3809,12 +3809,12 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'state user ppid args'"
+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'"
 EOF
 
 	EXTRAS="$EXTRAS check_netsaint"
 	cat >> confdefs.h <<EOF
-#define PS_COMMAND "$PATH_TO_PS -Ao 'state uid ppid comm args'"
+#define PS_COMMAND "$PATH_TO_PS -axo 'state uid ppid comm args'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3822,7 +3822,7 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3830,15 +3830,15 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
 EOF
 
 	cat >> confdefs.h <<EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
-elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
+	echo "      ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
+elif ps -axo 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
 #define USE_PS_VARS 1
@@ -3849,12 +3849,12 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define PS_RAW_COMMAND "$PATH_TO_PS -ao 'state user ppid args'"
+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'"
 EOF
 
 	EXTRAS="$EXTRAS check_netsaint"
 	cat >> confdefs.h <<EOF
-#define PS_COMMAND "$PATH_TO_PS -ao 'state uid ppid command args'"
+#define PS_COMMAND "$PATH_TO_PS -axo 'state uid ppid command args'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3862,7 +3862,7 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define VSZ_COMMAND "$PATH_TO_PS -ao 'vsz command'"
+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz command'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3870,15 +3870,15 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define RSS_COMMAND "$PATH_TO_PS -ao 'rss command'"
+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss command'"
 EOF
 
 	cat >> confdefs.h <<EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -ao 'state command vsz rss'"
-elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
+elif ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
 #define USE_PS_VARS 1
@@ -3894,7 +3894,7 @@
 
 	EXTRAS="$EXTRAS check_netsaint"
 	cat >> confdefs.h <<EOF
-#define PS_COMMAND "$PATH_TO_PS waxco 'state uid ppid command command'"
+#define PS_COMMAND "$PATH_TO_PS waxo 'state uid ppid command command'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3902,7 +3902,7 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define VSZ_COMMAND "$PATH_TO_PS waxco 'vsz command'"
+#define VSZ_COMMAND "$PATH_TO_PS waxo 'vsz command'"
 EOF
 
 	cat >> confdefs.h <<EOF
@@ -3910,14 +3910,14 @@
 EOF
 
 	cat >> confdefs.h <<EOF
-#define RSS_COMMAND "$PATH_TO_PS waxco 'rss command'"
+#define RSS_COMMAND "$PATH_TO_PS waxo 'rss command'"
 EOF
 
 	cat >> confdefs.h <<EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
 elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
@@ -3957,7 +3957,7 @@
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'"
+	echo "      ps syntax... $PATH_TO_PS -waxo 'state comm vsz rss'"
 elif ps -el 2>/dev/null | egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF