Fix test for -z relro

--HG--
branch : 1.7

diff --git a/configure b/configure
index 8bf95e618fc68e7170e745b7dc8fff67fe8b427c..35ac565927e84d39e509413d5c0f3c75c4157768 100755 (executable)
--- a/configure
+++ b/configure
@@ -14624,14 +14624,14 @@ else
   :
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,z,relro" >&5
-$as_echo_n "checking whether the linker accepts -Wl,z,relro... " >&6; }
-if ${ax_cv_check_ldflags___Wl_z_relro+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,relro... " >&6; }
+if ${ax_cv_check_ldflags___Wl__z_relro+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -Wl,z,relro"
+  LDFLAGS="$LDFLAGS  -Wl,-z,relro"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14644,18 +14644,18 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___Wl_z_relro=yes
+  ax_cv_check_ldflags___Wl__z_relro=yes
 else
-  ax_cv_check_ldflags___Wl_z_relro=no
+  ax_cv_check_ldflags___Wl__z_relro=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl_z_relro" >&5
-$as_echo "$ax_cv_check_ldflags___Wl_z_relro" >&6; }
-if test x"$ax_cv_check_ldflags___Wl_z_relro" = xyes; then :
-  LDFLAGS="${LDFLAGS} -Wl,z,relro"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_relro" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__z_relro" >&6; }
+if test x"$ax_cv_check_ldflags___Wl__z_relro" = xyes; then :
+  LDFLAGS="${LDFLAGS} -Wl,-z,relro"
 else
   :
 fi

diff --git a/configure.in b/configure.in
index 56799bd509d89e095015a8f56354be2355ab7506..46cb47834786b73fe6dcbc778d09eb84f1c8a3ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1910,7 +1910,7 @@ dnl
 if test "$enable_hardening" != "no"; then
     AX_CHECK_COMPILE_FLAG([-fstack-protector], [CFLAGS="${CFLAGS} -fstack-protector"])
     AX_CHECK_LINK_FLAG([-fstack-protector], [LDFLAGS="${LDFLAGS} -fstack-protector"])
-    AX_CHECK_LINK_FLAG([-Wl,z,relro], [LDFLAGS="${LDFLAGS} -Wl,z,relro"])
+    AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="${LDFLAGS} -Wl,-z,relro"])
 fi
 
 dnl