Updating make/configure for hdrrwr lib includes#12909
Updating make/configure for hdrrwr lib includes#12909ezelkow1 wants to merge 2 commits intoapache:9.2.xfrom
Conversation
github-project-automation
bot
moved this from In progress
to Ready to Merge
in 9.2.x Branch and Release
There was a problem hiding this comment.
Pull request overview
This PR updates the build configuration for the header_rewrite plugin to resolve ambiguities in geo library includes. It renames build conditionals from HAS_MAXMINDDB/HAS_GEOIP to USE_HRW_MAXMINDDB/USE_HRW_GEOIP and adds proper validation for the --with-hrw-geo-provider configuration option.
Changes:
- Renamed build conditionals to use
USE_HRW_*prefix instead ofHAS_*for clarity - Added validation to fail early if a geo provider is specified but the library is not found
- Improved error message to list valid geo provider options
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| plugins/header_rewrite/Makefile.inc | Updated conditional compilation directives to use new USE_HRW_* variable names |
| configure.ac | Added library availability checks, improved error messages, and defined AM_CONDITIONAL macros for the new variable names |
bryancall
left a comment
bryancall
left a comment
There was a problem hiding this comment.
Looks good. The rename from HAS_GEOIP/HAS_MAXMINDDB to USE_HRW_GEOIP/USE_HRW_MAXMINDDB correctly gates the Makefile conditionals on the user's provider selection rather than just library presence. The early-fail validation and improved error message are nice additions.
Minor note: the old AM_CONDITIONAL([HAS_GEOIP], ...) and AM_CONDITIONAL([HAS_MAXMINDDB], ...) definitions are still in configure.ac and are now unused, but that's not a blocker.
Try to clean up ambiguities around geo library includes for header rewrite
May help resolve issues around #12862