Merge branch '3603_version'

* 3603_version:
  Fix deprecated AM_PROG_MKDIR_P warning.
  Ticket #3603: configure.ac: proper AC_INIT and AM_INIT_AUTOMAKE usage.

configure.ac

@@ -2,18 +2,22 @@ dnl
 dnl Configure.in file for the Midnight Commander
 dnl
 
-AC_PREREQ(2.60)
-AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
+dnl 2.64 is required at least for m4_esyscmd_s()
+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_)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_HEADERS(config.h)
-mc_VERSION
-AM_INIT_AUTOMAKE(mc, ${VERSION} )
+AM_INIT_AUTOMAKE
 dnl Enable silent rules by default (if yes)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+mc_VERSION
+
 AM_MAINTAINER_MODE
 
 AC_CANONICAL_HOST
@@ -317,7 +321,7 @@ dnl ############################################################################
 AC_CHECK_FUNCS([setlocale])
 
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.18.2])
 
 mc_I18N
 

doc/HACKING

@@ -16,9 +16,9 @@ Compiling from GIT
 To compile GNU Midnight commander from GIT, the following software is
 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)
-Gettext 0.18.1 and above
+Gettext 0.18.2 and above
 Glib 2.30 and above
 
 Full list of requirements you can see at:
@@ -41,7 +41,7 @@ on Debian too.
 
 Note that the version of gettext doesn't affect the snapshot because the
 distributed files are installed by gettext from archives for the version
-used in the AM_GNU_GETTEXT_VERSION macro, which is 0.18.1.
+used in the AM_GNU_GETTEXT_VERSION macro, which is 0.18.2.
 
 
 

doc/INSTALL

@@ -12,12 +12,12 @@ Build requirements for GNU Midnight Commander
 - glibc
 - gcc
 - make
-- autoconf >= 2.60
+- autoconf >= 2.64
 - automake >= 1.12
 - libtool
 - glib2 >= 2.30
 - slang2 or ncurses
-- gettext >= 0.18.1
+- gettext >= 0.18.2
 - libssh2 >= 1.2.5 is required only for sftp vfs (1.2.7 if you need ssh-agent support)
 - libaspell to support spell checking in the internal editor
 - ext2fs >= 1.42.4 to support ext{2,3,4}fs extended attributes

m4.include/mc-version.m4

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

maint/utils/version.sh

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