From: Eric Blake <ebb9@byu.net>
Date: Wed, 20 Sep 2006 03:08:08 +0000 (+0000)
Subject: * m4/m4.m4: Change copyright.
X-Git-Tag: AUTOCONF-2.60b~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18be0ccecfeabe58ae987336addb050def87009e;p=thirdparty%2Fautoconf.git

* m4/m4.m4: Change copyright.
* configure: Regenerate.
* Makefile.in: Likewise.
* bin/Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
* lib/Makefile.in: Likewise.
* lib/Autom4te/Makefile.in: Likewise.
* lib/autoconf/Makefile.in: Likewise.
* lib/autoscan/Makefile.in: Likewise.
* lib/autotest/Makefile.in: Likewise.
* lib/emacs/Makefile.in: Likewise.
* lib/m4sugar/Makefile.in: Likewise.
* man/Makefile.in: Likewise.
* tests/Makefile.in: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 9b9d71e52..b134bb902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2006-09-19  Eric Blake  <ebb9@byu.net>
 
+	* m4/m4.m4: Change copyright.
+	* configure: Regenerate.
+	* Makefile.in: Likewise.
+	* bin/Makefile.in: Likewise.
+	* doc/Makefile.in: Likewise.
+	* lib/Makefile.in: Likewise.
+	* lib/Autom4te/Makefile.in: Likewise.
+	* lib/autoconf/Makefile.in: Likewise.
+	* lib/autoscan/Makefile.in: Likewise.
+	* lib/autotest/Makefile.in: Likewise.
+	* lib/emacs/Makefile.in: Likewise.
+	* lib/m4sugar/Makefile.in: Likewise.
+	* man/Makefile.in: Likewise.
+	* tests/Makefile.in: Likewise.
+
 	* m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.
 	* bin/Makefile.am (edit): Substitute M4_DEBUGFILE.
 	* bin/autom4te.in (handle_m4): Favor --debugfile over misnamed
diff --git a/Makefile.in b/Makefile.in
index 9b308df35..c39ccac06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,6 +106,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/bin/Makefile.in b/bin/Makefile.in
index cf875918a..8f963fbee 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -77,6 +77,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -210,6 +211,7 @@ edit = sed \
 	-e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \
 	-e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \
 	-e 's|@M4[@]|$(M4)|g' \
+	-e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \
 	-e 's|@AWK[@]|$(AWK)|g' \
 	-e 's|@VERSION[@]|$(VERSION)|g' \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
diff --git a/configure b/configure
index e740ddc94..def7ceedf 100755
--- a/configure
+++ b/configure
@@ -516,10 +516,7 @@ fi
 
 # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
 # systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
+echo '#! /bin/sh' >conf$$.file
 chmod +x conf$$.file
 if test -x conf$$.file >/dev/null 2>&1; then
   as_executable_p="test -x"
@@ -625,6 +622,7 @@ am__untar
 ac_cv_sh_n_works
 EXPR
 M4
+M4_DEBUGFILE
 HELP2MAN
 PERL
 TEST_EMACS
@@ -2284,6 +2282,23 @@ fi
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_m4" >&5
 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6; }
+if test $ac_cv_prog_gnu_m4 = yes ; then
+  { echo "$as_me:$LINENO: checking how m4 supports trace files" >&5
+echo $ECHO_N "checking how m4 supports trace files... $ECHO_C" >&6; }
+if test "${ac_cv_prog_gnu_m4_debugfile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case `$M4 --help < /dev/null 2>&1` in
+    *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
+    *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
+  esac
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_m4_debugfile" >&5
+echo "${ECHO_T}$ac_cv_prog_gnu_m4_debugfile" >&6; }
+  M4_DEBUGFILE=$ac_cv_prog_gnu_m4_debugfile
+
+fi
+
 if test x"$ac_cv_prog_gnu_m4" != xyes; then
   { { echo "$as_me:$LINENO: error: GNU M4 1.4 is required" >&5
 echo "$as_me: error: GNU M4 1.4 is required" >&2;}
@@ -3193,10 +3208,7 @@ fi
 
 # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
 # systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
+echo '#! /bin/sh' >conf$$.file
 chmod +x conf$$.file
 if test -x conf$$.file >/dev/null 2>&1; then
   as_executable_p="test -x"
@@ -3500,6 +3512,7 @@ am__untar!$am__untar$ac_delim
 ac_cv_sh_n_works!$ac_cv_sh_n_works$ac_delim
 EXPR!$EXPR$ac_delim
 M4!$M4$ac_delim
+M4_DEBUGFILE!$M4_DEBUGFILE$ac_delim
 HELP2MAN!$HELP2MAN$ac_delim
 PERL!$PERL$ac_delim
 TEST_EMACS!$TEST_EMACS$ac_delim
@@ -3513,7 +3526,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c4e739d7b..dac7e6004 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index a4b8a2820..50e06bb0d 100644
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -83,6 +83,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7432a0e4b..e0582b95a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -89,6 +89,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 2fbb1b31f..eb3322bf5 100644
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index e1aa565fe..83984392a 100644
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -81,6 +81,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index b69809af1..113e7c636 100644
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index f1b51699e..ef0c4f381 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 3049ae212..3495d7142 100644
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -87,6 +87,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/m4/m4.m4 b/m4/m4.m4
index df8d8c45d..b6fb9eab1 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,19 +1,8 @@
-# Copyright (C) 2000, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# m4.m4 serial 2
+dnl Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # AC_PROG_GNU_M4
 # --------------
@@ -31,10 +20,10 @@ if test x"$M4" != x; then
 fi])
 if test $ac_cv_prog_gnu_m4 = yes ; then
   AC_CACHE_CHECK([how m4 supports trace files], [ac_cv_prog_gnu_m4_debugfile],
-[case `$M4 --help < /dev/null 2>&1` in
-  *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
-  *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
-esac])
-AC_SUBST([M4_DEBUGFILE], $ac_cv_prog_gnu_m4_debugfile)
+  [case `$M4 --help < /dev/null 2>&1` in
+    *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
+    *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
+  esac])
+  AC_SUBST([M4_DEBUGFILE], $ac_cv_prog_gnu_m4_debugfile)
 fi
 ])
diff --git a/man/Makefile.in b/man/Makefile.in
index 50382d91d..25edeabb6 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -77,6 +77,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b1745f5d0..a83f44327 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -71,6 +71,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
+M4_DEBUGFILE = @M4_DEBUGFILE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@