[PATCH v2] gdb: AC_INIT should be called with package and version arguments

Tue Nov 23 14:16:39 GMT 2021

This patch adds package and version parameters to AC_INIT and
regenerates the configure script.

When we execute the ". /configure --version",

Before the patch:
--------------------------------------------------------------------
configure
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
--------------------------------------------------------------------

With the patch:
--------------------------------------------------------------------
gdb configure 12.0.50.20211123-git
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
--------------------------------------------------------------------

Tested on x86_64-linux.

gdb/
	* version.m4: New file.
	* configure.ac: Include version.m4.
	(AC_INIT): Update.
	* configure: Regenerate.
---
 gdb/configure    | 33 ++++++++++++++++++---------------
 gdb/configure.ac |  4 +++-
 gdb/version.m4   |  3 +++
 3 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 gdb/version.m4

diff --git a/gdb/configure b/gdb/configure
index fe685f2d3d5..b827af0ca12 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for gdb 12.0.50.20211123-git.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -575,12 +575,12 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='gdb'
+PACKAGE_TARNAME='gdb'
+PACKAGE_VERSION='12.0.50.20211123-git'
+PACKAGE_STRING='gdb 12.0.50.20211123-git'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="main.c"
 # Factoring default headers for most tests.
@@ -1000,7 +1000,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1500,7 +1500,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures gdb 12.0.50.20211123-git to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1548,7 +1548,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/gdb]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1574,7 +1574,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of gdb 12.0.50.20211123-git:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1784,7 +1786,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+gdb configure 12.0.50.20211123-git
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2640,7 +2642,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by gdb $as_me 12.0.50.20211123-git, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2996,6 +2998,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_config_headers="$ac_config_headers config.h:config.in"
 
 
@@ -20493,7 +20496,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by gdb $as_me 12.0.50.20211123-git, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20563,7 +20566,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+gdb config.status 12.0.50.20211123-git
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 56e8a2d8044..9ed129cabcd 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -18,7 +18,9 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT
+m4_include(version.m4)
+AC_INIT([gdb], GDB_VERSION)
+
 AC_CONFIG_MACRO_DIRS([../config])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h])
diff --git a/gdb/version.m4 b/gdb/version.m4
new file mode 100644
index 00000000000..e7a4226dd39
--- /dev/null
+++ b/gdb/version.m4
@@ -0,0 +1,3 @@
+m4_define([DAY], m4_esyscmd(date "+%Y%m%d" | tr -d "\n"))
+m4_define([GDB_VERSION], m4_esyscmd(cat version.in | sed "s/DATE/DAY/g" | tr -d "\n"))
+m4_undefine([DAY])
-- 
2.33.1

