From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 18 Apr 2019 13:21:27 +0000 (+0300)
Subject: fixed merge
X-Git-Tag: Kea-1.6.0-beta~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b86864a9b058a18eaaded2273dc5f40a9ec97c78;p=thirdparty%2Fkea.git

fixed merge
---

diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index c41d847116..fd28a86a46 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -61,16 +61,14 @@ elif [ "$2" != "libsysrepo" ] && [ "$2" != "libSysrepo-cpp" ]; then
     echo "run: \`$0 --help\` for more help"
     exit 0
 fi
-if [ $1 == "--cflags-only-I" ]
-then
-	echo "-I${SYSREPO_PATH}/include/"
-	exit 0
+
+if [ "$1" = "--cflags-only-other" ]; then
+    exit 0
 fi
-if [ $1 == "--libs" ]
-then
-# Earlier versions also required -lprotobuf, but it is no longer needed.
-	echo "-L${SYSREPO_PATH}/lib/ -L${YANG_LIBRARY_PATH} -lsysrepo -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c"
-	exit 0
+
+if [ "$1" = "--cflags-only-I" ]; then
+    echo "-I${SYSREPO_PATH}/include/"
+    exit 0
 fi
 
 if [ "$1" = "--libs" ]; then
@@ -89,6 +87,7 @@ fi
 
 if [ "$1" = "--variable=SR_REPOSITORY_LOC" ]; then
     echo "${SYSREPO_PATH}/build/repository"
+    exit 0
 fi
 
 echo "wrong parameter"