trans-coord/gnun/server/gnun make-prototype.in ...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/07/26 14:36:49

Modified files:
        gnun/server/gnun: make-prototype.in make-prototype 
                          gnun-validate-html.in gnun-validate-html 
                          configure.ac config.mk.in config.mk README 
                          ChangeLog 

Log message:
        Invoke m4 with --prefix-builtins for safety reasons.
        * gnun-validate-html.in: Pass `-P' to @M4@ and use m4_include in
        the sed expression.
        * config.mk.in (M4): Add the `-P' option.
        * make-prototype.in (make-article, make-home): Adjust to use
        m4_include.
        * configure.ac: Detect m4 with AC_CHECK_PROGS.
        * README: Demote the m4 dependency to >= 1.4.5.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype.in?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype?cvsroot=trans-coord&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/README?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.154&r2=1.155

Patches:
Index: make-prototype.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/make-prototype.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- make-prototype.in   7 Feb 2009 21:04:58 -0000       1.5
+++ make-prototype.in   26 Jul 2009 14:36:48 -0000      1.6
@@ -161,9 +161,9 @@
                            slot-translators-notes
                            (match:substring m 3)
                            slot-translators-credits
-                           "<" skip-tag ">include(`" generic "')</" skip-tag 
"> "
+                           "<" skip-tag ">m4_include(`" generic "')</" 
skip-tag "> "
                            (match:substring m 4)
-                           "<" skip-tag ">include(`" translinks "')</" 
skip-tag ">"
+                           "<" skip-tag ">m4_include(`" translinks "')</" 
skip-tag ">"
                            (match:substring m 6)))))
        (with-output-to-file translinks
          (lambda ()
@@ -182,5 +182,5 @@
                            slot-translators-notes
                            (match:substring m 3)
                            slot-translators-credits
-                           "<" skip-tag ">include(`" generic "')</" skip-tag 
"> "
+                           "<" skip-tag ">m4_include(`" generic "')</" 
skip-tag "> "
                            (match:substring m 4)))))))))

Index: make-prototype
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/make-prototype,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- make-prototype      20 Feb 2009 18:14:25 -0000      1.8
+++ make-prototype      26 Jul 2009 14:36:49 -0000      1.9
@@ -161,9 +161,9 @@
                            slot-translators-notes
                            (match:substring m 3)
                            slot-translators-credits
-                           "<" skip-tag ">include(`" generic "')</" skip-tag 
"> "
+                           "<" skip-tag ">m4_include(`" generic "')</" 
skip-tag "> "
                            (match:substring m 4)
-                           "<" skip-tag ">include(`" translinks "')</" 
skip-tag ">"
+                           "<" skip-tag ">m4_include(`" translinks "')</" 
skip-tag ">"
                            (match:substring m 6)))))
        (with-output-to-file translinks
          (lambda ()
@@ -182,5 +182,5 @@
                            slot-translators-notes
                            (match:substring m 3)
                            slot-translators-credits
-                           "<" skip-tag ">include(`" generic "')</" skip-tag 
"> "
+                           "<" skip-tag ">m4_include(`" generic "')</" 
skip-tag "> "
                            (match:substring m 4)))))))))

Index: gnun-validate-html.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnun-validate-html.in       28 Apr 2009 15:55:36 -0000      1.5
+++ gnun-validate-html.in       26 Jul 2009 14:36:49 -0000      1.6
@@ -74,8 +74,8 @@
 
 # Expand input file's #include directives and save the result in
 # $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
-  | @M4@ -EE -I $ROOT > $TMP1
+cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" \
+  | @M4@ -P -EE -I $ROOT > $TMP1
 
 # Execute xmllint on $TMP1 and save it's output to $TMP2.
 set +o pipefail

Index: gnun-validate-html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnun-validate-html  20 Feb 2009 18:14:25 -0000      1.7
+++ gnun-validate-html  26 Jul 2009 14:36:49 -0000      1.8
@@ -74,8 +74,8 @@
 
 # Expand input file's #include directives and save the result in
 # $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
-  | m4 -EE -I $ROOT > $TMP1
+cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" \
+  | m4 -P -EE -I $ROOT > $TMP1
 
 # Execute xmllint on $TMP1 and save it's output to $TMP2.
 set +o pipefail

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- configure.ac        1 May 2009 14:24:33 -0000       1.15
+++ configure.ac        26 Jul 2009 14:36:49 -0000      1.16
@@ -47,14 +47,7 @@
 AC_PROG_EGREP
 
 AC_ARG_VAR([M4], [the M4 macro processor command])
-AC_CACHE_CHECK([for m4 that expects arguments to the `format' builtin],
-               [ac_cv_path_M4],
-  [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
-    [[m4out=`echo format-foo | $ac_path_M4`
-      test "$m4out" = format-foo \
-      && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
-      [AC_MSG_WARN([none found])])])
-AC_SUBST([M4], [$ac_cv_path_M4])
+AC_CHECK_PROGS([M4], [m4 gm4])
 
 AC_ARG_VAR([MSGFMT], [the `msgfmt' program])
 AC_CHECK_PROGS([MSGFMT], [msgfmt gmsgfmt])

Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- config.mk.in        7 Nov 2008 21:59:50 -0000       1.2
+++ config.mk.in        26 Jul 2009 14:36:49 -0000      1.3
@@ -7,7 +7,8 @@
 SED            := @SED@
 GREP           := @GREP@
 EGREP          := @EGREP@
-M4             := @M4@
+# BSD M4 does not accept GNU long options.
+M4             := @M4@ -P
 MSGFMT         := @MSGFMT@
 MSGMERGE       := @MSGMERGE@
 PO4A_GETTEXTIZE := @PO4A_GETTEXTIZE@

Index: config.mk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config.mk   2 Nov 2008 18:50:26 -0000       1.1
+++ config.mk   26 Jul 2009 14:36:49 -0000      1.2
@@ -7,7 +7,7 @@
 AWK            := gawk
 SED            := sed
 GREP           := grep
-M4             := m4
+M4             := m4 -P
 MSGFMT         := msgfmt
 MSGMERGE       := msgmerge
 PO4A_GETTEXTIZE := po4a-gettextize

Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- README      24 Feb 2009 20:50:35 -0000      1.7
+++ README      26 Jul 2009 14:36:49 -0000      1.8
@@ -3,7 +3,7 @@
 GNU Make >= 3.81 (prereleases of 3.81 also work)
 GNU Sed
 GNU Gettext (>= 0.16)
-GNU M4 (>= 1.4.8)
+GNU M4 (>= 1.4.5)
 GNU Guile (>= 1.6)
 GNU Awk
 Po4a 0.34

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- ChangeLog   24 Jun 2009 11:44:14 -0000      1.154
+++ ChangeLog   26 Jul 2009 14:36:49 -0000      1.155
@@ -1,3 +1,14 @@
+2009-07-26  Yavor Doganov  <address@hidden>
+
+       Invoke m4 with --prefix-builtins for safety reasons.
+       * gnun-validate-html.in: Pass `-P' to @M4@ and use m4_include in
+       the sed expression.
+       * config.mk.in (M4): Add the `-P' option.
+       * make-prototype.in (make-article, make-home): Adjust to use
+       m4_include.
+       * configure.ac: Detect m4 with AC_CHECK_PROGS.
+       * README: Demote the m4 dependency to >= 1.4.5.
+
 2009-06-24  Yavor Doganov  <address@hidden>
 
        * doc/web-trans.texi (Mailing Lists): Add trans-coord-logs.