Skip to content

Updating make/configure for hdrrwr lib includes #12909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ezelkow1 wants to merge 2 commits into
base: 9.2.x
Choose a base branch
from
+18 −8
Open

Updating make/configure for hdrrwr lib includes #12909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9c0d10
Updating make/configure for hdrrwr lib includes
Feb 23, 2026
18554b3
Playing with adding a 'none' option
Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,7 @@ AC_CHECK_HEADERS([maxminddb.h], [
AM_CONDITIONAL([HAS_MAXMINDDB], [test "x${has_maxminddb}" = "x1" ])

AC_ARG_WITH([hrw-geo-provider],
[AS_HELP_STRING([--with-hrw-geo-provider=geoip|maxminddb],[geo provider to use with header_rewrite [default=auto] ])],
[AS_HELP_STRING([--with-hrw-geo-provider=geoip|maxminddb|none],[geo provider to use with header_rewrite [default=auto]; use 'none' or --without-hrw-geo-provider to disable geo support])],
[geo_provider=$withval],
[geo_provider="auto"]
)
Expand All @@ -1806,22 +1806,32 @@ AS_IF([test "x$geo_provider" = "xauto"], [
],[
case "x$geo_provider" in
xgeoip)
AS_IF([test "x$has_geoip" != "x1"],
[AC_MSG_FAILURE([--with-hrw-geo-provider=geoip specified but GeoIP library not found])])
use_hrw_geoip=1
AC_MSG_RESULT([forced to GeoIP])
;;
xmaxminddb)
AS_IF([test "x$has_maxminddb" != "x1"],
[AC_MSG_FAILURE([--with-hrw-geo-provider=maxminddb specified but MaxMindDB library not found])])
use_hrw_maxminddb=1
AC_MSG_RESULT([forced to MaxMindDB])
;;
xno|xnone)
AC_MSG_NOTICE([geo support for header_rewrite disabled])
;;
*)
AC_MSG_RESULT([failed])
AC_MSG_FAILURE([unknown geo interface $geo_provider])
AC_MSG_FAILURE([unknown geo interface '$geo_provider': valid values are 'geoip', 'maxminddb', or 'none'])
esac
])

AC_SUBST(use_hrw_geoip)
AC_SUBST(use_hrw_maxminddb)

AM_CONDITIONAL([USE_HRW_GEOIP], [test "x${use_hrw_geoip}" = "x1"])
AM_CONDITIONAL([USE_HRW_MAXMINDDB], [test "x${use_hrw_maxminddb}" = "x1"])

# Checking if opentelemetry OTLP is available
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([opentelemetry/trace/provider.h], [
Expand Down
12 changes: 6 additions & 6 deletions plugins/header_rewrite/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ header_rewrite_header_rewrite_la_SOURCES = \
header_rewrite/value.cc \
header_rewrite/value.h

if HAS_MAXMINDDB
if USE_HRW_MAXMINDDB
header_rewrite_header_rewrite_la_SOURCES += header_rewrite/conditions_geo_maxmind.cc
endif

if HAS_GEOIP
if USE_HRW_GEOIP
header_rewrite_header_rewrite_la_SOURCES += header_rewrite/conditions_geo_geoip.cc
endif

Expand All @@ -61,11 +61,11 @@ header_rewrite_parser_la_SOURCES = \
header_rewrite_header_rewrite_la_LIBADD = \
header_rewrite/parser.la

if HAS_GEOIP
if USE_HRW_GEOIP
header_rewrite_header_rewrite_la_LIBADD += $(GEOIP_LIBS)
endif

if HAS_MAXMINDDB
if USE_HRW_MAXMINDDB
header_rewrite_header_rewrite_la_LIBADD += $(MAXMINDDB_LIBS)
endif

Expand All @@ -74,10 +74,10 @@ header_rewrite_header_rewrite_test_SOURCES = \
header_rewrite/header_rewrite_test.cc
header_rewrite_header_rewrite_test_LDADD = \
header_rewrite/parser.la
if HAS_GEOIP
if USE_HRW_GEOIP
header_rewrite_header_rewrite_test_LDADD += $(GEOIP_LIBS)
endif

if HAS_MAXMINDDB
if USE_HRW_MAXMINDDB
header_rewrite_header_rewrite_test_LDADD += $(MAXMINDDB_LIBS)
endif