1From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
3Date: Sun, 1 Aug 2021 23:21:35 +0200
4Subject: [PATCH] configure.ac: drop usage of git at configure time
5
6The usage of git is only to print some messages at configure time,
7which is not very useful, and causes a significant number of warning
8when regenerating the configure script.
9
10Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
11---
12 configure.ac | 23 -----------------------
13 1 file changed, 23 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 20163e1e..14e5892a 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -3,7 +3,6 @@
20
21 # Get the hash of the last commit, to be used if it is not an
22 # official release.
23-AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit))
24 AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g'))
25 AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g'))
26 AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g'))
27@@ -25,9 +24,6 @@ m4_define([msc_version],
28 m4_define([msc_version_with_patchlevel],
29     [msc_version_major.msc_version_minor.msc_version_patchlevel])
30
31-m4_define([msc_version_git],
32-    [m4_esyscmd_s(git describe)])
33-
34 m4_define([msc_version_info],
35     [msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])
36
37@@ -73,11 +69,6 @@ AC_MSG_ERROR([\
38
39    ])
40 fi
41-# Libinjection version
42-AC_DEFUN([LIBINJECTION_VERSION], m4_esyscmd_s(cd "others/libinjection" && git describe && cd ../..))
43-
44-# SecLang test version
45-AC_DEFUN([SECLANG_TEST_VERSION], m4_esyscmd_s(cd "test/test-cases/secrules-language-tests" && git log -1 --format="%h" --abbrev-commit && cd ../../..))
46
47
48 # Check for yajl
49@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
50 MSC_VERSION=msc_version
51 AC_SUBST([MSC_VERSION])
52
53-MSC_GIT_VERSION=msc_version_git
54-AC_SUBST([MSC_GIT_VERSION])
55-
56-
57 AC_ARG_ENABLE(debug-logs,
58     [AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
59
60@@ -412,16 +399,6 @@ AC_OUTPUT
61
62
63 # Print a fancy summary
64-echo " "
65-echo " "
66-echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
67-echo " "
68-echo " Mandatory dependencies"
69-echo -n "   + libInjection                                  ...."
70-echo LIBINJECTION_VERSION
71-echo -n "   + SecLang tests                                 ...."
72-echo SECLANG_TEST_VERSION
73-
74 echo " "
75 echo " Optional dependencies"
76
77--
782.31.1
79
80