23-less-ac-subst.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        Don't AC_SUBST too much, as it makes Automake include those
        variables in Makefiles, and drives autoscan to require unneeded
        programs.

        * m4sugar.m4 (m4_expand_once): Let the user specify the witness.
        * acgeneral.m4 (_AC_INIT_PREPARE): Don't AC_SUBST CFLAGS,
        CPPFLAGS, CXXFLAGS and LDFLAGS.
        (AC_ARG_VAR): AC_SUBST the var.
        Document it only once, even if there are several different docs.
        * aclang.m4 (AC_PROG_CPP): Declare CPP and CPPFLAGS to AC_ARG_VAR.
        (AC_PROG_CXXCPP): Declare CXXCPP and CPPFLAGS.

Index: acgeneral.m4
--- acgeneral.m4 Tue, 23 Jan 2001 01:35:43 +0100 akim (ace/27_acgeneral. 
1.169.8.124 644)
+++ acgeneral.m4 Tue, 23 Jan 2001 02:01:44 +0100 akim (ace/27_acgeneral. 
1.169.8.124 644)
@@ -1485,12 +1485,7 @@ m4_define([_AC_INIT_PREPARE],

 _AC_PROG_ECHO()dnl
 dnl Substitute for predefined variables.
-AC_SUBST(CFLAGS)dnl
-AC_SUBST(CPPFLAGS)dnl
-AC_SUBST(CXXFLAGS)dnl
-AC_SUBST(FFLAGS)dnl
 AC_SUBST(DEFS)dnl
-AC_SUBST(LDFLAGS)dnl
 AC_SUBST(LIBS)dnl
 m4_divert_pop([INIT_PREPARE])dnl
 ])# _AC_INIT_PREPARE
@@ -1679,11 +1674,14 @@ m4_define([_AC_ARG_VAR_VALIDATE],
 AC_DEFUN([AC_ARG_VAR],
 [m4_divert_once([HELP_VAR], [[
 Some influential environment variables:]])dnl
-m4_divert_once([HELP_VAR_END], [
+m4_divert_once([HELP_VAR_END], [[
 Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.])dnl
-m4_divert_once([HELP_VAR], [AC_HELP_STRING([$1], [$2], [              ])])dnl
+it to find libraries and programs with nonstandard names/locations.]])dnl
+m4_expand_once([m4_divert_once([HELP_VAR],
+                               [AC_HELP_STRING([$1], [$2], [              
])])],
+               [$0($1)])dnl
 _AC_ARG_VAR_PRECIOUS([$1])dnl
+AC_SUBST([$1])dnl
 ])# AC_ARG_VAR


@@ -2624,7 +2622,9 @@ AC_DEFUN([AC_SEARCH_LIBS],
 AC_DEFUN([AC_CHECK_LIB],
 [m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
 AC_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])dnl
-AC_ARG_VAR([LDFLAGS], [linker flags, e.g. -L<lib dir> if you have libraries in 
a nonstandard directory <lib dir>])
+AC_ARG_VAR([LDFLAGS],
+           [linker flags, e.g. -L<lib dir> if you have libraries in a
+            nonstandard directory <lib dir>])
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
 [ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$1 $5 $LIBS"
Index: acheaders.m4
--- acheaders.m4 Fri, 12 Jan 2001 22:48:19 +0100 akim (ace/b/48_acheaders. 1.5 
666)
+++ acheaders.m4 Tue, 23 Jan 2001 01:56:07 +0100 akim (ace/b/48_acheaders. 1.5 
666)
@@ -64,8 +64,6 @@
 # ----------------------------------------------------------------------
 AC_DEFUN([AC_CHECK_HEADER],
 [AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl
-AC_ARG_VAR([CPPFLAGS],
-           [C/C++ preprocessor flags, e.g. -I<include dir> if you have headers 
in a nonstandard directory <include dir>])
 AC_CACHE_CHECK([for $1], ac_Header,
                [AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include 
<$1>])],
                                   [AC_VAR_SET(ac_Header, yes)],
Index: aclang.m4
--- aclang.m4 Tue, 23 Jan 2001 01:35:43 +0100 akim (ace/b/32_aclang.m4 1.5.3.73 
644)
+++ aclang.m4 Tue, 23 Jan 2001 01:56:49 +0100 akim (ace/b/32_aclang.m4 1.5.3.73 
644)
@@ -804,6 +804,10 @@ AC_DEFUN([_AC_PROG_PREPROC_WORKS],
 # between the AC_LANG_COMPILER_REQUIRE family and that of AC_PROG_CC.
 AC_DEFUN([AC_PROG_CPP],
 [AC_REQUIRE([AC_PROG_CC])dnl
+AC_ARG_VAR([CPP],      [C preprocessor])
+AC_ARG_VAR([CPPFLAGS],
+           [C/C++ preprocessor flags, e.g. -I<include dir> if you have
+            headers in a nonstandard directory <include dir>])
 AC_LANG_PUSH(C)dnl
 AC_MSG_CHECKING([how to run the C preprocessor])
 # On Suns, sometimes $CPP names a directory.
@@ -858,7 +862,7 @@ AC_DEFUN([AC_LANG_COMPILER(C)],
 # search list for the C compiler.
 AC_DEFUN([AC_PROG_CC],
 [AC_LANG_PUSH(C)dnl
-AC_ARG_VAR([CC], [C compiler command])
+AC_ARG_VAR([CC],     [C compiler command])
 AC_ARG_VAR([CFLAGS], [C compiler flags])
 m4_ifval([$1],
       [AC_CHECK_TOOLS(CC, [$1])],
@@ -1017,6 +1021,10 @@ AC_DEFUN([AC_LANG_PREPROC(C++)],
 # between the AC_LANG_COMPILER_REQUIRE family and that of AC_PROG_CXX.
 AC_DEFUN([AC_PROG_CXXCPP],
 [AC_REQUIRE([AC_PROG_CXX])dnl
+AC_ARG_VAR([CXXCPP],   [C++ preprocessor])
+AC_ARG_VAR([CPPFLAGS],
+           [C/C++ preprocessor flags, e.g. -I<include dir> if you have
+            headers in a nonstandard directory <include dir>])
 AC_LANG_PUSH(C++)dnl
 AC_MSG_CHECKING([how to run the C++ preprocessor])
 if test -z "$CXXCPP"; then
@@ -1073,7 +1081,7 @@ AC_DEFUN([AC_LANG_COMPILER(C++)],
 # xlC  AIX C Set++
 AC_DEFUN([AC_PROG_CXX],
 [AC_LANG_PUSH(C++)dnl
-AC_ARG_VAR([CXX], [C++ compiler command])
+AC_ARG_VAR([CXX],      [C++ compiler command])
 AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
 AC_CHECK_TOOLS(CXX,
                [$CCC m4_default([$1],
@@ -1195,7 +1203,7 @@ AC_DEFUN([AC_LANG_COMPILER(Fortran 77)],
 # lf95 is the Lahey-Fujitsu compiler.
 AC_DEFUN([AC_PROG_F77],
 [AC_LANG_PUSH(Fortran 77)dnl
-AC_ARG_VAR([F77], [Fortran 77 compiler command])
+AC_ARG_VAR([F77],    [Fortran 77 compiler command])
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])
 AC_CHECK_TOOLS(F77,
       [m4_default([$1],
Index: m4sugar.m4
--- m4sugar.m4 Tue, 23 Jan 2001 01:35:43 +0100 akim (ace/b/27_libm4.m4 1.55 644)
+++ m4sugar.m4 Tue, 23 Jan 2001 02:01:01 +0100 akim (ace/b/27_libm4.m4 1.55 644)
@@ -1279,9 +1279,10 @@ m4_define([m4_require],
 ])


-# m4_expand_once(TEXT)
-# --------------------
-# If TEXT has never been expanded, expand it *here*.
+# m4_expand_once(TEXT, [WITNESS = TEXT])
+# --------------------------------------
+# If TEXT has never been expanded, expand it *here*.  Use WITNESS as
+# as a memory that TEXT has already been expanded.
 m4_define([m4_expand_once],
 [m4_provide_ifelse([$1],
                    [],