diff --git a/autoconf/m4/unreal.m4 b/autoconf/m4/unreal.m4
index bb5269693..1b4f1e31f 100644
--- a/autoconf/m4/unreal.m4
+++ b/autoconf/m4/unreal.m4
@@ -439,8 +439,9 @@ AC_DEFUN([CHECK_GEOIP_CLASSIC],
 			AC_MSG_RESULT(configuring GeoIP Classic library)
 			cd GeoIP-$geoip_classic_version
 			save_cflags="$CFLAGS"
-			CFLAGS="$orig_cflags"
-			export CFLAGS
+			CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
+			LDFLAGS="$HARDEN_LIB_LDFLAGS"
+			export CFLAGS LDFLAGS
 			./configure --prefix=$cur_dir/extras/geoip-classic --libdir=$PRIVATELIBDIR --enable-shared --disable-static || exit 1
 			CFLAGS="$save_cflags"
 			AC_MSG_RESULT(compiling GeoIP Classic library)
diff --git a/configure b/configure
index 07a7f219c..665956b45 100755
--- a/configure
+++ b/configure
@@ -8881,10 +8881,10 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling Argon2 library" >&5
 printf "%s\n" "compiling Argon2 library" >&6; }
 cd argon2-$argon2_version
-$ac_cv_prog_MAKER || exit 1
+$ac_cv_prog_MAKER CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS" LDFLAGS="$HARDEN_LIB_LDFLAGS" || exit 1
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: installing Argon2 library" >&5
 printf "%s\n" "installing Argon2 library" >&6; }
-$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1
+$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS" LDFLAGS="$HARDEN_LIB_LDFLAGS" || exit 1
 # We need to manually copy the libs to PRIVATELIBDIR because
 # there is no way to tell make install in libargon2 to do so.
 # BUT FIRST, delete the old library so it becomes an unlink+create
@@ -10096,8 +10096,9 @@ printf "%s\n" "extracting GeoIP Classic library" >&6; }
 printf "%s\n" "configuring GeoIP Classic library" >&6; }
 			cd GeoIP-$geoip_classic_version
 			save_cflags="$CFLAGS"
-			CFLAGS="$orig_cflags"
-			export CFLAGS
+			CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
+			LDFLAGS="$HARDEN_LIB_LDFLAGS"
+			export CFLAGS LDFLAGS
 			./configure --prefix=$cur_dir/extras/geoip-classic --libdir=$PRIVATELIBDIR --enable-shared --disable-static || exit 1
 			CFLAGS="$save_cflags"
 			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling GeoIP Classic library" >&5
diff --git a/configure.ac b/configure.ac
index f9c6542af..1b973f8f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -711,9 +711,9 @@ else
 fi
 AC_MSG_RESULT(compiling Argon2 library)
 cd argon2-$argon2_version
-$ac_cv_prog_MAKER || exit 1
+$ac_cv_prog_MAKER CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS" LDFLAGS="$HARDEN_LIB_LDFLAGS" || exit 1
 AC_MSG_RESULT(installing Argon2 library)
-$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1
+$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS" LDFLAGS="$HARDEN_LIB_LDFLAGS" || exit 1
 # We need to manually copy the libs to PRIVATELIBDIR because
 # there is no way to tell make install in libargon2 to do so.
 # BUT FIRST, delete the old library so it becomes an unlink+create