From: Razvan Becheriu <ravan@isc.org>
Date: Tue, 5 Mar 2019 16:27:57 +0000 (+0200)
Subject: fixed build sysrepo
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47ffe7dca996b552e30b31bd7526a6e8de9b3ed5;p=thirdparty%2Fkea.git

fixed build sysrepo
---

diff --git a/configure.ac b/configure.ac
index 5491715675..62450cf5d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,6 +947,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
        SYSREPO_LIBS="${SYSREPO_LIBS} ${SYSREPOCPP_LIBS}"
     fi
 
+    AC_SUBST(SYSREPO_INCLUDEDIR)
     AC_SUBST(SYSREPO_CPPFLAGS)
     AC_SUBST(SYSREPO_LIBS)
     AC_SUBST(SYSREPO_REPO)
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 50040b69b9..6e86835ab6 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
-AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
index 321a5ff577..42cb31dfe2 100644
--- a/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
 AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/netconf\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
 
 CLEANFILES = *.json *.log
 
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index a4f1165bca..0758aa0c6c 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -43,12 +43,13 @@ then
 	echo "    get repo path"
 	echo "libraries:"
 	echo "    libsysrepo"
+	echo "    libSysrepo-cpp"
 	exit 0
 else if [ $# -ne 2 ]
 	then
 		echo "run: \`$0 --help\` for more help"
 		exit 0
-	else if [ $2 != "libsysrepo" ]
+	else if [ $2 != "libsysrepo" ] && [ $2 != "libSysrepo-cpp" ]
 		then
 			echo "library $2 not supported"
 			echo "run: \`$0 --help\` for more help"
@@ -64,13 +65,13 @@ then
 fi
 if [ $1 == "--cflags-only-I" ]
 then
-	echo "-I${SYSREPO_PATH}/inc/"
+	echo "-I${SYSREPO_PATH}/include/"
 	exit 0
 fi
 if [ $1 == "--libs" ]
 then
 # Earlier versions also required -lprotobuf, but it is no longer needed.
-	echo "-L${SYSREPO_PATH}/build/src -L${SYSREPO_PATH}/build/swig -L$YANG_LIBRARY_PATH -l:${sysrepo_lib}.a -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c"
+	echo "-L${SYSREPO_PATH}/lib/ -L${YANG_LIBRARY_PATH} -lsysrepo -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c"
 	exit 0
 fi
 if [ $1 == "--modversion" ]
@@ -84,6 +85,7 @@ fi
 if [ $1 == "--variable=SR_REPOSITORY_LOC" ]
 then
 	echo "${SYSREPO_PATH}/build/repository"
+	exit 0
 fi
 echo "wrong parameter"
 echo "run: \`$0 --help\` for more help"