* 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.
diff --git a/isisd/isisd.c b/isisd/isisd.c
index e4d73c3..229f135 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1595,9 +1595,9 @@
return CMD_SUCCESS;
}
-DEFUN (show_isis_topology,
- show_isis_topology_cmd,
- "show isis topology",
+DEFUN (show_isis_generated_topology,
+ show_isis_generated_topology_cmd,
+ "show isis generated-topology",
SHOW_STR
"clns network information\n"
"CLNS neighbor adjacencies\n")
@@ -2138,8 +2138,8 @@
install_element (ISIS_NODE, &topology_generate_grid_cmd);
install_element (ISIS_NODE, &topology_baseis_cmd);
install_element (ISIS_NODE, &no_topology_baseis_cmd);
- install_element (VIEW_NODE, &show_isis_topology_cmd);
- install_element (ENABLE_NODE, &show_isis_topology_cmd);
+ install_element (VIEW_NODE, &show_isis_generated_topology_cmd);
+ install_element (ENABLE_NODE, &show_isis_generated_topology_cmd);
#endif /* TOPOLOGY_GENERATE */
isis_new (0);