From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 30 Jul 2008 14:16:45 +0000 (+0000)
Subject: Check SSP support availabily for openssh and avahi
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=0e731f4c739425d6b9f8038539ab552dce570570

Check SSP support availabily for openssh and avahi

SVN-Revision: 12012
---

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index bff264f952..8f5e88ca5f 100644
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -103,7 +103,6 @@ endef
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
-	--disable-stack-protector \
 	--disable-glib \
 	--disable-gobject \
 	--disable-qt3 \
@@ -134,7 +133,12 @@ CONFIGURE_ARGS+= \
 	--with-avahi-user=nobody \
 	--with-avahi-group=nogroup \
 	--with-autoipd-user=nobody \
-	--with-autoipd-group=nogroup \
+	--with-autoipd-group=nogroup
+
+ifneq ($(CONFIG_SSP_SUPPORT),y)
+CONFIGURE_ARGS+= \
+	--disable-stack-protector
+endif
 
 CONFIGURE_VARS+= \
 	CFLAGS="$$$$CFLAGS -DNDEBUG" \
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 44437c44d5..dade2548a9 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -99,6 +99,27 @@ define Package/openssh-sftp-server/description
 OpenSSH SFTP server.
 endef
 
+CONFIGURE_OPTS+= \
+	--enable-shared \
+	--disable-static \
+	--disable-debug \
+	--disable-strip \
+	--disable-etc-default-login \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--without-bsd-auth \
+	--without-kerberos5 \
+	--without-pam \
+	--without-x
+
+ifneq ($(CONFIG_SSP_SUPPORT),y)
+CONFIGURE_OPTS+= \
+	--without-stackprotect
+endif
+	
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -126,21 +147,7 @@ define Build/Configure
 			--sysconfdir=/etc/ssh \
 			$(DISABLE_LARGEFILE) \
 			$(DISABLE_NLS) \
-			--enable-shared \
-			--disable-static \
-			--disable-debug \
-			--disable-strip \
-			--disable-etc-default-login \
-			--disable-lastlog \
-			--disable-utmp \
-			--disable-utmpx \
-			--disable-wtmp \
-			--disable-wtmpx \
-			--without-stackprotect \
-			--without-bsd-auth \
-			--without-kerberos5 \
-			--without-pam \
-			--without-x \
+			$(CONFIGURE_OPTS) \
 	);
 endef