diff options
| author | hasso <hasso> | 2005-04-02 19:03:39 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-04-02 19:03:39 +0000 |
| commit | f695b01ff8e9aebc46bdf41f104ad4abbb0ef59e (patch) | |
| tree | 1a36e624a6577780a49f6ae2c8e0534140d33943 /configure.ac | |
| parent | a47d98f4b7d6e3c1f5298912672f7b4d55a203f0 (diff) | |
* configure.ac: Add --enable-isis-topology to enable isisd topology
generator code.
* isisd/Makefile.am: Variables to handle conditonal compiling of
topology generator code.
* isisd/isis_lsp.c: lsppdu_realloc() is used by topology generator.
* isisd/isisd.c: Rename show_isis_topology_cmd to not conflict the one
in the isis_spf.c.
* isisd/isisd.h: Remove TOPOLOGY_GENERATE define, it will be defined in
toplevel config.h if topology generator is enabled.
* isisd/topology/Makefile.am: Handle the libtoolized Quagga libraries.
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ccb02a08..7c6258a1 100755 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org> ## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st> ## -## $Id: configure.ac,v 1.95 2005/04/02 16:01:05 ajs Exp $ +## $Id: configure.ac,v 1.96 2005/04/02 19:03:39 hasso Exp $ AC_PREREQ(2.53) AC_INIT(Quagga, 0.99.0, [http://bugzilla.quagga.net]) @@ -180,6 +180,8 @@ AC_ARG_ENABLE(rtadv, [ --disable-rtadv disable IPV6 router advertisement feature]) AC_ARG_ENABLE(irdp, [ --enable-irdp enable IRDP server support in zebra]) +AC_ARG_ENABLE(isis_topology, +[ --enable-isis-topology enable IS-IS topology generator]) AC_ARG_ENABLE(capabilities, [ --disable-capabilities disable using POSIX capabilities]) AC_ARG_ENABLE(gcc_ultra_verbose, @@ -233,6 +235,17 @@ if test "${enable_irdp}" = "yes"; then AC_DEFINE(HAVE_IRDP,, IRDP ) fi +if test "${enable_isisd}" = "yes" && test "${enable_isis_topology}" = yes; then + AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code) + ISIS_TOPOLOGY_INCLUDES="-I./topology" + ISIS_TOPOLOGY_DIR="topology" + ISIS_TOPOLOGY_LIB="./topology/libtopology.a" +fi + +AC_SUBST(ISIS_TOPOLOGY_INCLUDES) +AC_SUBST(ISIS_TOPOLOGY_DIR) +AC_SUBST(ISIS_TOPOLOGY_LIB) + if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then enable_user="quagga" elif test "${enable_user}" = "no"; then @@ -1266,6 +1279,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile zebra/Makefile ripd/Makefile redhat/quagga.spec lib/version.h doc/defines.texi + isisd/topology/Makefile pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh]) AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl]) |