Check SSP support availabily for openssh and avahi

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12012 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index bff264f..8f5e88c 100644 (file)
--- 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 44437c4..dade254 100644 (file)
--- 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