[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-24-g
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-24-g83249bd |
|
Date: |
Sat, 28 Apr 2012 09:00:28 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=83249bd36c0cd76d80addc8bc0ab5db565635316
The branch, master has been updated
via 83249bd36c0cd76d80addc8bc0ab5db565635316 (commit)
via bc1038325d663ab99a6f01e4db172b02743d8319 (commit)
via d2ca16855177719a0fa4fe65fe2a9ec8d7a06aec (commit)
from d3500f61b9bae2c5729f2383d9ab62248d42800a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 83249bd36c0cd76d80addc8bc0ab5db565635316
Merge: d3500f6 bc10383 d2ca168
Author: Stefano Lattarini <address@hidden>
Date: Sat Apr 28 10:53:20 2012 +0200
Merge branches 'remove-acdir-option' and 'remove-obsolete-m4'
* remove-acdir-option:
aclocal: remove the --acdir option
* remove-obsolete-m4:
m4: delete several obsolete macros
Signed-off-by: Stefano Lattarini <address@hidden>
commit bc1038325d663ab99a6f01e4db172b02743d8319
Author: Stefano Lattarini <address@hidden>
Date: Fri Apr 6 10:46:27 2012 +0200
aclocal: remove the --acdir option
It not documented in the manual anymore, its use has already been
causing a deprecation warning, and its oncoming removal has already
been announced in the NEWS file. So let's finally remove it.
* aclocal.in (parse_arguments): Don't recognize the '--acdir' option
anymore.
(handle_acdir_option): Remove subroutine.
* configure.ac ($ACLOCAL): Adjust.
($AUTOMAKE): Cosmetic changes, for consistency.
* tests/aclocal-acdir.test: Remove usages of the '--acdir' option.
* tests/aclocal-print-acdir.test: Likewise.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <address@hidden>
commit d2ca16855177719a0fa4fe65fe2a9ec8d7a06aec
Author: Stefano Lattarini <address@hidden>
Date: Fri Apr 6 10:10:12 2012 +0200
m4: delete several obsolete macros
Support for several obsolescent macros has already been deprecated,
and their removal already announced in the documentation and in the
NEWS file. It's now time to finally remove them.
* m4/dmalloc.m4 (fp_WITH_DMALLOC): Don't define anymore.
* m4/maintainer.m4 (jm_MAINTAINER_MODE): Likewise.
* m4/lispdir.m4 (ud_PATH_LISPDIR): Likewise.
* m4/protos.m4 (fp_C_PROTOTYPES): Likewise.
* m4/ccstdc.m4: Delete file.
* m4/header.m4: Likewise.
* m4/obsol-gt.m4: Likewise.
* m4/obsol-lt.m4: Likewise.
* m4/obsolete.m4: Likewise.
* Makefile.am (dist_automake_ac_DATA): Don't list the deleted '.m4'
files anymore.
* t/confh.sh: Use 'AC_CONFIG_HEADERS' instead of the now-removed
AM_CONFIG_HEADER.
* t/confh.sh: Likewise.
* t/confh4.sh: Likewise.
* t/confh6.sh: Likewise.
* t/confh7.sh: Likewise.
* t/confh8.sh: Likewise.
* t/confsub.sh: Likewise.
* t/stamph2.sh: Likewise.
* t/subdir6.sh: Likewise.
* t/autohdr2.sh: Remove as obsolete.
* t/obsolete.sh: Likewise.
* t/list-of-tests.mk. Don't list the deleted test cases anymore.
* NEWS: Update.
* doc/automake.texi: Likewise. In particular ...
(Obsolete Macros): Remove this node altogether.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 5 ---
NEWS | 47 +++++++++++++++++---------------
aclocal.in | 10 -------
configure.ac | 10 +++++-
doc/automake.texi | 67 +--------------------------------------------
m4/ccstdc.m4 | 25 -----------------
m4/dmalloc.m4 | 4 +--
m4/header.m4 | 11 -------
m4/lispdir.m4 | 4 +--
m4/maintainer.m4 | 4 +--
m4/obsol-gt.m4 | 12 --------
m4/obsol-lt.m4 | 12 --------
m4/obsolete.m4 | 37 -------------------------
t/aclocal-acdir.sh | 26 ++----------------
t/aclocal-print-acdir.sh | 3 --
t/autohdr2.sh | 30 --------------------
t/confh.sh | 2 +-
t/confh4.sh | 2 +-
t/confh6.sh | 2 +-
t/confh7.sh | 2 +-
t/confh8.sh | 2 +-
t/confsub.sh | 2 +-
t/list-of-tests.mk | 2 -
t/obsolete.sh | 57 ---------------------------------------
t/stamph2.sh | 7 ++---
t/subdir6.sh | 2 +-
26 files changed, 51 insertions(+), 336 deletions(-)
delete mode 100644 m4/ccstdc.m4
delete mode 100644 m4/header.m4
delete mode 100644 m4/obsol-gt.m4
delete mode 100644 m4/obsol-lt.m4
delete mode 100644 m4/obsolete.m4
delete mode 100755 t/autohdr2.sh
delete mode 100755 t/obsolete.sh
diff --git a/Makefile.am b/Makefile.am
index 37b44cf..495a02a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -261,14 +261,12 @@ dist_automake_ac_DATA = \
m4/ar-lib.m4 \
m4/as.m4 \
m4/auxdir.m4 \
- m4/ccstdc.m4 \
m4/cond.m4 \
m4/cond-if.m4 \
m4/depend.m4 \
m4/depout.m4 \
m4/dmalloc.m4 \
m4/gcj.m4 \
- m4/header.m4 \
m4/init.m4 \
m4/install-sh.m4 \
m4/lead-dot.m4 \
@@ -279,9 +277,6 @@ dist_automake_ac_DATA = \
m4/minuso.m4 \
m4/missing.m4 \
m4/mkdirp.m4 \
- m4/obsol-gt.m4 \
- m4/obsol-lt.m4 \
- m4/obsolete.m4 \
m4/options.m4 \
m4/protos.m4 \
m4/python.m4 \
diff --git a/NEWS b/NEWS
index 4e49512..8653603 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,12 @@
-New in 1.12:
+New in 1.13:
-* WARNING: Future backward-incompatibilities!
+* Obsolete features removed:
- - Starting from the next major Automake version (1.13), the rules to
- build pdf, ps and dvi output from Texinfo input will use the '--tidy'
- option by default. Since such an option was introduced in Texinfo
- 4.9, this means that Makefiles generated by future Automake versions
- will require at least that version of Texinfo.
+ - The deprecated aclocal option '--acdir' has been removed. You
+ should use the options '--automake-acdir' and '--system-acdir'
+ instead (which have been introduced in Automake 1.11.2).
- - Starting from the next major Automake version (1.13), the parallel
- testsuite harness (previously only enabled by the 'parallel-tests'
- option) will become the default one; the older serial testsuite
- harness will still be available through the use of the 'serial-tests'
- option.
-
- - The following long-obsolete m4 macros will be removed in the
- next major Automake version (1.13):
+ - The following long-obsolete m4 macros have been removed:
AM_PROG_CC_STDC: superseded by AC_PROG_CC since October 2002
fp_PROG_CC_STDC: broken alias for AM_PROG_CC_STDC
@@ -29,8 +20,25 @@ New in 1.12:
of the now-removed automatic de-ANSI-fication
support of Automake)
- - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
- the next major Automake version (1.13).
+ - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12:
+
+* WARNING: Future backward-incompatibilities!
+
+ - Starting from the next major Automake version (1.13), the rules to
+ build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+ option by default. Since such an option was introduced in Texinfo
+ 4.9, this means that Makefiles generated by future Automake versions
+ will require at least that version of Texinfo.
+
+ - Starting from the next major Automake version (1.13), the parallel
+ testsuite harness (previously only enabled by the 'parallel-tests'
+ option) will become the default one; the older serial testsuite
+ harness will still be available through the use of the 'serial-tests'
+ option.
- Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
will be deprecated in the next minor version of Automake (1.12.1) and
@@ -45,11 +53,6 @@ New in 1.12:
all be deprecated in the next minor version of Automake (1.12.1)
and removed in the next major version (1.13).
- - The '--acdir' option of aclocal is deprecated, and will probably
- be removed in the next major Automake release (1.13). You should
- use the options '--automake-acdir' and '--system-acdir' instead
- (which have been introduced in Automake 1.11.2).
-
- The exact order in which the directories in the aclocal macro
search path are looked up is probably going to be changed in the
next Automake release (1.13).
diff --git a/aclocal.in b/aclocal.in
index 09e1da4..a5c0ea5 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -946,15 +946,6 @@ EOF
exit 0;
}
-# Using --acdir overrides both the automake (versioned) directory and
-# the public (unversioned) system directory. This usage is obsolete.
-sub handle_acdir_option ($$)
-{
- msg 'obsolete', '', "'--acdir' is deprecated\n";
- @system_includes = ($_[1]);
- @automake_includes = ();
-}
-
# Parse command line.
sub parse_arguments ()
{
@@ -965,7 +956,6 @@ sub parse_arguments ()
(
'help' => sub { usage(0); },
'version' => \&version,
- 'acdir=s' => \&handle_acdir_option,
'system-acdir=s' => sub { shift; @system_includes = @_; },
'automake-acdir=s' => sub { shift; @automake_includes = @_; },
'diff:s' => \$diff_command,
diff --git a/configure.ac b/configure.ac
index dffe270..b671227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,8 +65,14 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
# hence '.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\"
--acdir=m4 -I m4"
-AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\"
--libdir=lib"
+# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included,
+# not copied, in aclocal.m4.
+ACLOCAL="\
+ perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \
+ --automake-acdir=m4 --system-acdir=m4/acdir -I m4"
+AUTOMAKE="\
+ perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" \
+ --libdir=lib"
AC_PATH_PROG([PERL], [perl])
if test -z "$PERL"; then
diff --git a/doc/automake.texi b/doc/automake.texi
index c21a5b7..21229ca 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -190,7 +190,6 @@ Auto-generating aclocal.m4
Autoconf macros supplied with Automake
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
Directories
@@ -2980,8 +2979,8 @@ macro.
@item AC_CONFIG_HEADERS
Automake will generate rules to rebuild these headers. Older versions
-of Automake required the use of @code{AM_CONFIG_HEADER}
-(@pxref{Macros}); this is no longer the case.
+of Automake required the use of @code{AM_CONFIG_HEADER}; this is no
+longer the case, and that macro has indeed been removed.
As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
specification using shell variables will be ignored as far as
@@ -3918,7 +3917,6 @@ Automake ships with several Autoconf macros that you can
use from your
@menu
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
@end menu
@@ -4072,67 +4070,6 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to
@code{LIBS}.
@end table
address@hidden Obsolete Macros
address@hidden Obsolete Macros
address@hidden obsolete macros
address@hidden autoupdate
-
-Although using some of the following macros was required in past
-releases, you should not use any of them in new code. @emph{All
-these macros will be removed in the next major Automake version};
-if you are still using them, running @command{autoupdate} should
-adjust your @file{configure.ac} automatically (@pxref{autoupdate
-Invocation, , Using @command{autoupdate} to Modernize
address@hidden, autoconf, The Autoconf Manual}).
address@hidden it NOW!}
-
address@hidden @code
-
address@hidden AM_CONFIG_HEADER
address@hidden AM_CONFIG_HEADER
-Automake will generate rules to automatically regenerate the config
-header. This obsolete macro is a synonym of @code{AC_CONFIG_HEADERS}
-today (@pxref{Optional}).
-
address@hidden AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
address@hidden AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-If the use of @code{TIOCGWINSZ} requires @file{<sys/ioctl.h>}, then
-define @code{GWINSZ_IN_SYS_IOCTL}. Otherwise @code{TIOCGWINSZ} can be
-found in @file{<termios.h>}. This macro is obsolete, you should
-use Autoconf's @code{AC_HEADER_TIOCGWINSZ} instead.
-
address@hidden AM_PROG_MKDIR_P
address@hidden AM_PROG_MKDIR_P
address@hidden @code{mkdir -p}, macro check
address@hidden MKDIR_P
address@hidden mkdir_p
-
-From Automake 1.8 to 1.9.6 this macro used to define the output
-variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
--d}, or @code{mkinstalldirs}.
-
-Nowadays Autoconf provides a similar functionality with
address@hidden (@pxref{Particular Programs, , Particular
-Program Checks, autoconf, The Autoconf Manual}), however this defines
-the output variable @code{MKDIR_P} instead. In case you are still
-using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
-or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
-you are advised to switch ASAP to the more modern Autoconf-provided
-interface instead; both the macro and the variable @emph{will be
-removed} in the next major Automake release.
-
address@hidden AM_SYS_POSIX_TERMIOS
address@hidden AM_SYS_POSIX_TERMIOS
address@hidden POSIX termios headers
address@hidden termios POSIX headers
-Check to see if POSIX termios headers and functions are available on the
-system. If so, set the shell variable @code{am_cv_sys_posix_termios} to
address@hidden If not, set the variable to @samp{no}. This macro is obsolete,
-you should use Autoconf's @code{AC_SYS_POSIX_TERMIOS} instead.
-
address@hidden table
-
-
@node Private Macros
@subsection Private Macros
diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
deleted file mode 100644
index d57f055..0000000
--- a/m4/ccstdc.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-## ----------------------------------------- ## -*- Autoconf -*-
-## ANSIfy the C compiler whenever possible. ##
-## From Franc,ois Pinard ##
-## ----------------------------------------- ##
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-AC_DIAGNOSE([obsolete], [$0:
- your code should no longer depend upon 'am_cv_prog_cc_stdc', but upon
- 'ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
- you adjust the code. You can also remove the above call to
- AC_PROG_CC if you already called it elsewhere.])
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-])
-AU_DEFUN([fp_PROG_CC_STDC])
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index be1a5b3..536ea91 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -9,7 +9,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
+# serial 7
AC_DEFUN([AM_WITH_DMALLOC],
[AC_MSG_CHECKING([if malloc debugging is wanted])
@@ -26,5 +26,3 @@ else
AC_MSG_RESULT([no])
fi], [AC_MSG_RESULT([no])])
])
-
-AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/m4/header.m4 b/m4/header.m4
deleted file mode 100644
index 2555b96..0000000
--- a/m4/header.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 2dd6a0f..c4840f4 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -9,7 +9,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 11
+# serial 12
# AM_PATH_LISPDIR
# ---------------
@@ -51,5 +51,3 @@ AC_DEFUN([AM_PATH_LISPDIR],
])
AC_SUBST([lispdir])
])# AM_PATH_LISPDIR
-
-AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR])
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index a8f39a3..ffc1ddf 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
@@ -35,5 +35,3 @@ AC_MSG_CHECKING([whether to enable maintainer-specific
portions of Makefiles])
AC_SUBST([MAINT])dnl
]
)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
diff --git a/m4/obsol-gt.m4 b/m4/obsol-gt.m4
deleted file mode 100644
index bd2400d..0000000
--- a/m4/obsol-gt.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Support for obsolete Gettext macro. -*- Autoconf -*-
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# See comment in obsolete.m4.
-AU_DEFUN([ud_GNU_GETTEXT], [AM_GNU_GETTEXT])
diff --git a/m4/obsol-lt.m4 b/m4/obsol-lt.m4
deleted file mode 100644
index af8fb1b..0000000
--- a/m4/obsol-lt.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Support for obsolete Libtool macro. -*- Autoconf -*-
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# See comment in obsolete.m4.
-AU_DEFUN([gm_PROG_LIBTOOL], [AM_PROG_LIBTOOL])
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
deleted file mode 100644
index 9a26cac..0000000
--- a/m4/obsolete.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Obsolete Automake macros.
-
-# We put here only the macros whose substitution is not an Automake
-# macro; otherwise including this file would trigger dependencies for
-# all the substitutions. Generally, obsolete Automake macros are
-# better AU_DEFUNed in the same file as their replacement, or alone in
-# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
-
-AU_DEFUN([AC_FEATURE_CTYPE], [AC_HEADER_STDC])
-AU_DEFUN([AC_FEATURE_ERRNO], [AC_REPLACE_FUNCS([strerror])])
-AU_DEFUN([AM_CYGWIN32], [AC_CYGWIN])
-AU_DEFUN([AM_EXEEXT], [AC_EXEEXT])
-AU_DEFUN([AM_FUNC_MKTIME], [AC_FUNC_MKTIME])
-AU_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
- [AC_HEADER_TIOCGWINSZ])
-AU_DEFUN([AM_MINGW32], [AC_MINGW32])
-AU_DEFUN([AM_PROG_INSTALL], [AC_PROG_INSTALL])
-AU_DEFUN([AM_SANITY_CHECK_CC], [AC_PROG_CC])
-AU_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_SYS_POSIX_TERMIOS])
-AU_DEFUN([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH])
-AU_DEFUN([fp_PROG_INSTALL], [AC_PROG_INSTALL])
-AU_DEFUN([md_TYPE_PTRDIFF_T], [AC_CHECK_TYPES([ptrdiff_t])])
-
-# Don't know how to translate these.
-# If used, Autoconf will complain that they are possibly unexpended;
-# this seems a good enough error message.
-# AC_FEATURE_EXIT
-# AC_SYSTEM_HEADER
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index 88caef6..e5b2bd2 100755
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -14,9 +14,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir'
-# options. Also check that stuff in the automake acdir takes precedence
-# over stuff in the system acdir.
+# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also
+# check that stuff in the automake acdir takes precedence over stuff in
+# the system acdir.
. ./defs || Exit 1
@@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure
$FGREP 'am--macro' configure
$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
-rm -rf autom4te*.cache
-
-# Obsolescent '--acdir' option.
-$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '.*--acdir.*deprecated' stderr
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr
-
:
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 3d8bf4e..53ad556 100755
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -22,9 +22,6 @@ am_create_testdir=empty
$ACLOCAL --print-ac-dir
test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir"
-$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir
-test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo
-
$ACLOCAL --system-acdir /bar --print-ac-dir
test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar
diff --git a/t/autohdr2.sh b/t/autohdr2.sh
deleted file mode 100755
index 6f5415e..0000000
--- a/t/autohdr2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2012 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, see <http://www.gnu.org/licenses/>.
-
-# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-
-. ./defs || Exit 1
-
-cat >>configure.ac <<EOF
-AM_CONFIG_HEADER([thisfile.h])
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOHEADER
-
-test -f thisfile.h.in
diff --git a/t/confh.sh b/t/confh.sh
index 4759619..9dc2f15 100755
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
AC_OUTPUT
END
diff --git a/t/confh4.sh b/t/confh4.sh
index ea6a9ff..665e04a 100755
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -26,7 +26,7 @@
cat >> configure.ac << 'END'
AC_CONFIG_FILES([include/Makefile])
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
AC_PROG_CC
END
diff --git a/t/confh6.sh b/t/confh6.sh
index c5e7d7e..c94c7ba 100755
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -21,7 +21,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([subdir/config.h])
+AC_CONFIG_HEADERS([subdir/config.h])
AC_OUTPUT
END
diff --git a/t/confh7.sh b/t/confh7.sh
index 4080779..0bc2465 100755
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([config.h two.h])
+AC_CONFIG_HEADERS([config.h two.h])
END
: > Makefile.am
diff --git a/t/confh8.sh b/t/confh8.sh
index c3a27d1..2feaae5 100755
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([one.h two.h])
+AC_CONFIG_HEADERS([one.h two.h])
AC_OUTPUT
END
diff --git a/t/confsub.sh b/t/confsub.sh
index 1887046..e788275 100755
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -22,7 +22,7 @@
cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
+AC_CONFIG_HEADERS(subdir/config.h:subdir/config.hin)
AC_OUTPUT(Makefile subdir/Makefile)
END
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index fef7165..9b2c328 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -151,7 +151,6 @@ t/autodist-configure-no-subdir.sh \
t/autodist-no-duplicate.sh \
t/autodist-stamp-vti.sh \
t/autohdr.sh \
-t/autohdr2.sh \
t/autohdr3.sh \
t/autohdr4.sh \
t/autohdrdry.sh \
@@ -704,7 +703,6 @@ t/number.sh \
t/objc.sh \
t/objc2.sh \
t/objext-pr10128.sh \
-t/obsolete.sh \
t/oldvars.sh \
t/order.sh \
t/output.sh \
diff --git a/t/obsolete.sh b/t/obsolete.sh
deleted file mode 100755
index c4240c2..0000000
--- a/t/obsolete.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 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, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure obsolete macros can be autoupdated.
-
-# We need the following indirection in case someone exported e.g.
-# AUTOUPDATE='autoupdate --verbose'.
-set x ${AUTOUPDATE-autoupdate}
-required=$2
-. ./defs || Exit 1
-
-cat > configure.ac << 'END'
-AC_INIT
-END
-
-$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
- "$am_automake_acdir/obsolete.m4" > obs
-cat obs >> configure.ac
-$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
-$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2
-echo : >> obs.1 # Since it will be sourced, it must end with a success.
-echo : >> obs.2 # Likewise.
-
-cat configure.ac # For debugging.
-cat obs.1 # Likewise.
-cat obs.2 # Likewise.
-
-# Sanity check. Make sure we have added something to configure.ac.
-test `wc -l <configure.ac` -gt 1
-
-$ACLOCAL
-
-# Expect Autoconf to complain about each of the macros in obs.
-$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; }
-cat output
-. ./obs.1
-# Make sure Autoupdate remove each of these macros.
-$AUTOUPDATE
-. ./obs.2
-
-# Autoconf should be able to grok the updated configure.ac.
-$AUTOCONF
-
-:
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 59a373a..5346bfc 100755
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -18,10 +18,9 @@
. ./defs || Exit 1
cat >> configure.ac << END
-AM_CONFIG_HEADER([1.h
- 2.h:config.hin
- 3.h:sdir1/config1.hin])
-# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms.
+AC_CONFIG_HEADERS([1.h
+ 2.h:config.hin
+ 3.h:sdir1/config1.hin])
AC_CONFIG_HEADERS([sdir1/4.h
sdir1/5.h:config.hin
sdir1/6.h:sdir1/config1.hin
diff --git a/t/subdir6.sh b/t/subdir6.sh
index 5c17b65..26f3957 100755
--- a/t/subdir6.sh
+++ b/t/subdir6.sh
@@ -19,7 +19,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
+AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
AC_OUTPUT
END
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-24-g83249bd,
Stefano Lattarini <=