* unix/configure: add caching, use AC_CACHE_CHECK instead of

	* unix/configure.in: AC_CACHE_VAL where possible, consistent message
	* unix/tcl.m4:       quoting, sync relevant tclconfig/tcl.m4 changes and
	gratuitous formatting differences, fix SC_CONFIG_MANPAGES with default
	argument, Darwin improvements to SC_LOAD_*CONFIG.

1 files changed, 13 insertions, 25 deletions

diff --git a/unix/configure.in b/unix/configure.in
index decdade..fc44205 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.139 2005/12/05 13:03:18 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.140 2006/01/10 05:36:25 das Exp $
 
 AC_INIT([tcl],[8.5])
 AC_PREREQ(2.59)
@@ -47,6 +47,7 @@ TCL_SRC_DIR=`cd $srcdir/..; pwd`
 #------------------------------------------------------------------------
 # Compress and/or soft link the manpages?
 #------------------------------------------------------------------------
+
 SC_CONFIG_MANPAGES
 
 #------------------------------------------------------------------------
@@ -83,9 +84,9 @@ if test -n "$GCC"; then
   OLDCC="$CC"  
   CC="$CC -pipe"
   AC_TRY_COMPILE(,,
-    AC_MSG_RESULT(yes),
+    AC_MSG_RESULT([yes]),
     CC="$OLDCC"
-    AC_MSG_RESULT(no))
+    AC_MSG_RESULT([no]))
 fi  
 fi
 
@@ -172,18 +173,14 @@ SC_SERIAL_PORT
 #	special flag.
 #--------------------------------------------------------------------
 
-AC_MSG_CHECKING([for fd_set in sys/types])
-AC_CACHE_VAL(tcl_cv_type_fd_set,
+AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set,
     AC_TRY_COMPILE([#include <sys/types.h>],[fd_set readMask, writeMask;],
 	tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no))
-AC_MSG_RESULT($tcl_cv_type_fd_set)
 tcl_ok=$tcl_cv_type_fd_set
-if test $tcl_cv_type_fd_set = no; then
-    AC_MSG_CHECKING([for fd_mask in sys/select])
-    AC_CACHE_VAL(tcl_cv_grep_fd_mask,
+if test $tcl_ok = no; then
+    AC_CACHE_CHECK([for fd_mask in sys/select], tcl_cv_grep_fd_mask,
 	AC_EGREP_HEADER(fd_mask, sys/select.h,
 	     tcl_cv_grep_fd_mask=present, tcl_cv_grep_fd_mask=missing))
-    AC_MSG_RESULT($tcl_cv_grep_fd_mask)
     if test $tcl_cv_grep_fd_mask = present; then
 	AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Should we include <sys/select.h>?])
 	tcl_ok=yes
@@ -273,8 +270,8 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
-AC_MSG_CHECKING([for socklen_t])
-AC_CACHE_VAL(ac_cv_type_socklen_t,[AC_EGREP_CPP(changequote(<<,>>)dnl
+AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
+    [AC_EGREP_CPP(changequote(<<,>>)dnl
 <<(^|[^a-zA-Z_0-9])socklen_t[^a-zA-Z_0-9]>>dnl
 changequote([,]),[
     #include <sys/types.h>
@@ -284,7 +281,6 @@ changequote([,]),[
     #include <stddef.h>
     #endif
     ], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])
-AC_MSG_RESULT($ac_cv_type_socklen_t)
 if test $ac_cv_type_socklen_t = no; then
     AC_DEFINE(socklen_t, unsigned, [What is the type of socklen_t?])
 fi
@@ -306,15 +302,13 @@ AC_CHECK_FUNC(opendir, , [AC_DEFINE(USE_DIRENT2_H, 1, [May we include <dirent2.h
 #	the trick.
 #--------------------------------------------------------------------
 
-AC_MSG_CHECKING([union wait])
-AC_CACHE_VAL(tcl_cv_union_wait,
+AC_CACHE_CHECK([union wait], tcl_cv_union_wait,
     AC_TRY_LINK([#include <sys/types.h> 
 #include <sys/wait.h>], [
 union wait x;
 WIFEXITED(x);		/* Generates compiler error if WIFEXITED
 			 * uses an int. */
     ], tcl_cv_union_wait=yes, tcl_cv_union_wait=no))
-AC_MSG_RESULT($tcl_cv_union_wait)
 if test $tcl_cv_union_wait = no; then
     AC_DEFINE(NO_UNION_WAIT, 1, [Do we have a usable 'union wait'?])
 fi
@@ -352,11 +346,9 @@ AC_CHECK_FUNC(BSDgettimeofday,
     [AC_DEFINE(HAVE_BSDGETTIMEOFDAY, 1, [Do we have BSDgettimeofday()?])], [
     AC_CHECK_FUNC(gettimeofday, , [AC_DEFINE(NO_GETTOD, 1, [Do we have gettimeofday()?])])
 ])
-AC_MSG_CHECKING([for gettimeofday declaration])
-AC_CACHE_VAL(tcl_cv_grep_gettimeofday,
+AC_CACHE_CHECK([for gettimeofday declaration], tcl_cv_grep_gettimeofday,
     AC_EGREP_HEADER(gettimeofday, sys/time.h,
 	tcl_cv_grep_gettimeofday=present, tcl_cv_grep_gettimeofday=missing))
-AC_MSG_RESULT($tcl_cv_grep_gettimeofday)
 if test $tcl_cv_grep_gettimeofday = missing ; then
     AC_DEFINE(GETTOD_NOT_DECLARED, 1, [Is gettimeofday() actually declared in <sys/time.h>?])
 fi
@@ -368,13 +360,11 @@ fi
 #--------------------------------------------------------------------
 
 AC_C_CHAR_UNSIGNED
-AC_MSG_CHECKING([signed char declarations])
-AC_CACHE_VAL(tcl_cv_char_signed,
+AC_CACHE_CHECK([signed char declarations], tcl_cv_char_signed,
     AC_TRY_COMPILE(, [
 	signed char *p;
 	p = 0;
 	], tcl_cv_char_signed=yes, tcl_cv_char_signed=no))
-AC_MSG_RESULT($tcl_cv_char_signed)
 if test $tcl_cv_char_signed = yes; then
     AC_DEFINE(HAVE_SIGNED_CHAR, 1, [Are characters signed?])
 fi
@@ -383,8 +373,7 @@ fi
 #  Does putenv() copy or not?  We need to know to avoid memory leaks.
 #--------------------------------------------------------------------
 
-AC_MSG_CHECKING([for a putenv() that copies the buffer])
-AC_CACHE_VAL(tcl_cv_putenv_copy,
+AC_CACHE_CHECK([for a putenv() that copies the buffer], tcl_cv_putenv_copy,
     AC_TRY_RUN([
 	#include <stdlib.h>
 	#define OURVAR "havecopy=yes"
@@ -408,7 +397,6 @@ AC_CACHE_VAL(tcl_cv_putenv_copy,
     tcl_cv_putenv_copy=yes,
     tcl_cv_putenv_copy=no)
 )
-AC_MSG_RESULT($tcl_cv_putenv_copy)
 if test $tcl_cv_putenv_copy = yes; then
     AC_DEFINE(HAVE_PUTENV_THAT_COPIES, 1,
 	[Does putenv() copy strings or incorporate them by reference?])