--- a/configure.in	Mon Aug 13 09:23:08 2007 +0200
+++ b/configure.in	Mon Aug 13 09:24:17 2007 +0200
@@ -278,6 +278,9 @@
 			to run.
 --usage-tracking	Enable some Sun-internal code.  If you don't
 			know what this is, you don't want it.
+--with-pop		support POP for mail retrieval
+--with-kerberos		support Kerberos-authenticated POP
+--with-hesiod		support Hesiod to get the POP server host
 
 Internationalization options:
 
@@ -436,6 +439,9 @@
 	with_energize	| \
 	with_sparcworks | \
 	with_tooltalk   | \
+	with_pop	| \
+	with_kerberos	| \
+	with_hesiod	| \
 	external_widget | \
 	extra_verbose   | \
 	const_is_losing | \
@@ -1299,7 +1305,9 @@
   ## Iris 4D
   mips-sgi-irix3.*      ) machine=iris4d opsys=irix3-3 ;;
   mips-sgi-irix4.*      ) machine=iris4d opsys=irix4-0 ;;
-  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0 ;;
+  mips-sgi-irix6*       ) machine=iris4d
+			opsys=irix6-0
+			NON_GNU_CC="cc -Olimit 2000" ;;
   mips-sgi-irix5.[3-9]* ) machine=iris4d opsys=irix5-3 ;;
   mips-sgi-irix5.2*     ) machine=iris4d opsys=irix5-2 ;;
   mips-sgi-irix5.1*     ) machine=iris4d opsys=irix5-1 ;;
@@ -1523,7 +1531,7 @@
   esac
 elif test "${dynamic}" = "no" ; then
   case "${opsys}" in
-    sol2* | decosf1-3 | decosf3-* | linux ) opsys="${opsys}-static" ;;
+    sol2* | decosf1-3 | decosf3-* | decosf4-* | linux ) opsys="${opsys}-static" ;;
   esac
 fi
 
@@ -1878,7 +1886,7 @@
     # In the IRIX 5.3 ld, only the last -rpath arg has any effect.  This is 
     # fundamentaly incompatible with having separate LD_SWITCH_X_SITE
     # and LD_SWITCH_SITE variables.  Fortunately, SGI fixed this by 6.2.
-    if [ -n "${x_libraries}" ] || [ -n "${site_runtime_libraries}" ]; then
+    if test -n "${x_libraries}" || test -n "${site_runtime_libraries}" ; then
       (echo "WARNING: The IRIX 5 ld ignores all but the last -rpath argument,";
        echo "         so if you need to specify more than one additional";
        echo "         runtime library directory, you will have to do so";
@@ -1899,7 +1907,7 @@
 esac
 
 if test -n "${x_libraries}" ; then
-    if test "${add_runtime_flag}" = "yes" ]; then
+    if test "${add_runtime_flag}" = "yes" ; then
 	LD_SWITCH_X_SITE="-L${x_libraries} ${runtime_arg}${x_libraries}"
   else
     LD_SWITCH_X_SITE="-L${x_libraries}"
@@ -2991,7 +2999,7 @@
     case "${arg}" in
 	-L*) if test -f `echo "${arg}/libtt.a" | sed 's/^\-L//'` ; then
 		 dash_r=''
-		 if [ "${add_runtime_flag}" = "yes" ]; then
+		 if test "${add_runtime_flag}" = "yes" ; then
 		     dash_r=`echo ${arg} | sed "s/^-L */${runtime_arg}/"`
 		 fi
 		 LD_SWITCH_X_SITE="${LD_SWITCH_X_SITE} ${arg} ${dash_r}"
@@ -3180,6 +3188,9 @@
 IF_YES_AC_DEFINE(debug,          DEBUG_XEMACS)
 IF_YES_AC_DEFINE(quantify,       QUANTIFY)
 IF_YES_AC_DEFINE(memory_usage_stats, MEMORY_USAGE_STATS)
+IF_YES_AC_DEFINE(with_pop,	 MAIL_USE_POP)
+IF_YES_AC_DEFINE(with_kerberos,	 KERBEROS)
+IF_YES_AC_DEFINE(with_hesiod,	 HESIOD)
 
 IF_YES_AC_DEFINE(error_check_extents,   ERROR_CHECK_EXTENTS)
 IF_YES_AC_DEFINE(error_check_typecheck, ERROR_CHECK_TYPECHECK)
@@ -3203,7 +3214,11 @@
 dnl #                     Report on what we decided to do                      #
 dnl ############################################################################
 
-echo "$0 $configure_args" >> Installation
+(
+echo "uname -a: `uname -a`" 
+echo "" 
+echo "$0 $configure_args" 
+) >> Installation
 # Start stdout redirection to '| tee -a Installation'
 (
 echo "
@@ -3232,7 +3247,7 @@
 elif test -n "$site_runtime_libraries"; then
   echo "  Additional libraries:                                   ${site_runtime_libraries}"
 fi
-if test "$with_wnn"; then
+if test "$with_wnn" = yes ; then
   echo "  Finding WNN includes with:                              ${wnn_includes}"
   echo "  Loading WNN libs with:                                  ${wnn_libraries}"
 fi
@@ -3264,7 +3279,7 @@
 test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
 test "$with_database_gnudbm" = yes && echo "  Compiling in support for GNU DBM."
 
-test "$with_ncurses"  = yes && echo "  Compiling in support for ncurses."
+test "$have_ncurses"  = yes && echo "  Compiling in support for ncurses."
 test "$with_socks"    = yes && echo "  Compiling in support for SOCKS."
 
 test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
@@ -3296,14 +3311,19 @@
 test "$with_dialogs"    = motif  && echo "  Using the Motif dialog boxes."
 test "$with_dialogs"    = athena && echo "  Using the Athena dialog boxes."
 test "$with_dialogs"    = athena3d && echo "  Using the Athena-3d dialog boxes."
+test "$with_pop"	= yes && "Using POP for mail access"
+test "$with_kerberos"	= yes && "Using Kerberos for POP authentication"
+test "$with_hesiod"	= yes && "Using Hesiod to get POP server host"
 
 test "${use_union_type}"     = yes && echo "  Using the union type for Lisp_Objects."
 test "${debug}"              = yes && echo "  Compiling in extra code for debugging."
 test "${memory_usage_stats}" = yes && echo "  Compiling in code for checking XEmacs memory usage."
 test "$usage_tracking"       = yes && echo "  Compiling with usage tracking active (Sun internal)."
+echo ""
 ) | tee -a Installation
-echo " | tee -a Installation
-"
+echo 'The above configure report is appended to "Installation" file.'
+echo ""
+
 dnl ############################################################################
 dnl #                                Now generate!                             #
 dnl ############################################################################