2005-01-29  Stepan Kasal  <address@hidden>

	* lib/m4sugar/m4sh.m4 (AS_VAR_GET): Support a second parameter,
	  the default which is used if the variable is not set.
	* lib/autoconf/general.m4 (AC_CACHE_CHECK): Use `no' as the
	  default result to print, of the variable remains unset.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.840
diff -u -r1.840 general.m4
--- lib/autoconf/general.m4	5 Jan 2005 07:53:52 -0000	1.840
+++ lib/autoconf/general.m4	29 Jan 2005 11:09:05 -0000
@@ -1875,7 +1875,7 @@
 m4_defun([AC_CACHE_CHECK],
 [AC_MSG_CHECKING([$1])
 AC_CACHE_VAL([$2], [$3])dnl
-AC_MSG_RESULT_UNQUOTED([AS_VAR_GET([$2])])])
+AC_MSG_RESULT_UNQUOTED([AS_VAR_GET([$2], [no])])])
 
 
 
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.132
diff -u -r1.132 m4sh.m4
--- lib/m4sugar/m4sh.m4	28 Jan 2005 21:21:32 -0000	1.132
+++ lib/m4sugar/m4sh.m4	29 Jan 2005 11:09:05 -0000
@@ -1156,15 +1156,16 @@
 	       [eval "$1=AS_ESCAPE([$2])"])])
 
 
-# AS_VAR_GET(VARIABLE)
-# --------------------
+# AS_VAR_GET(VARIABLE, [DEFAULT])
+# -------------------------------
 # Get the value of the shell VARIABLE.
 # Evaluates to $VARIABLE if there are no indirection in VARIABLE,
 # else into the appropriate `eval' sequence.
+# If the VARIABLE is unset, DEFAULT is used.
 m4_define([AS_VAR_GET],
 [AS_LITERAL_IF([$1],
-	       [$$1],
-	       [`eval echo '${'m4_bpatsubst($1, [[\\`]], [\\\&])'}'`])])
+	       [m4_ifval([$2], [${$1-$2}], [$$1])],
+	       [`eval echo '${'m4_bpatsubst($1, [[\\`]], [\\\&])'m4_ifval([$2],[-$2])}'`])])
 
 
 # AS_VAR_TEST_SET(VARIABLE)