diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-03-16 14:03:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 14:03:34 -0400 |
| commit | 3406c16cbeecafb400cc2155a1ca9f9504c95b4e (patch) | |
| tree | 7853ddaa015a1542723f925b863d4440d9ff3529 /configure.ac | |
| parent | 30643d6f314c8b5462073b2382c799b7966528e8 (diff) | |
| parent | 749714731ee9a59ae39be77e7db3915ce3ad0bd8 (diff) | |
Merge pull request #7963 from volta-networks/feat_pceplib_into_frr_github
pceplib: Integrate pcelib into frr
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 139fca7c42..b034fab50c 100755 --- a/configure.ac +++ b/configure.ac @@ -1723,12 +1723,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 @@ -2550,15 +2548,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"]) @@ -2583,6 +2580,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" |