diff --git a/configure b/configure
index 683955f22b..286f589167 100755
--- a/configure
+++ b/configure
@@ -849,7 +849,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1011,7 +1010,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1264,15 +1262,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     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)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1410,7 +1399,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1563,7 +1552,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -14563,6 +14551,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
 
diff --git a/configure.ac b/configure.ac
index 5e019fcb87..dc5f8001dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,6 +588,7 @@ AS_CASE([$with_geoip2],
 			    AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_geoip2])
 			   ],
 			   [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])
 AC_SUBST([MAXMINDDB_CFLAGS])