Adjustments on top of #1790

This commit is contained in:
Felipe Zimmerle 2018-06-12 21:51:23 -03:00
parent 544fb50c1a
commit ae38c23bbe
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 8 additions and 2 deletions

View File

@ -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])

View File

@ -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