mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-28 21:17:54 +00:00
Code Issues Releases Wiki Activity

use configure --enable-geoip to turn on GeoIP2

Browse Source 
- instead of --with-geoip2, use --enable-geoip to turn on the GeoIP
  feature
- --with-maxminddb can be used to set the prefix for maxminddb
This commit is contained in:
Evan Hunt 2019-06-27 21:19:30 -07:00
parent 55cca87d8a
commit 3781448c89
4 changed files with 127 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -11,7 +11,7 @@
5258. [func] Added support for the GeoIP2 API from MaxMind. This 5258. [func] Added support for the GeoIP2 API from MaxMind. This
will be compiled in by default if the "libmaxminddb" will be compiled in by default if the "libmaxminddb"
library is found at compile time, but can be library is found at compile time, but can be
suppressed using "configure --without-geoip2". suppressed using "configure --disable-geoip".
Certain geoip ACL settings that were available with Certain geoip ACL settings that were available with
legacy GeoIP are not available when using GeoIP2. legacy GeoIP are not available when using GeoIP2.

131
configure vendored
View File

@ -850,7 +850,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@ -904,6 +903,8 @@ enable_kqueue
enable_epoll enable_epoll
enable_devpoll enable_devpoll
with_geoip2 with_geoip2
enable_geoip
with_maxminddb
with_locktype with_locktype
with_libtool with_libtool
enable_pthread_rwlock enable_pthread_rwlock
@ -1017,7 +1018,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1270,15 +1270,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1416,7 +1407,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
@ -1569,7 +1560,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1624,6 +1614,8 @@ Optional Features:
--enable-kqueue use BSD kqueue when available [default=yes] --enable-kqueue use BSD kqueue when available [default=yes]
--enable-epoll use Linux epoll when available [default=auto] --enable-epoll use Linux epoll when available [default=auto]
--enable-devpoll use /dev/poll when available [default=yes] --enable-devpoll use /dev/poll when available [default=yes]
--disable-geoip support GeoIP2 geolocation ACLs if available
[default=yes]
--enable-pthread-rwlock use pthread rwlock instead of internal rwlock --enable-pthread-rwlock use pthread rwlock instead of internal rwlock
implementation (EXPERIMENTAL) implementation (EXPERIMENTAL)
--enable-fips-mode enable FIPS mode in OpenSSL library [default=no] --enable-fips-mode enable FIPS mode in OpenSSL library [default=no]
@ -1660,7 +1652,8 @@ Optional Packages:
--with-python=PATH specify path to Python interpreter --with-python=PATH specify path to Python interpreter
--with-python-install-dir=PATH --with-python-install-dir=PATH
installation directory for Python modules installation directory for Python modules
--with-geoip2=PATH Build with MaxMind GeoIP2 support (auto|yes|no|path) --with-geoip2 deprecated, use --with-maxminddb
--with-maxminddb=PATH Build with MaxMind GeoIP2 support (auto|yes|no|path)
[default=auto] [default=auto]
--with-locktype=ARG Specify mutex lock type (adaptive or standard) --with-locktype=ARG Specify mutex lock type (adaptive or standard)
--with-libtool use GNU libtool --with-libtool use GNU libtool
@ -4005,7 +3998,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -4051,7 +4044,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -4075,7 +4068,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -4120,7 +4113,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -4144,7 +4137,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -14444,21 +14437,41 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
# #
# GeoIP support? # GeoIP support?
# #
# Should be on by default if libmaxminddb exists.
#
# Check whether --with-geoip2 was given. # Check whether --with-geoip2 was given.
if test "${with_geoip2+set}" = set; then : if test "${with_geoip2+set}" = set; then :
withval=$with_geoip2; withval=$with_geoip2; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-geoip2 is DEPRECATED and will be removed in a future release, use --with-maxminddb instead" >&5
$as_echo "$as_me: WARNING: --with-geoip2 is DEPRECATED and will be removed in a future release, use --with-maxminddb instead" >&2;}
else else
with_geoip2="auto" with_geoip2="auto"
fi fi
# --with-geoip2 should be turned on by default if the library exists. # Check whether --enable-geoip was given.
if test "${enable_geoip+set}" = set; then :
enableval=$enable_geoip;
else
enable_geoip="yes"
fi
# Check whether --with-maxminddb was given.
if test "${with_maxminddb+set}" = set; then :
withval=$with_maxminddb;
else
with_maxminddb="$with_geoip2"
fi
GEOIP2LINKSRCS= GEOIP2LINKSRCS=
GEOIP2LINKOBJS= GEOIP2LINKOBJS=
case $with_geoip2 in #( if test "$enable_geoip" = "yes"; then :
case $with_maxminddb in #(
no) : no) :
;; #( as_fn_error $? "Use '--disable-geoip' to disable the GeoIP" "$LINENO" 5 ;; #(
auto) : auto) :
pkg_failed=no pkg_failed=no
@ -14555,8 +14568,8 @@ MAXMINDDB_PREFIX=$pkg_cv_MAXMINDDB_PREFIX
if test "x$MAXMINDDB_PREFIX" = x""; then : if test "x$MAXMINDDB_PREFIX" = x""; then :
as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5 as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5
fi fi
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
fi ;; #( fi ;; #(
yes) : yes) :
@ -14675,87 +14688,87 @@ MAXMINDDB_PREFIX=$pkg_cv_MAXMINDDB_PREFIX
if test "x$MAXMINDDB_PREFIX" = x""; then : if test "x$MAXMINDDB_PREFIX" = x""; then :
as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5 as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5
fi fi
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
fi ;; #( fi ;; #(
*) : *) :
# default # default
CCASFLAGS_geoip2_ax_save_flags=$CCASFLAGS CCASFLAGS_maxminddb_ax_save_flags=$CCASFLAGS
CFLAGS_geoip2_ax_save_flags=$CFLAGS CFLAGS_maxminddb_ax_save_flags=$CFLAGS
CPPFLAGS_geoip2_ax_save_flags=$CPPFLAGS CPPFLAGS_maxminddb_ax_save_flags=$CPPFLAGS
CXXFLAGS_geoip2_ax_save_flags=$CXXFLAGS CXXFLAGS_maxminddb_ax_save_flags=$CXXFLAGS
ERLCFLAGS_geoip2_ax_save_flags=$ERLCFLAGS ERLCFLAGS_maxminddb_ax_save_flags=$ERLCFLAGS
FCFLAGS_geoip2_ax_save_flags=$FCFLAGS FCFLAGS_maxminddb_ax_save_flags=$FCFLAGS
FCLIBS_geoip2_ax_save_flags=$FCLIBS FCLIBS_maxminddb_ax_save_flags=$FCLIBS
FFLAGS_geoip2_ax_save_flags=$FFLAGS FFLAGS_maxminddb_ax_save_flags=$FFLAGS
FLIBS_geoip2_ax_save_flags=$FLIBS FLIBS_maxminddb_ax_save_flags=$FLIBS
GCJFLAGS_geoip2_ax_save_flags=$GCJFLAGS GCJFLAGS_maxminddb_ax_save_flags=$GCJFLAGS
JAVACFLAGS_geoip2_ax_save_flags=$JAVACFLAGS JAVACFLAGS_maxminddb_ax_save_flags=$JAVACFLAGS
LDFLAGS_geoip2_ax_save_flags=$LDFLAGS LDFLAGS_maxminddb_ax_save_flags=$LDFLAGS
LIBS_geoip2_ax_save_flags=$LIBS LIBS_maxminddb_ax_save_flags=$LIBS
OBJCFLAGS_geoip2_ax_save_flags=$OBJCFLAGS OBJCFLAGS_maxminddb_ax_save_flags=$OBJCFLAGS
OBJCXXFLAGS_geoip2_ax_save_flags=$OBJCXXFLAGS OBJCXXFLAGS_maxminddb_ax_save_flags=$OBJCXXFLAGS
UPCFLAGS_geoip2_ax_save_flags=$UPCFLAGS UPCFLAGS_maxminddb_ax_save_flags=$UPCFLAGS
VALAFLAGS_geoip2_ax_save_flags=$VALAFLAGS VALAFLAGS_maxminddb_ax_save_flags=$VALAFLAGS
MAXMINDDB_CFLAGS="-I$with_geoip2/include" MAXMINDDB_CFLAGS="-I$with_maxminddb/include"
MAXMINDDB_LIBS="-L$with_geoip2/libs" MAXMINDDB_LIBS="-L$with_maxminddb/libs"
CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS" CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS" LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing MMDB_open" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing MMDB_open" >&5
$as_echo_n "checking for library containing MMDB_open... " >&6; } $as_echo_n "checking for library containing MMDB_open... " >&6; }
if ${ac_cv_search_MMDB_open+:} false; then : if ${ac_cv_search_MMDB_open+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -14811,21 +14824,23 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_GEOIP2 1" >>confdefs.h $as_echo "#define HAVE_GEOIP2 1" >>confdefs.h
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open" MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open"
{ $as_echo "$as_me:${as_lineno-$LINENO}: GeoIP2 default database path set to $with_geoip2/share/GeoIP" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: GeoIP2 default database path set to $with_maxminddb/share/GeoIP" >&5
$as_echo "$as_me: GeoIP2 default database path set to $with_geoip2/share/GeoIP" >&6;} $as_echo "$as_me: GeoIP2 default database path set to $with_maxminddb/share/GeoIP" >&6;}
eval MAXMINDDB_PREFIX=\$$with_geoip2 eval MAXMINDDB_PREFIX=\$$with_maxminddb
else else
as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5 as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5
fi fi
;; ;;
esac esac
fi
@ -25473,7 +25488,7 @@ report() {
test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)" test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)"
test "no" = "$use_dnstap" || \ test "no" = "$use_dnstap" || \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test -z "$MAXMINDDB_LIBS" || echo " GeoIP2 access control (--with-geoip2)" test -z "$MAXMINDDB_LIBS" || echo " GeoIP2 access control (--enable-geoip)"
test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)"
if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
echo " Algorithm: $with_cc_alg" echo " Algorithm: $with_cc_alg"
@ -25537,7 +25552,7 @@ report() {
test "no" = "$use_dnstap" && \ test "no" = "$use_dnstap" && \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test -z "$MAXMINDDB_LIBS" && echo " GeoIP2 access control (--with-geoip2)" test -z "$MAXMINDDB_LIBS" && echo " GeoIP2 access control (--enable-geoip)"
test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)"
test "no" = "$enable_dnsrps" && \ test "no" = "$enable_dnsrps" && \

90
configure.ac
View File

@ -510,51 +510,65 @@ AC_C_BIGENDIAN
# #
# GeoIP support? # GeoIP support?
# #
# Should be on by default if libmaxminddb exists.
#
AC_ARG_WITH([geoip2], AC_ARG_WITH([geoip2],
[AS_HELP_STRING([--with-geoip2=PATH], [AS_HELP_STRING([--with-geoip2],
[Build with MaxMind GeoIP2 support (auto|yes|no|path) [default=auto]])], [deprecated, use --with-maxminddb])],
[], with_geoip2="auto") [AC_MSG_WARN([--with-geoip2 is DEPRECATED and will be removed in a future release, use --with-maxminddb instead])],
[with_geoip2="auto"])
AC_ARG_ENABLE([geoip],
[AS_HELP_STRING([--disable-geoip],
[support GeoIP2 geolocation ACLs if available [default=yes]])],
[], [enable_geoip="yes"])
AC_ARG_WITH([maxminddb],
[AS_HELP_STRING([--with-maxminddb=PATH],
[Build with MaxMind GeoIP2 support (auto|yes|no|path) [default=auto]])],
[], [with_maxminddb="$with_geoip2"])
# --with-geoip2 should be turned on by default if the library exists.
GEOIP2LINKSRCS= GEOIP2LINKSRCS=
GEOIP2LINKOBJS= GEOIP2LINKOBJS=
AS_CASE([$with_geoip2], AS_IF([test "$enable_geoip" = "yes"],
[no],[], [AS_CASE([$with_maxminddb],
[auto],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb], [no],[AC_MSG_ERROR([Use '--disable-geoip' to disable the GeoIP])],
[AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support]) [auto],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb],
PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])]) [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])])
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
],[:])], GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
[yes],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb], ],[:])],
[AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support]) [yes],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb],
PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])]) [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])])
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
])], GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
[ # default ])],
AX_SAVE_FLAGS([geoip2]) [ # default
MAXMINDDB_CFLAGS="-I$with_geoip2/include" AX_SAVE_FLAGS([maxminddb])
MAXMINDDB_LIBS="-L$with_geoip2/libs" MAXMINDDB_CFLAGS="-I$with_maxminddb/include"
CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS" MAXMINDDB_LIBS="-L$with_maxminddb/libs"
LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS" CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
AC_SEARCH_LIBS([MMDB_open], [maxminddb], LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS"
[AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support]) AC_SEARCH_LIBS([MMDB_open], [maxminddb],
GEOIP2LINKSRCS='${GEOIP2LINKSRCS}' [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
GEOIP2LINKOBJS='${GEOIP2LINKOBJS}' GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open" GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
AC_MSG_NOTICE([GeoIP2 default database path set to $with_geoip2/share/GeoIP]) MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open"
AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_geoip2]) AC_MSG_NOTICE([GeoIP2 default database path set to $with_maxminddb/share/GeoIP])
], AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_maxminddb])
[AC_MSG_ERROR([GeoIP2 requested, but libmaxminddb not found])]) ],
]) [AC_MSG_ERROR([GeoIP2 requested, but libmaxminddb not found])])
AC_ARG_VAR([MAXMINDDB_PREFIX], [value of prefix for MAXMINDDB, overriding pkg-config]) ])
AC_ARG_VAR([MAXMINDDB_PREFIX], [value of prefix for MAXMINDDB, overriding pkg-config])
])
AC_SUBST([MAXMINDDB_CFLAGS]) AC_SUBST([MAXMINDDB_CFLAGS])
AC_SUBST([MAXMINDDB_LIBS]) AC_SUBST([MAXMINDDB_LIBS])
AC_SUBST([GEOIP2LINKSRCS]) AC_SUBST([GEOIP2LINKSRCS])
AC_SUBST([GEOIP2LINKOBJS]) AC_SUBST([GEOIP2LINKOBJS])
# #
# Do we have arc4random(), etc ? # Do we have arc4random(), etc ?
# #
@ -2906,7 +2920,7 @@ report() {
test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)" test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)"
test "no" = "$use_dnstap" || \ test "no" = "$use_dnstap" || \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test -z "$MAXMINDDB_LIBS" || echo " GeoIP2 access control (--with-geoip2)" test -z "$MAXMINDDB_LIBS" || echo " GeoIP2 access control (--enable-geoip)"
test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)"
if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
echo " Algorithm: $with_cc_alg" echo " Algorithm: $with_cc_alg"
@ -2970,7 +2984,7 @@ report() {
test "no" = "$use_dnstap" && \ test "no" = "$use_dnstap" && \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test -z "$MAXMINDDB_LIBS" && echo " GeoIP2 access control (--with-geoip2)" test -z "$MAXMINDDB_LIBS" && echo " GeoIP2 access control (--enable-geoip)"
test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)"
test "no" = "$enable_dnsrps" && \ test "no" = "$enable_dnsrps" && \

2
doc/arm/notes.xml
View File

@ -118,7 +118,7 @@
The GeoIP2 API from MaxMind is now supported. Geolocation support The GeoIP2 API from MaxMind is now supported. Geolocation support
will be compiled in by default if the <command>libmaxminddb</command> will be compiled in by default if the <command>libmaxminddb</command>
library is found at compile time, but can be turned off by using library is found at compile time, but can be turned off by using
<command>configure --without-geoip2</command>. <command>configure --disable-geoip</command>.
</para> </para>
<para> <para>
The default path to the GeoIP2 databases will be set based The default path to the GeoIP2 databases will be set based