autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

adjust copyright notice in bin/autoconf


From: Eric Blake
Subject: adjust copyright notice in bin/autoconf
Date: Tue, 9 Oct 2007 23:20:01 +0000 (UTC)
User-agent: Loom/3.14 (http://gmane.org/)

I noticed that /bin/autoconf had its copyright 400+ lines into the file, easily 
lost after all the M4sh initialization.  Fixed with this commit (which also 
makes all M4sh generated files admit that they are generated):

2007-10-09  Eric Blake  <address@hidden>

        Improve header of bin/autoconf.
        * lib/m4sugar/m4sh.m4 (AS_INIT): Add a 'generated from' notice.
        * lib/autoconf/general.m4 (_AC_INIT_NOTICE): Override new notice
        from M4sh.
        * bin/autoconf.as: Put copyright up front in generated file.

From: Eric Blake <address@hidden>
Date: Tue, 9 Oct 2007 17:14:35 -0600
Subject: [PATCH] Improve header of bin/autoconf.

* lib/m4sugar/m4sh.m4 (AS_INIT): Add a 'generated from' notice.
* lib/autoconf/general.m4 (_AC_INIT_NOTICE): Override new notice
from M4sh.
* bin/autoconf.as: Put copyright up front in generated file.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog               |    6 ++++++
 bin/autoconf.as         |    4 ++++
 lib/autoconf/general.m4 |    4 +++-
 lib/m4sugar/m4sh.m4     |    2 ++
 4 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e37f766..6f04cea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-09  Eric Blake  <address@hidden>
 
+       Improve header of bin/autoconf.
+       * lib/m4sugar/m4sh.m4 (AS_INIT): Add a 'generated from' notice.
+       * lib/autoconf/general.m4 (_AC_INIT_NOTICE): Override new notice
+       from M4sh.
+       * bin/autoconf.as: Put copyright up front in generated file.
+
        * bin/autoconf.as (exit_missing_arg): Font-lock tweak.
 
 2007-10-09  Ralf Wildenhues  <address@hidden>
diff --git a/bin/autoconf.as b/bin/autoconf.as
index a979619..b68d4ef 100644
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -1,4 +1,6 @@
 AS_INIT[]dnl                                            -*- shell-script -*-
+m4_divert_push([HEADER-COPYRIGHT])dnl
+# @configure_input@
 # autoconf -- create `configure' using m4 macros
 
 # Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
@@ -17,6 +19,8 @@ AS_INIT[]dnl                                            -*- 
shell-script -*-
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+m4_divert_pop([HEADER-COPYRIGHT])dnl back to BODY
+
 usage=["\
 Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 10df399..490c5a9 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -320,8 +320,10 @@ m4_copy([m4_PACKAGE_VERSION], [AC_VERSION])
 
 # _AC_INIT_NOTICE
 # ---------------
+# Provide useful headers; override the HEADER-COMMENT created by M4sh.
 m4_define([_AC_INIT_NOTICE],
-[m4_divert_text([HEADER-COMMENT],
+[m4_divert_text([KILL], [m4_undivert([HEADER-COMMENT])])dnl
+m4_divert_text([HEADER-COMMENT],
 address@hidden:@ Guess values for system-dependent variables and create 
Makefiles.
 @%:@ Generated by m4_PACKAGE_STRING[]dnl
 m4_ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index e8bce40..b9677bd 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1651,6 +1651,8 @@ m4_pattern_forbid([^_?AS_])
 
 # Bangshe and minimal initialization.
 m4_divert_text([BINSH], address@hidden:@! /bin/sh])
+m4_divert_text([HEADER-COMMENT],
+              address@hidden:@ Generated from __file__ by m4_PACKAGE_STRING.])
 m4_divert_text([M4SH-SANITIZE], [AS_SHELL_SANITIZE])
 AS_REQUIRE([_AS_SHELL_FN_SPY])
 
-- 
1.5.3.2







reply via email to

[Prev in Thread] Current Thread [Next in Thread]