From ae38c23bbede87828638f1554c943f4ab510af28 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Tue, 12 Jun 2018 21:51:23 -0300 Subject: [PATCH] Adjustments on top of #1790 --- configure.ac | 8 +++++++- modsecurity.pc.in | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6b5ade91..38c8eccb 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit)) AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g')) AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g')) AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g')) -AC_DEFUN([MSC_TAG], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_TAG " | awk {'print $3'} | sed 's/\"//g')) +AC_DEFUN([MSC_TAG], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_FTAG " | awk {'print $3'} | sed 's/\"//g')) # Version definition to be further used by AC_INIT and @@ -22,6 +22,9 @@ m4_define([msc_version_c_plus_a], [m4_eval(msc_version_major + msc_version_minor m4_define([msc_version], [msc_version_major.msc_version_minor]) +m4_define([msc_version_with_patchlevel], + [msc_version_major.msc_version_minor.msc_version_patchlevel]) + m4_define([msc_version_git], [m4_esyscmd_s(git describe)]) @@ -201,6 +204,9 @@ AC_SUBST([MSC_BASE_DIR]) MSC_VERSION_INFO=msc_version_info AC_SUBST([MSC_VERSION_INFO]) +MSC_VERSION_WITH_PATCHLEVEL=msc_version_with_patchlevel +AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) + MSC_VERSION=msc_version AC_SUBST([MSC_VERSION]) diff --git a/modsecurity.pc.in b/modsecurity.pc.in index e6ca5e3a..3800a378 100644 --- a/modsecurity.pc.in +++ b/modsecurity.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: ModSecurity Description: ModSecurity API -Version: @PACKAGE_VERSION@ +Version: @MSC_VERSION_WITH_PATCHLEVEL@ Cflags: -I@includedir@/@PACKAGE@ Libs: -L@libdir@ -lmodsecurity