Re: 23-less-ac-subst.patch

[Akim Demaille]

This is the result of the two previous patches on the fileutils:

@@ -22693,12 +22653,7 @@
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@FFLAGS@,$FFLAGS,;t t
 s,@DEFS@,$DEFS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
@@ -22727,10 +22682,12 @@
 s,@DEPDIR@,$DEPDIR,;t t
 s,@PERL@,$PERL,;t t
 s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@CPP@,$CPP,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
@@ -22739,6 +22696,7 @@
 s,@OPTIONAL_BIN_ZCRIPTS@,$OPTIONAL_BIN_ZCRIPTS,;t t
 s,@MAN@,$MAN,;t t
 s,@DF_PROG@,$DF_PROG,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
 s,@U@,$U,;t t
 s,@ANSI2KNR@,$ANSI2KNR,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t


As you can see, only ``right'' ac-substs are kept.

/tmp/fileutils-4.0.37 % fgrep CXX configure                      nostromo 10:59
/tmp/fileutils-4.0.37 %                                          nostromo Err 1

Unfortunately, Tom, this does not suffice to have automake stop from
including CXX related definitions in Makefiles:

/tmp/fileutils-4.0.37 % automake                                 nostromo 11:00
/tmp/fileutils-4.0.37 % grep CXX Makefile.in                     nostromo 11:02
CXX = @CXX@
CXXCPP = @CXXCPP@

which, of course, still makes autoscan ask for a C++ compiler:

warning: missing AC_PROG_CXX wanted by: Makefile.in:70 tests/Makefile.in:70 
tests/touch/Makefile.in:70 tests/shred/Makefile.in:70 
tests/rmdir/Makefile.in:70 tests/rm/Makefile.in:70 tests/mv/Makefile.in:70 
tests/mkdir/Makefile.in:70 tests/ls-2/Makefile.in:70 tests/ls/Makefile.in:70 
tests/ln/Makefile.in:70 tests/install/Makefile.in:70 
tests/dircolors/Makefile.in:70 tests/du/Makefile.in:70 tests/dd/Makefile.in:70 
tests/cp/Makefile.in:70 tests/chmod/Makefile.in:70 tests/chgrp/Makefile.in:70 
m4/Makefile.in:70 man/Makefile.in:69 doc/Makefile.in:70 src/Makefile.in:68 
lib/Makefile.in:70

What can we do?