Changeset 4097723 for configure.ac

Timestamp:

Jul 5, 2009, 9:02:13 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e477a53

Parents:

16c0416

git-author:

Nelson Elhage <nelhage@mit.edu> (07/05/09 21:00:33)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/05/09 21:02:13)

Message:

configure: Support --with{out,}-stack-protector

This is a cleaner way to disable -fstack-protector than asking the
user to muck with PROTECT_CFLAGS, and lets the user not link libssp,
even if present.

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -46 +46 @@
         AC_MSG_RESULT(no)
 fi
-PROTECT_CFLAGS=${PROTECT_CFLAGS-"-fstack-protector"}
-SAVE_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $PROTECT_CFLAGS"
-AC_MSG_CHECKING(whether protection cflags work)
-AC_COMPILE_IFELSE(int i;,
-    [AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT(no)
-    CFLAGS=$SAVE_CFLAGS])
 
+AC_ARG_WITH([stack-protector],
+  [AS_HELP_STRING([--with-stack-protector],
+    [Enable gcc -fstack-protector])],
+  [],
+  [with_stack_protector=check])
 
-AC_CHECK_LIB(ssp, __stack_chk_guard)
+AS_IF([test "x$with_stack_protector" != xno],
+  [
+    SAVE_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -fstack-protector"
+    AC_MSG_CHECKING(whether protection cflags work)
+    AC_COMPILE_IFELSE(int i;,
+        [AC_MSG_RESULT(yes)],
+        [AC_MSG_RESULT(no)
+        CFLAGS=$SAVE_CFLAGS
+        if test "x$with_stack_protector" != xcheck; then
+          AC_MSG_FAILURE([--with-stack-protector selected, but gcc does support it.])
+        fi])
+    AC_CHECK_LIB(ssp, __stack_chk_guard)
+  ])
+
 AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No libncursesw found.))
 AC_CHECK_LIB(com_err, com_err)