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