From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 9 Jul 2019 11:35:39 +0000 (+0200)
Subject: Add missing AX_RESTORE_FLAGS([geoip2]) to configure.ac
X-Git-Tag: v9.11.9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a848ef76f14e5e509304a142598e23f6f2acc998;p=thirdparty%2Fbind9.git

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

diff --git a/aclocal.m4 b/aclocal.m4
index 43f6e1ff377..ddddd296b5d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -288,6 +288,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
+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])
diff --git a/configure b/configure
index b024643891d..4a5db6c5f40 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 94e03a72240..ffd54c78d7d 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])