mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-27 01:49:56 +08:00
* 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.
This commit is contained in:
Eric Blake
parent
8dc951191c
commit
18be0ccecf
15
ChangeLog
15
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
|
||||
|
||||
@ -106,6 +106,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -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' \
|
||||
|
||||
31
configure
vendored
31
configure
vendored
@ -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
|
||||
|
||||
@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -83,6 +83,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -89,6 +89,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -81,6 +81,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -85,6 +85,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -87,6 +87,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
31
m4/m4.m4
31
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
|
||||
])
|
||||
|
||||
@ -77,6 +77,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
@ -71,6 +71,7 @@ LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
M4_DEBUGFILE = @M4_DEBUGFILE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user