From a49152136036a4cedd467b5a74f1a84d78db1485 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomek@isc.org>
Date: Fri, 23 Jul 2021 16:29:29 +0200
Subject: [PATCH] [#1077] libyang and libyang-cpp now included in sysrepo flags

---
 m4macros/ax_sysrepo.m4 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/m4macros/ax_sysrepo.m4 b/m4macros/ax_sysrepo.m4
index c6e38f6353..faf36db03e 100644
--- a/m4macros/ax_sysrepo.m4
+++ b/m4macros/ax_sysrepo.m4
@@ -24,6 +24,12 @@ AC_DEFUN([AX_SYSREPO], [
   AX_FIND_LIBRARY([libyang-cpp], ["${with_library}"], [libyang/Libyang.hpp], [libyang-cpp.so])
   if "${LIBRARY_FOUND}"; then
 
+    LIBYANGCPP_CPPFLAGS="${LIBRARY_CPPFLAGS}"
+    LIBYANGCPP_INCLUDEDIR="${LIBRARY_INCLUDEDIR}"
+    LIBYANGCPP_LIBS="${LIBRARY_LIBS}"
+    LIBYANGCPP_VERSION="${LIBRARY_VERSION}"
+    LIBYANGCPP_PREFIX="${LIBRARY_PREFIX}"
+
     # If include paths are equal, there's no need to include both. But if
     # they're different, we need both.
     if test "${LIBYANG_INCLUDEDIR}" != "${LIBYANGCPP_INCLUDEDIR}"; then
@@ -38,12 +44,6 @@ AC_DEFUN([AX_SYSREPO], [
        LIBYANG_LIBS="${LIBYANG_LIBS} ${LIBYANGCPP_LIBS}"
     fi
 
-    LIBYANGCPP_CPPFLAGS="${LIBRARY_CPPFLAGS}"
-    LIBYANGCPP_INCLUDEDIR="${LIBRARY_INCLUDEDIR}"
-    LIBYANGCPP_LIBS="${LIBRARY_LIBS}"
-    LIBYANGCPP_VERSION="${LIBRARY_VERSION}"
-    LIBYANGCPP_PREFIX="${LIBRARY_PREFIX}"
-
     libyang_cpp_found=true
     AC_MSG_RESULT([yes])
   else
@@ -58,9 +58,9 @@ AC_DEFUN([AX_SYSREPO], [
   AC_MSG_CHECKING([sysrepo])
   AX_FIND_LIBRARY([sysrepo], ["${with_library}"], [sysrepo.h], [libsysrepo.so], [], [])
   if "${LIBRARY_FOUND}"; then
-    SYSREPO_CPPFLAGS="${LIBRARY_CPPFLAGS}"
-    SYSREPO_INCLUDEDIR="${LIBRARY_INCLUDEDIR}"
-    SYSREPO_LIBS="${LIBRARY_LIBS}"
+    SYSREPO_CPPFLAGS="${LIBRARY_CPPFLAGS} ${LIBYANG_CPPFLAGS}"
+    SYSREPO_INCLUDEDIR="${LIBRARY_INCLUDEDIR} ${LIBYANG_INCLUDEDIR}"
+    SYSREPO_LIBS="${LIBRARY_LIBS} ${LIBYANG_LIBS}"
     SYSREPO_VERSION="${LIBRARY_VERSION}"
 
     sysrepo_found=true
-- 
2.47.3