pb libs: don't build if protobuf support is disabled

Testing done: built and installed for all ubuntu targets

These library targets should not be built if protobuf support is
disabled, as that is their only functionality.

Clears the following lintian warnings:
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr_pb.so.0.0.0 usr/lib/libfrr_pb.so
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrr_pb.so.0.0.0
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>

diff --git a/fpm/Makefile.am b/fpm/Makefile.am
index 1f46ac6db2b405d92155333ed63b06c692f76bf5..d2ec8506344f1d529b89ae42d3106614f650ba4c 100644 (file)
--- a/fpm/Makefile.am
+++ b/fpm/Makefile.am
@@ -5,10 +5,11 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q
 PROTOBUF_INCLUDES=-I$(top_srcdir)
 PROTOBUF_PACKAGE = fpm
 
+if HAVE_PROTOBUF
+
 lib_LTLIBRARIES = libfrrfpm_pb.la
 libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0
 
-if HAVE_PROTOBUF
 protobuf_srcs =
 
 protobuf_srcs_nodist =                         \

diff --git a/qpb/Makefile.am b/qpb/Makefile.am
index e5951b2be93e9a7297dedaf5a3dc8a88ea98e263..168db9fecddd71921154e5f9e702851ed4545b49 100644 (file)
--- a/qpb/Makefile.am
+++ b/qpb/Makefile.am
@@ -5,10 +5,11 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q
 PROTOBUF_INCLUDES=-I$(top_srcdir)
 PROTOBUF_PACKAGE = qpb
 
+if HAVE_PROTOBUF
+
 lib_LTLIBRARIES = libfrr_pb.la
 libfrr_pb_la_LDFLAGS = -version-info 0:0:0
 
-if HAVE_PROTOBUF
 protobuf_srcs =                                        \
        qpb_allocator.c