Ticket #4266: fix AC_INIT call for automake >= 1.16.4.

FTBFS with following messages:

autoreconf: running: aclocal -I m4 --force -I m4
configure.ac:31: error: AC_INIT should be called with package and version arguments
/usr/local/Cellar/automake/1.16.4/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
configure.ac:31: the top level
autom4te: error: /usr/local/opt/m4/bin/m4 failed with exit status: 1
aclocal: error: /usr/local/Cellar/autoconf/2.71/bin/autom4te failed with exit status: 1
autoreconf: error: aclocal failed with exit status: 1

Initial changeset: partial revert of 32621b96d1.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2021-08-03 21:34:56 +03:00
parent fdf2140bc4
commit 6a4107b277

View File

@ -5,18 +5,6 @@ dnl
dnl 2.64 is required at least for m4_esyscmd_s() dnl 2.64 is required at least for m4_esyscmd_s()
AC_PREREQ(2.64) AC_PREREQ(2.64)
dnl AC_INIT defines PACKAGE_VERSION and PACKAGE_STRING macros in config.h
dnl and puts a version into them.
dnl Since a) version is changed after `git commit` (and config.h is recreated
dnl as a result) and b) config.h is included in each .c file, the total
dnl recompilation is performed after commit instead of recompilation
dnl of modified files only.
dnl
dnl If AC_PACKAGE_VERSION and AC_PACKAGE_STRING macros are predefined before
dnl AC_INIT call, AC_INIT doesn't redefine them.
dnl As a result, config.h will not contain macros with variable version.
m4_define([AC_PACKAGE_VERSION], [])
m4_define([AC_PACKAGE_STRING], [])
AC_INIT([GNU Midnight Commander], m4_esyscmd_s([./version.sh .]), AC_INIT([GNU Midnight Commander], m4_esyscmd_s([./version.sh .]),
[https://www.midnight-commander.org/wiki/NewTicket], [mc], [https://www.midnight-commander.org/wiki/NewTicket], [mc],
[https://www.midnight-commander.org/]) [https://www.midnight-commander.org/])