Split relro and pie into two options.

diff --git a/configure.ac b/configure.ac
index 1af34965273984c79d17b5574e99ec07b14620ec..ab46d2e893fb913470f9d7a955f3394ca2df1a3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -121,8 +121,8 @@ if test "x$enable_pie" = xyes; then
     save_CFLAGS="$CFLAGS"
     save_LDFLAGS="$LDFLAGS"
     CFLAGS="$CFLAGS -fPIE -DPIE"
-    LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now"
-    AC_CACHE_CHECK([whether compiler accepts -pie & relro], ac_cv_pie_fpie,
+    LDFLAGS="$LDFLAGS -pie"
+    AC_CACHE_CHECK([whether compiler accepts -pie], ac_cv_pie_fpie,
     [AC_TRY_LINK([], [],
     ac_cv_pie_fpie=yes, ac_cv_pie_fpie=no)])
     if test $ac_cv_pie_fpie = no; then
@@ -131,6 +131,13 @@ if test "x$enable_pie" = xyes; then
     fi
 fi
 
+AC_ARG_ENABLE(relro,CRONIE_HELP_STRING(--enable-relro,Build cronie with relro flag))
+if test "x$enable_relro" = xyes; then
+       save_CFLAGS="$CFLAGS"
+       save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="-Wl,-z,relro -Wl,-z,now"
+fi
+
 # Check whether user wants SELinux support
 SELINUX_MSG="no"
 LIBSELINUX=""