Skip to content

Commit 224f6ef

Browse files
author
Felipe Zimmerle
committed
Fix configuration schema on the configure summary
1 parent 7ac6bf7 commit 224f6ef

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

configure.ac

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,30 @@
44
# Get the hash of the last commit, to be used if it is not an
55
# official release.
66
AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit))
7+
AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g'))
8+
AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g'))
9+
AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g'))
10+
AC_DEFUN([MSC_TAG], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_TAG " | awk {'print $3'} | sed 's/\"//g'))
711

812

913
# Version definition to be further used by AC_INIT and
1014
# .so file naming.
11-
m4_define([msc_version_major], [3])
12-
m4_define([msc_version_minor], [0])
13-
m4_define([msc_version_patchlevel], [0])
15+
m4_define([msc_version_major], [MSC_MAJOR])
16+
m4_define([msc_version_minor], [MSC_MINOR])
17+
m4_define([msc_version_patchlevel], [MSC_PATCHLEVEL])
1418

1519
m4_define([msc_version],
1620
[msc_version_major.msc_version_minor])
1721

1822
m4_define([msc_version_git],
19-
[msc_version_major.msc_version_minor.msc_version_patchlevel+MSC_GIT_HASH])
23+
[m4_esyscmd_s(git describe)])
2024

2125
m4_define([msc_version_info],
2226
[msc_version_major:msc_version_minor:msc_version_patchlevel])
2327

2428

2529
# Project Information
26-
AC_INIT([modsecurity], [msc_version], [security@modsecurity.org])
30+
AC_INIT([modsecurity], [3.0], [security@modsecurity.org])
2731

2832

2933
# General definitions
@@ -360,7 +364,7 @@ AC_OUTPUT
360364
# Print a fancy summary
361365
echo " "
362366
echo " "
363-
echo "ModSecurity - v${MSC_GIT_VERSION} for $PLATFORM"
367+
echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
364368
echo " "
365369
echo " Mandatory dependencies"
366370
echo -n " + libInjection ...."

0 commit comments

Comments
 (0)