--- configure.orig	Thu Jun 29 01:47:00 2000
+++ configure	Thu Jun 29 17:30:50 2000
@@ -45,10 +45,10 @@ x_libraries=NONE
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
+datadir='${prefix}/share/courier-imap'
+sysconfdir='${prefix}/share/courier-imap'
 sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
+localstatedir='/var/run'
 libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1109,19 +1109,7 @@ fi
 
 
 
-defaultprefix="/usr/lib/courier-imap"
-
-
-rm -f confmdtest1
-cp /dev/null confmdtest1
-chmod 000 confmdtest1
-if test -w confmdtest1
-then
-	echo "configure: warning: === Do not compile Courier-IMAP as root.  Compile" 1>&2
-	echo "configure: warning: === Courier-IMAP as a non-root user then su to" 1>&2
-	echo "configure: warning: === root before running make install." 1>&2
-	{ echo "configure: error: aborted." 1>&2; exit 1; }
-fi
+defaultprefix="/usr/local"
 
 if test x$prefix = xNONE
 then