pceplib: Integrate pcelib into frr

Signed-off-by: Brady Johnson <brady@voltanet.io>
Co-authored-by: Javier Garcia <javier.garcia@voltanet.io>

.gitignore

@@ -29,6 +29,7 @@
 /libtool
 /libtool.orig
 /changelog-auto
+/test-driver
 
 /Makefile
 /Makefile.in

Makefile.am

@@ -158,6 +158,8 @@ include bfdd/subdir.am
 include yang/subdir.am
 include yang/libyang_plugins/subdir.am
 include vrrpd/subdir.am
+include pceplib/subdir.am
+include pceplib/test/subdir.am
 include pathd/subdir.am
 
 include vtysh/subdir.am

configure.ac

@@ -1709,12 +1709,10 @@ fi
 
 AS_IF([test "$enable_pathd" != "no"], [
   AC_DEFINE([HAVE_PATHD], [1], [pathd])
-])
-
-AS_IF([test "$enable_pcep" != "no"], [
   AC_DEFINE([HAVE_PATHD_PCEP], [1], [pathd-pcep])
 ])
 
+
 if test "$ac_cv_lib_json_c_json_object_get" = "no" -a "$BFDD" = "bfdd"; then
   AC_MSG_ERROR(["you must use json-c library to use bfdd"])
 fi
@@ -2536,15 +2534,14 @@ AM_CONDITIONAL([HAVE_PROTOBUF], [test "$enable_protobuf" = "yes"])
 AM_CONDITIONAL([HAVE_PROTOBUF3], [$PROTO3])
 
 dnl PCEP plugin
-AM_CONDITIONAL([HAVE_PATHD_PCEP], [test "$enable_pcep" = "yes"])
-AS_IF([test "$enable_pcep" = "yes"], [
-  AC_CHECK_LIB([pcep_pcc], [initialize_pcc], [
-    PATHD_PCEP_LIBS="-lpcep_pcc"
-  ],[
-    AC_MSG_ERROR([PCEP library libpcep_pcc not found])
-  ])
-  AC_SUBST([PATHD_PCEP_LIBS])
-])
+AS_IF([test "$enable_pathd" != "no"], [
+       AC_SUBST([PATHD_PCEP_LIBS], ["pceplib/libpcep_pcc.la"])
+       AC_SUBST([PATHD_PCEP_INCL], ["-I./pceplib "])
+       ])
+AC_CHECK_LIB([cunit], [CU_initialize_registry], [pcep_cunit=yes],[pcep_cunit=no])
+AM_CONDITIONAL([PATHD_PCEP_TEST], [test "x${pcep_cunit}" = xyes])
+AC_CHECK_PROG(VALGRIND_CHECK, valgrind, yes)
+AM_CONDITIONAL([HAVE_VALGRIND_PCEP], [test "$VALGRIND_CHECK" = "yes"])
 
 dnl daemons
 AM_CONDITIONAL([VTYSH], [test "$VTYSH" = "vtysh"])
@@ -2569,6 +2566,7 @@ AM_CONDITIONAL([STATICD], [test "$enable_staticd" != "no"])
 AM_CONDITIONAL([FABRICD], [test "$enable_fabricd" != "no"])
 AM_CONDITIONAL([VRRPD], [test "$enable_vrrpd" != "no"])
 AM_CONDITIONAL([PATHD], [test "$enable_pathd" != "no"])
+AM_CONDITIONAL([PATHD_PCEP], [test "$enable_pathd" != "no"])
 
 AC_CONFIG_FILES([Makefile],[
 	test "$enable_dev_build" = "yes" && makefile_devbuild="--dev-build"

debian/frr.install

@@ -11,6 +11,7 @@ usr/lib/*/frr/modules/dplane_fpm_nl.so
 usr/lib/*/frr/modules/zebra_cumulus_mlag.so
 usr/lib/*/frr/modules/zebra_fpm.so
 usr/lib/*/frr/modules/zebra_irdp.so
+usr/lib/*/frr/modules/pathd_pcep.so
 usr/lib/frr/*.sh
 usr/lib/frr/*d
 usr/lib/frr/watchfrr

debian/rules

@@ -13,6 +13,11 @@ else
   export DH_OPTIONS=-v
 endif
 
+ifeq ($(filter parallel,$(DEB_BUILD_OPTIONS)),)
+        PARALLEL_EXTRA := $(filter parallel%,$(DEB_BUILD_OPTIONS))
+        MAKE_EXTRA := $(subst parallel=,-j,$(PARALLEL_EXTRA))
+endif
+
 # package-specific build profiles
 
 ifeq ($(filter pkg.frr.nortrlib,$(DEB_BUILD_PROFILES)),)
@@ -106,7 +111,7 @@ endif
 	ln -s /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/doc/frr/html/_static/underscore.js
 
 override_dh_auto_build:
-	dh_auto_build -- $(MAKE_SILENT)
+	dh_auto_build -- $(MAKE_SILENT) $(MAKE_EXTRA)
 
 override_dh_installinit:
 	dh_installinit -r