Index: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	(revision 254)
+++ trunk/aclocal.m4	(revision 255)
@@ -409,5 +409,5 @@
 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"
 
Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac	(revision 254)
+++ trunk/configure.ac	(revision 255)
@@ -635,9 +635,21 @@
 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