proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-16 21:39:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build, lib/yang: bake in extensions if possible (v2)

Browse Source 
LIBS<>LDFLAGS was wrong on this one.

Fixes: 02a0df1f22
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2018-11-30 21:42:25 +01:00
parent b8a84b5cc1
commit 68626e08f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1610,8 +1610,8 @@ AC_CHECK_MEMBER([struct lyd_node.priv], [], [
]) ])
], [[#include <libyang/libyang.h>]]) ], [[#include <libyang/libyang.h>]])
ac_ld_flag_save="$LDFLAGS" ac_libs_save="$LIBS"
LDFLAGS="$LDFLAGS $libyang_LIBS" LIBS="$LIBS $libyang_LIBS"
AC_CHECK_FUNC([ly_register_types], [ AC_CHECK_FUNC([ly_register_types], [
libyang_ext_builtin=true libyang_ext_builtin=true
AC_DEFINE([LIBYANG_EXT_BUILTIN], [1], [have ly_register_types()]) AC_DEFINE([LIBYANG_EXT_BUILTIN], [1], [have ly_register_types()])
@ -1626,7 +1626,7 @@ AC_CHECK_FUNC([ly_register_types], [
AC_MSG_WARN([===== old libyang (before 0.16.74) detected =====]) AC_MSG_WARN([===== old libyang (before 0.16.74) detected =====])
]) ])
AM_CONDITIONAL([LIBYANG_EXT_BUILTIN], [$libyang_ext_builtin]) AM_CONDITIONAL([LIBYANG_EXT_BUILTIN], [$libyang_ext_builtin])
LDFLAGS="$ac_ld_flag_save" LIBS="$ac_libs_save"
dnl --------------- dnl ---------------
dnl configuration rollbacks dnl configuration rollbacks