[Devil-linux-commit] build/scripts dante,1.1.2.3,1.1.2.4

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv1956/scripts

Modified Files:
      Tag: rel-1-2-patches
	dante 
Log Message:
make sure compile works with ssp disabled


Index: dante
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dante,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- dante	24 May 2007 08:05:45 -0000	1.1.2.3
+++ dante	16 Oct 2007 13:39:46 -0000	1.1.2.4
@@ -31,7 +31,11 @@
 			
 	    ./configure --prefix=/usr --sysconfdir=/etc/socks --bindir=/usr/sbin --libexecdir=/usr/sbin \
 			--datadir=/usr/share/socks --localstatedir=/var/socks --sharedstatedir=/var/socks || exit 1
-	    make CC="gcc -fno-stack-protector" $PMAKE || exit 1
+            if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		make $PMAKE || exit 1
+	    else
+		make CC="gcc -fno-stack-protector" $PMAKE || exit 1
+	    fi
 	    strip_debug	    
 	    make check  || exit 1
 	fi