diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/quagga/quagga.mk | |
| parent | 5b11223fb6cd0469becf49b0986868832c076bfc (diff) | |
| parent | 2105ecbd86d04e446effa11108f6bd755ed5f19a (diff) | |
| download | buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/quagga/quagga.mk')
| -rw-r--r-- | package/quagga/quagga.mk | 89 |
1 files changed, 18 insertions, 71 deletions
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 107385283..349e0032c 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -4,86 +4,33 @@ # ############################################################# -QUAGGA_VERSION = 0.99.20.1 -QUAGGA_SITE = http://www.quagga.net/download +QUAGGA_VERSION = 0.99.21 +QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga QUAGGA_DEPENDENCIES = host-gawk QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink -ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y) -QUAGGA_CONF_OPT+=--enable-zebra -else -QUAGGA_CONF_OPT+=--disable-zebra -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_BGPD),y) -QUAGGA_CONF_OPT+=--enable-bgpd -else -QUAGGA_CONF_OPT+=--disable-bgpd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y) -QUAGGA_CONF_OPT+=--enable-ripd -else -QUAGGA_CONF_OPT+=--disable-ripd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y) -QUAGGA_CONF_OPT+=--enable-ripngd -else -QUAGGA_CONF_OPT+=--disable-ripngd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y) -QUAGGA_CONF_OPT+=--enable-ospfd -else -QUAGGA_CONF_OPT+=--disable-ospfd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OSPF6D),y) -QUAGGA_CONF_OPT+=--enable-ospf6d -else -QUAGGA_CONF_OPT+=--disable-ospf6d -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),y) -QUAGGA_CONF_OPT+=--enable-watchquagga -else -QUAGGA_CONF_OPT+=--disable-watchquagga -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y) -QUAGGA_CONF_OPT+=--enable-isisd -else -QUAGGA_CONF_OPT+=--disable-isisd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),y) -QUAGGA_CONF_OPT+=--enable-bgp-announce -else -QUAGGA_CONF_OPT+=--disable-bgp-announce -endif +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa) ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) -QUAGGA_CONF_OPT+=--enable-snmp -QUAGGA_DEPENDENCIES+=netsnmp +QUAGGA_CONF_OPT += --enable-snmp +QUAGGA_DEPENDENCIES += netsnmp # SNMP support tries -lcrypto by default, disable it if we ain't got openssl ifneq ($(BR2_PACKAGE_OPENSSL),y) -QUAGGA_CONF_OPT+=--without-crypto -endif -else -QUAGGA_CONF_OPT+=--disable-snmp +QUAGGA_CONF_OPT +=--without-crypto endif - -ifeq ($(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),y) -QUAGGA_CONF_OPT+=--enable-tcp-zebra -else -QUAGGA_CONF_OPT+=--disable-tcp-zebra -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),y) -QUAGGA_CONF_OPT+=--enable-opaque-lsa else -QUAGGA_CONF_OPT+=--disable-opaque-lsa +QUAGGA_CONF_OPT +=--disable-snmp endif $(eval $(call AUTOTARGETS)) |