Merge branch 'rickard/fix-thp-config-test'

* rickard/fix-thp-config-test:
  Update configure scripts
  Fix broken THP configure test

erts/configure

@@ -24823,7 +24823,7 @@ printf "%s\n" "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$saved_LDFLAGS
+    LDFLAGS="$saved_LDFLAGS"
     for flag in "-Wl,-z,common-page-size=2097152" "-Wl,-z,max-page-size=2097152"
     do
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can add $flag to LDFLAGS" >&5
@@ -24846,7 +24846,7 @@ then :
 
            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-           LDFLAGS="$save_LDFLAGS $flag"
+           LDFLAGS="$saved_LDFLAGS $flag"
 
 else $as_nop
 

erts/configure.ac

@@ -3084,7 +3084,7 @@ AS_IF([test "x$erts_cv_linux_thp" = "xyes"],
         unused_command_line_argument=""
       ]
     )
-    LDFLAGS=$saved_LDFLAGS
+    LDFLAGS="$saved_LDFLAGS"
     for flag in "-Wl,-z,common-page-size=2097152" "-Wl,-z,max-page-size=2097152"
     do
       AC_MSG_CHECKING([if we can add $flag to LDFLAGS])
@@ -3093,7 +3093,7 @@ AS_IF([test "x$erts_cv_linux_thp" = "xyes"],
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[return 0;]])],
          [
            AC_MSG_RESULT([yes])
-           LDFLAGS="$save_LDFLAGS $flag"
+           LDFLAGS="$saved_LDFLAGS $flag"
          ],
          [
            AC_MSG_RESULT([no])