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

diff --git a/aclocal.m4 b/aclocal.m4
index 43f6e1ff377c39fd7de4a32cebb571bff4626662..ddddd296b5d5db302f52bcf609223a8bebef0f59 100644 (file)
--- 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 b024643891d9ef8d60c5a9b8b0c243b6088fe361..4a5db6c5f401b7c1cf2d7ed00439219b128286d6 100755 (executable)
--- 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 94e03a72240d5fc02df5764503e4a7890ea12f41..ffd54c78d7de890b6c04f0f014ad4e2806975d21 100644 (file)
--- 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])