diff --git a/aclocal.m4 b/aclocal.m4
index 09c2911218..ddddd296b5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -288,8 +288,8 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-m4_include([m4/ax_restore_flags.m4])
-m4_include([m4/ax_save_flags.m4])
+m4_include([libtool.m4/ax_restore_flags.m4])
+m4_include([libtool.m4/ax_save_flags.m4])
 m4_include([libtool.m4/libtool.m4])
 m4_include([libtool.m4/ltoptions.m4])
 m4_include([libtool.m4/ltsugar.m4])
diff --git a/configure b/configure
index b024643891..4a5db6c5f4 100755
--- a/configure
+++ b/configure
@@ -15027,6 +15027,59 @@ else
   as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5
 fi
 
+
+  CCASFLAGS=$CCASFLAGS_geoip2_ax_save_flags
+
+
+  CFLAGS=$CFLAGS_geoip2_ax_save_flags
+
+
+  CPPFLAGS=$CPPFLAGS_geoip2_ax_save_flags
+
+
+  CXXFLAGS=$CXXFLAGS_geoip2_ax_save_flags
+
+
+  ERLCFLAGS=$ERLCFLAGS_geoip2_ax_save_flags
+
+
+  FCFLAGS=$FCFLAGS_geoip2_ax_save_flags
+
+
+  FCLIBS=$FCLIBS_geoip2_ax_save_flags
+
+
+  FFLAGS=$FFLAGS_geoip2_ax_save_flags
+
+
+  FLIBS=$FLIBS_geoip2_ax_save_flags
+
+
+  GCJFLAGS=$GCJFLAGS_geoip2_ax_save_flags
+
+
+  JAVACFLAGS=$JAVACFLAGS_geoip2_ax_save_flags
+
+
+  LDFLAGS=$LDFLAGS_geoip2_ax_save_flags
+
+
+  LIBS=$LIBS_geoip2_ax_save_flags
+
+
+  OBJCFLAGS=$OBJCFLAGS_geoip2_ax_save_flags
+
+
+  OBJCXXFLAGS=$OBJCXXFLAGS_geoip2_ax_save_flags
+
+
+  UPCFLAGS=$UPCFLAGS_geoip2_ax_save_flags
+
+
+  VALAFLAGS=$VALAFLAGS_geoip2_ax_save_flags
+
+
+
 	 ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index 94e03a7224..ffd54c78d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,6 +771,7 @@ AS_CASE([$with_geoip2],
 			    AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_geoip2])
 			   ],
 			   [AC_MSG_ERROR([GeoIP2 requested, but libmaxminddb not found])])
+	    AX_RESTORE_FLAGS([geoip2])
 	])
 AC_ARG_VAR([MAXMINDDB_PREFIX], [value of prefix for MAXMINDDB, overriding pkg-config])
 AC_SUBST([MAXMINDDB_CFLAGS])
diff --git a/m4/ax_restore_flags.m4 b/libtool.m4/ax_restore_flags.m4
similarity index 100%
rename from m4/ax_restore_flags.m4
rename to libtool.m4/ax_restore_flags.m4
diff --git a/m4/ax_save_flags.m4 b/libtool.m4/ax_save_flags.m4
similarity index 100%
rename from m4/ax_save_flags.m4
rename to libtool.m4/ax_save_flags.m4
diff --git a/util/copyrights b/util/copyrights
index 858e1e4ca7..cb7a235c2a 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -4487,14 +4487,14 @@
 ./lib/win32/bindevt/bindevt.vcxproj.filters.in	X	2013,2015,2018,2019
 ./lib/win32/bindevt/bindevt.vcxproj.in		X	2013,2014,2015,2016,2018,2019
 ./lib/win32/bindevt/bindevt.vcxproj.user	X	2013,2018,2019
+./libtool.m4/ax_restore_flags.m4		X	2019
+./libtool.m4/ax_save_flags.m4			X	2019
 ./libtool.m4/libtool.m4				X	2012,2018,2019
 ./libtool.m4/ltoptions.m4			X	2012,2018,2019
 ./libtool.m4/ltsugar.m4				X	2012,2018,2019
 ./libtool.m4/ltversion.m4			X	2012,2018,2019
 ./libtool.m4/lt~obsolete.m4			X	2012,2018,2019
 ./ltmain.sh					X	1999,2000,2001,2003,2004,2006,2009,2012,2018,2019
-./m4/ax_restore_flags.m4			X	2019
-./m4/ax_save_flags.m4				X	2019
 ./make/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018,2019
 ./make/includes.in				MAKE	1999,2000,2001,2004,2005,2007,2012,2014,2016,2018,2019
 ./make/mkdep.in					X	1999,2000,2001,2006,2011,2014,2018,2019