mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #3603: configure.ac: proper AC_INIT and AM_INIT_AUTOMAKE usage.

Browse Source 
Fix deprecate warning
configure.ac:13: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.  For more info, see:
configure.ac:13: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation

Support of m4_esyscmd_s() since autoconf-2.64 (release 2009-07-26).

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andreas Mohr 2021-03-20 10:02:12 +03:00 committed by Andrew Borodin
parent 6a6fdf1ae3
commit 1409eddde3
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -2,18 +2,22 @@ dnl
dnl Configure.in file for the Midnight Commander dnl Configure.in file for the Midnight Commander
dnl dnl
AC_PREREQ(2.60) dnl 2.64 is required at least for m4_esyscmd_s()
AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org]) AC_PREREQ(2.64)
AC_INIT([GNU Midnight Commander], m4_esyscmd_s([maint/utils/version.sh .]),
[https://www.midnight-commander.org/wiki/NewTicket], [mc],
[https://www.midnight-commander.org/])
m4_pattern_forbid(MC_) m4_pattern_forbid(MC_)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(src/main.c) AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
mc_VERSION AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE(mc, ${VERSION} )
dnl Enable silent rules by default (if yes) dnl Enable silent rules by default (if yes)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
mc_VERSION
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_CANONICAL_HOST AC_CANONICAL_HOST

2
doc/HACKING
View File

@ -16,7 +16,7 @@ Compiling from GIT
To compile GNU Midnight commander from GIT, the following software is To compile GNU Midnight commander from GIT, the following software is
required: required:
Autoconf 2.60 and above (latest is recommended) Autoconf 2.64 and above (latest is recommended)
Automake 1.12 and above (latest is recommended) Automake 1.12 and above (latest is recommended)
Gettext 0.18.1 and above Gettext 0.18.1 and above
Glib 2.30 and above Glib 2.30 and above

2
doc/INSTALL
View File

@ -12,7 +12,7 @@ Build requirements for GNU Midnight Commander
- glibc - glibc
- gcc - gcc
- make - make
- autoconf >= 2.60 - autoconf >= 2.64
- automake >= 1.12 - automake >= 1.12
- libtool - libtool
- glib2 >= 2.30 - glib2 >= 2.30

6
m4.include/mc-version.m4
View File

@ -3,21 +3,17 @@ dnl
dnl Get current version of Midnight Commander from git tags dnl Get current version of Midnight Commander from git tags
dnl dnl
dnl @author Slava Zanko <slavazanko@gmail.com> dnl @author Slava Zanko <slavazanko@gmail.com>
dnl @version 2021-03-13 dnl @version 2021-03-20
dnl @license GPL dnl @license GPL
dnl @copyright Free Software Foundation, Inc. dnl @copyright Free Software Foundation, Inc.
dnl @modified Andrew Borodin <aborodin@vmail.ru> dnl @modified Andrew Borodin <aborodin@vmail.ru>
AC_DEFUN([mc_VERSION],[ AC_DEFUN([mc_VERSION],[
if test ! -f ${srcdir}/version.h; then
${srcdir}/maint/utils/version.sh ${srcdir}
fi
if test -f ${srcdir}/version.h; then if test -f ${srcdir}/version.h; then
VERSION=$(grep '^#define MC_CURRENT_VERSION' ${srcdir}/version.h | sed 's/.*"\(.*\)"$/\1/') VERSION=$(grep '^#define MC_CURRENT_VERSION' ${srcdir}/version.h | sed 's/.*"\(.*\)"$/\1/')
else else
VERSION="unknown" VERSION="unknown"
fi fi
AC_SUBST(VERSION)
dnl Version without dashes for the man page dnl Version without dashes for the man page
DISTR_VERSION=`echo $VERSION | sed 's/^\([[^\-]]*\).*/\1/'` DISTR_VERSION=`echo $VERSION | sed 's/^\([[^\-]]*\).*/\1/'`

1
maint/utils/version.sh
View File

@ -42,6 +42,7 @@ mc_print_version(){
#endif #endif
EOF EOF
fi fi
echo "${CURR_MC_VERSION}"
exit exit
} }