vtysh: fix commands when building only isisd or fabricd

 * add files to vtysh_scan when building only fabricd
 * don't add isisd/fabricd commands when daemon build is disabled

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/isisd/subdir.am b/isisd/subdir.am
index 50d474653465a0e05821e256637c560840f6d5f3..c2e4b4eac076afb8fd62673bc5b2c82c5c48317f 100644 (file)
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -23,6 +23,18 @@ if FABRICD
 noinst_LIBRARIES += isisd/libfabric.a
 sbin_PROGRAMS += isisd/fabricd
 dist_examples_DATA += isisd/fabricd.conf.sample
+if !ISISD
+vtysh_scan += \
+       isisd/isis_cli.c \
+       isisd/isis_ldp_sync.c \
+       isisd/isis_redist.c \
+       isisd/isis_spf.c \
+       isisd/isis_te.c \
+       isisd/isis_sr.c \
+       isisd/isis_vty_fabricd.c \
+       isisd/isisd.c \
+       # end
+endif
 endif
 
 noinst_HEADERS += \

diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 60c31bd84744758ba4328c4b954317e87c39a1f9..53067c43f4a28be841a7703b1ab9921bce2a068d 100755 (executable)
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -23,6 +23,8 @@
 ## 02111-1307, USA.  
 ##
 
+use Getopt::Long;
+
 print <<EOF;
 #include <zebra.h>
 
@@ -199,18 +201,31 @@ sub scan_file {
     }
 }
 
+my $have_isisd = 0;
+my $have_fabricd = 0;
+
+GetOptions('have-isisd' => \$have_isisd, 'have-fabricd' => \$have_fabricd);
+
 foreach (@ARGV) {
     if (/(^|\/)isisd\//) {
         # We scan all the IS-IS files twice, once for isisd,
         # once for fabricd. Exceptions are made for the files
         # that are not shared between the two.
         if (/isis_vty_isisd.c/) {
-            scan_file($_, 0);
+            if ( $have_isisd ) {
+                scan_file($_, 0);
+            }
         } elsif (/isis_vty_fabricd.c/) {
-            scan_file($_, 1);
+            if ( $have_fabricd ) {
+                scan_file($_, 1);
+            }
         } else {
-            scan_file($_, 0);
-            scan_file($_, 1);
+            if ( $have_isisd ) {
+                scan_file($_, 0);
+            }
+            if ( $have_fabricd ) {
+                scan_file($_, 1);
+            }
         }
     } else {
         scan_file($_, 0);

diff --git a/vtysh/subdir.am b/vtysh/subdir.am
index 3e9b8a3dc9a7331ddef00577e63c6201ade13dec..e7a1049b68cbe79017da595a89cfaf52fffdd9f8 100644 (file)
--- a/vtysh/subdir.am
+++ b/vtysh/subdir.am
@@ -31,5 +31,17 @@ am__v_EXTRACT_ = $(am__v_EXTRACT_$(AM_DEFAULT_VERBOSITY))
 am__v_EXTRACT_0 = @echo "  EXTRACT " $@;
 am__v_EXTRACT_1 =
 
+if ISISD
+HAVE_ISISD = --have-isisd
+else
+HAVE_ISISD =
+endif
+
+if FABRICD
+HAVE_FABRICD = --have-fabricd
+else
+HAVE_FABRICD =
+endif
+
 vtysh/vtysh_cmd.c: vtysh/extract.pl $(vtysh_scan)
-       $(AM_V_EXTRACT) $^ > vtysh/vtysh_cmd.c
+       $(AM_V_EXTRACT) $^ $(HAVE_ISISD) $(HAVE_FABRICD) > vtysh/vtysh_cmd.c