FYI: m4--release--1.4--patch-7

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFBQMiWFRMICSmD1gYRAoPTAJwP2/ujPUenymvHtx4BOt3wRVLlZgCgsJD5
HRYpkrKeBB1TM/MAAtA+jWg=
=7l+K
-----END PGP SIGNATURE-----

* looking for address@hidden/m4--release--1.4--patch-6 to compare with
* comparing to address@hidden/m4--release--1.4--patch-6
M  src/m4.c
M  ChangeLog
M  NEWS
M  doc/m4.info

* modified files

Index: Changelog
from  Vincent Lonngren  <address@hidden>

        * configure.in (AC_CHECK_HEADERS):  Add signal.h, sys/signal.h.
        * src/m4.c: And include them as appropriate.
        * NEWS: Updated.

        * News: Describe 1.4.2's changes.
--- orig/NEWS
+++ mod/NEWS
@@ -4,6 +4,7 @@
 Version 1.4.3 - ??? 2004, by ???
 
 * Approximately 20% speed up in the common case of usage with autoconf.
+* Supported on QNX 6.3.
 
 Version 1.4.2 - August 2004, by Paul Eggert
 


--- orig/doc/m4.info
+++ mod/doc/m4.info
@@ -41,7 +41,7 @@
 names and email addresses can be found in the file `THANKS' from the
 GNU `m4' distribution.
 
-   This is release 1.4.2.  It is now to be considered stable, future
+   This is release 1.4.2a.  It is now to be considered stable, future
 releases are only meant to fix bugs, increase speed, or improve
 documentation.  However...
 
@@ -2970,27 +2970,27 @@
 * expressions, evaluation of integer:    Eval.                (line   6)
 * extracting substrings:                 Substr.              (line   6)
 * fast loading of frozen files:          Frozen files.        (line   6)
-* file inclusion <1>:                    File Inclusion.      (line   6)
-* file inclusion:                        Undivert.            (line  53)
+* file inclusion <1>:                    Undivert.            (line  53)
+* file inclusion:                        File Inclusion.      (line   6)
 * filenames, on the command line:        Invoking m4.         (line 176)
 * files, diverting output to:            Divert.              (line   6)
 * files, names of temporary:             Maketemp.            (line   6)
 * forloops:                              Loops.               (line  42)
 * formatted output:                      Format.              (line   6)
 * frozen files for fast loading:         Frozen files.        (line   6)
-* GNU extensions <1>:                    Extensions.          (line   6)
-* GNU extensions <2>:                    Debug Levels.        (line  59)
-* GNU extensions <3>:                    Debug Output.        (line   6)
-* GNU extensions <4>:                    Frozen files.        (line   6)
-* GNU extensions <5>:                    Format.              (line   6)
-* GNU extensions <6>:                    Patsubst.            (line   6)
-* GNU extensions <7>:                    Undivert.            (line  53)
-* GNU extensions <8>:                    Arguments.           (line  28)
-* GNU extensions <9>:                    Esyscmd.             (line   6)
-* GNU extensions <10>:                   Regexp.              (line   6)
-* GNU extensions <11>:                   Builtin.             (line   6)
-* GNU extensions <12>:                   Search Path.         (line   6)
-* GNU extensions:                        Indir.               (line   6)
+* GNU extensions <1>:                    Undivert.            (line  53)
+* GNU extensions <2>:                    Patsubst.            (line   6)
+* GNU extensions <3>:                    Extensions.          (line   6)
+* GNU extensions <4>:                    Search Path.         (line   6)
+* GNU extensions <5>:                    Frozen files.        (line   6)
+* GNU extensions <6>:                    Indir.               (line   6)
+* GNU extensions <7>:                    Regexp.              (line   6)
+* GNU extensions <8>:                    Debug Output.        (line   6)
+* GNU extensions <9>:                    Debug Levels.        (line  59)
+* GNU extensions <10>:                   Builtin.             (line   6)
+* GNU extensions <11>:                   Format.              (line   6)
+* GNU extensions <12>:                   Esyscmd.             (line   6)
+* GNU extensions:                        Arguments.           (line  28)
 * included files, search path for:       Search Path.         (line   6)
 * inclusion, of files <1>:               File Inclusion.      (line   6)
 * inclusion, of files:                   Undivert.            (line  53)
@@ -3035,8 +3035,8 @@
 * quoted string:                         Quoted strings.      (line   6)
 * recursive macros:                      Loops.               (line   6)
 * redefinition of macros, temporary:     Pushdef.             (line   6)
-* regular expressions <1>:               Regexp.              (line   6)
-* regular expressions:                   Patsubst.            (line   6)
+* regular expressions <1>:               Patsubst.            (line   6)
+* regular expressions:                   Regexp.              (line   6)
 * reloading a frozen file:               Frozen files.        (line   6)
 * renaming macros:                       Defn.                (line   6)
 * running UNIX commands:                 UNIX commands.       (line   6)
@@ -3120,80 +3120,80 @@
 
 Tag Table:
 Node: Top947
-Node: Preliminaries6949
-Node: Intro7675
-Node: History9289
-Node: Invoking m410215
-Node: Bugs17016
-Node: Manual18289
-Node: Syntax19660
-Node: Names20248
-Node: Quoted strings20626
-Node: Other tokens21216
-Node: Comments21438
-Node: Macros22106
-Node: Invocation22600
-Node: Inhibiting Invocation23416
-Node: Macro Arguments26567
-Node: Quoting Arguments27836
-Node: Macro expansion28646
-Node: Definitions29314
-Node: Define30091
-Node: Arguments30907
-Node: Pseudo Arguments32392
-Node: Undefine34248
-Node: Defn34915
-Node: Pushdef36077
-Node: Indir37918
-Node: Builtin38687
-Node: Conditionals39138
-Node: Ifdef39846
-Node: Ifelse40620
-Node: Loops42391
-Node: Debugging45668
-Node: Dumpdef46248
-Node: Trace47102
-Node: Debug Levels48487
-Node: Debug Output50877
-Node: Input Control51404
-Node: Dnl51942
-Node: Changequote53074
-Node: Changecom54445
-Node: Changeword55736
-Node: M4wrap58953
-Node: File Inclusion60162
-Node: Include60479
-Node: Search Path62414
-Node: Diversions63205
-Node: Divert64443
-Node: Undivert65580
-Node: Divnum67519
-Node: Cleardiv68069
-Node: Text handling69110
-Node: Len69833
-Node: Index70238
-Node: Regexp70830
-Node: Substr71928
-Node: Translit72555
-Node: Patsubst74005
-Node: Format76105
-Node: Arithmetic77601
-Node: Incr78049
-Node: Eval78560
-Node: UNIX commands81566
-Node: Syscmd82040
-Node: Esyscmd82761
-Node: Sysval83714
-Node: Maketemp84128
-Node: Miscellaneous84878
-Node: Errprint85250
-Node: M4exit86252
-Node: Frozen files87046
-Node: Compatibility91969
-Node: Extensions92590
-Node: Incompatibilities94953
-Node: Other Incompat95402
-Node: Concept index97572
-Node: Macro index107423
+Node: Preliminaries6950
+Node: Intro7676
+Node: History9290
+Node: Invoking m410216
+Node: Bugs17017
+Node: Manual18290
+Node: Syntax19661
+Node: Names20249
+Node: Quoted strings20627
+Node: Other tokens21217
+Node: Comments21439
+Node: Macros22107
+Node: Invocation22601
+Node: Inhibiting Invocation23417
+Node: Macro Arguments26568
+Node: Quoting Arguments27837
+Node: Macro expansion28647
+Node: Definitions29315
+Node: Define30092
+Node: Arguments30908
+Node: Pseudo Arguments32393
+Node: Undefine34249
+Node: Defn34916
+Node: Pushdef36078
+Node: Indir37919
+Node: Builtin38688
+Node: Conditionals39139
+Node: Ifdef39847
+Node: Ifelse40621
+Node: Loops42392
+Node: Debugging45669
+Node: Dumpdef46249
+Node: Trace47103
+Node: Debug Levels48488
+Node: Debug Output50878
+Node: Input Control51405
+Node: Dnl51943
+Node: Changequote53075
+Node: Changecom54446
+Node: Changeword55737
+Node: M4wrap58954
+Node: File Inclusion60163
+Node: Include60480
+Node: Search Path62415
+Node: Diversions63206
+Node: Divert64444
+Node: Undivert65581
+Node: Divnum67520
+Node: Cleardiv68070
+Node: Text handling69111
+Node: Len69834
+Node: Index70239
+Node: Regexp70831
+Node: Substr71929
+Node: Translit72556
+Node: Patsubst74006
+Node: Format76106
+Node: Arithmetic77602
+Node: Incr78050
+Node: Eval78561
+Node: UNIX commands81567
+Node: Syscmd82041
+Node: Esyscmd82762
+Node: Sysval83715
+Node: Maketemp84129
+Node: Miscellaneous84879
+Node: Errprint85251
+Node: M4exit86253
+Node: Frozen files87047
+Node: Compatibility91970
+Node: Extensions92591
+Node: Incompatibilities94954
+Node: Other Incompat95403
+Node: Concept index97573
+Node: Macro index107424
 
 End Tag Table


--- orig/src/m4.c
+++ mod/src/m4.c
@@ -2,17 +2,17 @@
 
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004 Free
    Software Foundation, Inc.
-  
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-  
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-  
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -21,7 +21,13 @@
 #include "m4.h"
 
 #include <getopt.h>
-#include <sys/signal.h>
+
+#if defined(HAVE_SYS_SIGNAL_H)
+#  include <sys/signal.h>
+#endif
+#if defined(HAVE_SIGNAL_H)
+#  include <signal.h>
+#endif
 
 static void usage _((int));