mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 13:56:01 +03:00
Build: using PKG-CONFIG in a new fashion
Trying to avoid bulid errors if pkg-config is available.
This commit is contained in:
parent
754daebfb0
commit
a589f6b693
@ -9,11 +9,6 @@ dnl GEOIP_VERSION
|
|||||||
|
|
||||||
AC_DEFUN([PROG_GEOIP], [
|
AC_DEFUN([PROG_GEOIP], [
|
||||||
|
|
||||||
|
|
||||||
# Needed if pkg-config will be used.
|
|
||||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
|
|
||||||
|
|
||||||
# Possible names for the geoip library/package (pkg-config)
|
# Possible names for the geoip library/package (pkg-config)
|
||||||
GEOIP_POSSIBLE_LIB_NAMES="geoip2 geoip GeoIP"
|
GEOIP_POSSIBLE_LIB_NAMES="geoip2 geoip GeoIP"
|
||||||
|
|
||||||
|
@ -9,11 +9,6 @@ dnl MAXMIND_VERSION
|
|||||||
|
|
||||||
AC_DEFUN([PROG_MAXMIND], [
|
AC_DEFUN([PROG_MAXMIND], [
|
||||||
|
|
||||||
|
|
||||||
# Needed if pkg-config will be used.
|
|
||||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
|
|
||||||
|
|
||||||
# Possible names for the maxmind library/package (pkg-config)
|
# Possible names for the maxmind library/package (pkg-config)
|
||||||
MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind"
|
MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind"
|
||||||
|
|
||||||
|
@ -3,10 +3,6 @@ dnl CHECK_LMDB(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
|
|||||||
|
|
||||||
AC_DEFUN([PROG_LMDB], [
|
AC_DEFUN([PROG_LMDB], [
|
||||||
|
|
||||||
# Needed if pkg-config will be used.LMDB
|
|
||||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
|
|
||||||
|
|
||||||
# Possible names for the lmdb library/package (pkg-config)
|
# Possible names for the lmdb library/package (pkg-config)
|
||||||
LMDB_POSSIBLE_LIB_NAMES="lmdb"
|
LMDB_POSSIBLE_LIB_NAMES="lmdb"
|
||||||
|
|
||||||
|
@ -3,10 +3,6 @@ dnl CHECK_YAJL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
|
|||||||
|
|
||||||
AC_DEFUN([PROG_YAJL], [
|
AC_DEFUN([PROG_YAJL], [
|
||||||
|
|
||||||
# Needed if pkg-config will be used.
|
|
||||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
|
|
||||||
|
|
||||||
# Possible names for the yajl library/package (pkg-config)
|
# Possible names for the yajl library/package (pkg-config)
|
||||||
YAJL_POSSIBLE_LIB_NAMES="yajl2 yajl"
|
YAJL_POSSIBLE_LIB_NAMES="yajl2 yajl"
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
|
|||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
AM_PROG_AR
|
AM_PROG_AR
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
|
|
||||||
# Check if the compiler is c++11 compatible.
|
# Check if the compiler is c++11 compatible.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user