From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 9 Nov 2017 16:09:58 +0000 (-0500)
Subject: ldpd, zebra: Fix `make dist` compiles
X-Git-Tag: frr-4.0-dev~144^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ab59f4f7e3b83947bc00f40b9ecc251749a7112e;p=mirror%2Ffrr.git

ldpd, zebra: Fix `make dist` compiles

The original clippy implementation used if VTYSH_EXTRACT_PL
was defined or not to know to include as part of the creation
of vtysh.

Follow their lead here.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index aa2e06dfb9..6c86582960 100644
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -25,7 +25,9 @@
 
 #include "ldpd/ldpd.h"
 #include "ldpd/ldp_vty.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "ldpd/ldp_vty_cmds_clippy.c"
+#endif
 
 DEFUN_NOSH(ldp_mpls_ldp,
 	ldp_mpls_ldp_cmd,
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 73f0717124..5546b6d316 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -43,7 +43,9 @@
 #include "zebra/zebra_static.h"
 #include "lib/json.h"
 #include "zebra/zebra_vxlan.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "zebra/zebra_vty_clippy.c"
+#endif
 #include "zebra/zserv.h"
 
 extern int allow_delete;