sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79778 by Matthew Clark for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79778 by Matthew Clark for review
Date: Thu, 25 May 2006 02:00:01 +0100 (BST)

Change 79778 by matthew_clark@mclark-aussie on 2006/05/25 01:56:45

Integrate from devel

Affected files ...

... //sgl/grimoires/test/net/quagga/BUILD#3 integrate
... //sgl/grimoires/test/net/quagga/CONFIGURE#2 integrate
... //sgl/grimoires/test/net/quagga/HISTORY#6 integrate
... //sgl/grimoires/test/net/zebra/BUILD#2 integrate
... //sgl/grimoires/test/net/zebra/CONFIGURE#2 integrate
... //sgl/grimoires/test/net/zebra/HISTORY#7 integrate

Differences ...

==== //sgl/grimoires/test/net/quagga/BUILD#3 (xtext) ====

@@ -1,3 +1,6 @@
+OPTS="$OPTS --with-gnu-ld --sysconfdir=/etc/quagga
--localstatedir=/var/run/quagga $QUAGGA_ISIS $QUAG
+ $QUAGGA_OSPF_TE $QUAGGA_VTYSH $QUAGGA_TCP_LINK $QUAGGA_SNMP
$QUAGGA_OPAQUE_LSA
+ $QUAGGA_OSPFAPI $QUAGGA_OSPFCLIENT $QUAGGA_IRDP" &&
autoconf &&
create_account quagga &&
default_build

==== //sgl/grimoires/test/net/quagga/CONFIGURE#2 (xtext) ====

@@ -15,8 +15,5 @@
config_query_option QUAGGA_OSPFAPI 'Do NOT build OSPFAPI to access the
OSPF LSA Database?' n '--disable-ospfapi' '--enable-ospfapi' &&
config_query_option QUAGGA_OSPFCLIENT 'Do NOT build OSPFAPI client for
OSPFAPI?' n '--disable-ospfclient' '--enable-ospfclient'
fi &&
-config_query_option QUAGGA_IRDP 'Enable IRDP support in zebra?' y
'--enable-irdp' '--disable-irdp' &&
-OPTS="$OPTS --with-gnu-ld --sysconfdir=/etc/quagga
--localstatedir=/var/run/quagga $QUAGGA_ISIS $QUAGGA_ISIS_TOPO\
- $QUAGGA_OSPF_TE $QUAGGA_VTYSH $QUAGGA_TCP_LINK $QUAGGA_SNMP
$QUAGGA_OPAQUE_LSA
- $QUAGGA_OSPFAPI $QUAGGA_OSPFCLIENT $QUAGGA_IRDP"
+config_query_option QUAGGA_IRDP 'Enable IRDP support in zebra?' y
'--enable-irdp' '--disable-irdp'

==== //sgl/grimoires/test/net/quagga/HISTORY#6 (text) ====

@@ -1,3 +1,7 @@
+2006-05-24 Matthew Clark <matthewclark AT inlesserterms.net>
+ * CONFIGURE, BUILD: Moved $OPTS modifications from CONFIGURE to BUILD,
+ which partially fixes bug 11896
+
2006-03-23
* Integrating into test to close bug 10343

==== //sgl/grimoires/test/net/zebra/BUILD#2 (xtext) ====

@@ -1,2 +1,3 @@
+OPTS="$OPTS $ZEBRA_VTYSH $ZEBRA_IDRP $ZEBRA_SNMP $ZEBRA_TCPLINK
$ZEBRA_OSPF_NSSA $ZEBRA_OPAQUE $ZEBRA_OSPF_TE $ZEBRA_TCP_SIG" &&
autoconf &&
default_build

==== //sgl/grimoires/test/net/zebra/CONFIGURE#2 (xtext) ====

@@ -5,5 +5,4 @@
config_query_option ZEBRA_OSPF_NSSA 'Enable OSPF NSSA option?' y
'--enable-nssa' '--disable-nssa' &&
config_query_option ZEBRA_OPAQUE 'Enable OSPF Opaque-LSA support
(RFC2370)?' y '--enable-opaque-lsa' '--disable-opaque-lsa' &&
config_query_option ZEBRA_OSPF_TE 'Enable OSPF Traffic Engineering
Extensions?' y '--enable-ospf-te' '--disable-ospf-te' &&
-config_query_option ZEBRA_TCP_SIG 'Enable TCP MD5 Signature Option
(RFC2385)?' y '--enable-tcp-signature' '--disable-tcp-signature' &&
-OPTS="$OPTS $ZEBRA_VTYSH $ZEBRA_IDRP $ZEBRA_SNMP $ZEBRA_TCPLINK
$ZEBRA_OSPF_NSSA $ZEBRA_OPAQUE $ZEBRA_OSPF_TE $ZEBRA_TCP_SIG"
+config_query_option ZEBRA_TCP_SIG 'Enable TCP MD5 Signature Option
(RFC2385)?' y '--enable-tcp-signature' '--disable-tcp-signature'

==== //sgl/grimoires/test/net/zebra/HISTORY#7 (text) ====

@@ -1,3 +1,7 @@
+2006-05-24 Matthew Clark <matthewclark AT inlesserterms.net>
+ * CONFIGURE, BUILD: Moved $OPTS modifications from CONFIGURE to BUILD,
+ which partially fixes bug 11896
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

[SM-Commit] PERFORCE change 79778 by Matthew Clark for review, Perforce Review Daemon, 05/24/2006