Add missing AX_RESTORE_FLAGS([geoip2]) to configure.ac

This commit is contained in:
Ondřej Surý 2019-07-09 13:35:39 +02:00
parent 5570f6bbdc
commit 5c0cc1ee8b
2 changed files with 54 additions and 0 deletions

53
configure vendored
View file

@ -14835,6 +14835,59 @@ else
as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5
fi
CCASFLAGS=$CCASFLAGS_maxminddb_ax_save_flags
CFLAGS=$CFLAGS_maxminddb_ax_save_flags
CPPFLAGS=$CPPFLAGS_maxminddb_ax_save_flags
CXXFLAGS=$CXXFLAGS_maxminddb_ax_save_flags
ERLCFLAGS=$ERLCFLAGS_maxminddb_ax_save_flags
FCFLAGS=$FCFLAGS_maxminddb_ax_save_flags
FCLIBS=$FCLIBS_maxminddb_ax_save_flags
FFLAGS=$FFLAGS_maxminddb_ax_save_flags
FLIBS=$FLIBS_maxminddb_ax_save_flags
GCJFLAGS=$GCJFLAGS_maxminddb_ax_save_flags
JAVACFLAGS=$JAVACFLAGS_maxminddb_ax_save_flags
LDFLAGS=$LDFLAGS_maxminddb_ax_save_flags
LIBS=$LIBS_maxminddb_ax_save_flags
OBJCFLAGS=$OBJCFLAGS_maxminddb_ax_save_flags
OBJCXXFLAGS=$OBJCXXFLAGS_maxminddb_ax_save_flags
UPCFLAGS=$UPCFLAGS_maxminddb_ax_save_flags
VALAFLAGS=$VALAFLAGS_maxminddb_ax_save_flags
;;
esac

View file

@ -560,6 +560,7 @@ AS_IF([test "$enable_geoip" = "yes"],
AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_maxminddb])
],
[AC_MSG_ERROR([GeoIP2 requested, but libmaxminddb not found])])
AX_RESTORE_FLAGS([maxminddb])
])
AC_ARG_VAR([MAXMINDDB_PREFIX], [value of prefix for MAXMINDDB, overriding pkg-config])
])