Changeset 255

Timestamp:

Oct 28, 2009, 8:32:43 PM (15 years ago)

Author:

katerina

Message:

Add --disable-ssp configure option (ticket #172).

Location:

trunk

Files:

• aclocal.m4 (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/aclocal.m4

@@ -409 +409 @@
 x_libraries=NONE
 DESTDIR=
-SH_ENABLE_OPTS="db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc"
+SH_ENABLE_OPTS="ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc"
 SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
 

trunk/configure.ac

@@ -635 +635 @@
 AM_SA_SIGACTION_WORKS
 
+AC_ARG_ENABLE(ssp,
+        [  --disable-ssp                disable the GCC stack protector],
+        [],
+        [enable_ssp=yes;]
+)
+
 if test "x$GCC" = "xyes"; then
-   GCC_STACK_PROTECT_LIB
-   GCC_STACK_PROTECT_CC
+
+   if test x"${enable_ssp}" = xno; then
+      :
+   else
+        GCC_STACK_PROTECT_LIB
+        GCC_STACK_PROTECT_CC
 dnl   GCC_STACK_CHECK_CC
-   GCC_PIE_CC
+      GCC_PIE_CC
+   fi   
+
 fi