From: Razvan Becheriu <ravan@isc.org>
Date: Sat, 9 Mar 2019 07:07:51 +0000 (+0200)
Subject: export LIBYANG_PATH from config_defines
X-Git-Tag: Kea-1.6.0-beta~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=020bfc739384a0d6bfdfa41772f177e7cdd36c80;p=thirdparty%2Fkea.git

export LIBYANG_PATH from config_defines
---

diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index d4fc0e2d66..e03007e16a 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -10,10 +10,6 @@
 # This script is used to run Kea from installation directory,
 # as well as for running tests.
 
-if [ -z "${YANG_LIBRARY_PATH}" ]; then
-    YANG_LIBRARY_PATH=/
-fi
-
 if [ "$(uname -s)" = "Darwin" ]; then
     DIR=$(stat -f %N "$0" | xargs dirname)
 else
@@ -34,41 +30,6 @@ if [ $# -ne 1 ] && [ $# -ne 2 ]; then
     echo "run: \`$0 --help\` for more help"
     exit 0
 fi
-<<<<<<< HEAD
-if [ "$1" = "--help" ]
-then
-	echo "sysrepo_config 'option' ['library']"
-	echo "options:"
-	echo "--help"
-	echo "    print this help message"
-	echo "--cflags-only-other"
-	echo "    get cpp compilation flags"
-	echo "--cflags-only-I"
-	echo "    get include path"
-	echo "--libs"
-	echo "    get lib path"
-	echo "--modversion"
-	echo "    get version"
-	echo "--variable=SR_REPOSITORY_LOC"
-	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" ] && [ $2 != "libSysrepo-cpp" ]
-		then
-			echo "library $2 not supported"
-			echo "run: \`$0 --help\` for more help"
-			exit 0
-		else
-			sysrepo_lib=$2
-		fi
-	fi
-=======
 
 if [ "$1" = "--help" ]; then
     echo "sysrepo_config 'option' ['library']"
@@ -89,7 +50,6 @@ if [ "$1" = "--help" ]; then
     echo "    libsysrepo"
     echo "    libSysrepo-cpp"
     exit 0
->>>>>>> fixed script
 fi
 
 if [ $# -ne 2 ]; then
@@ -115,7 +75,7 @@ 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${LIBYANG_PATH}/lib/ -lsysrepo -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c"
     exit 0
 fi
 
diff --git a/tools/sysrepo_config_defines.sh.sample b/tools/sysrepo_config_defines.sh.sample
index ecfb34064e..04de5e1055 100755
--- a/tools/sysrepo_config_defines.sh.sample
+++ b/tools/sysrepo_config_defines.sh.sample
@@ -6,5 +6,5 @@
 
 # This variable should point to the directory where sysrepo is compiled.
 # You can download sysrepo sources from https://github.com/sysrepo/sysrepo.git
-SYSREPO_PATH="/please/specify/path/to/sysrepo/in/sysrepo_config_defines.sh"
-export SYSREPO_PATH
+export LIBYANG_PATH="/please/specify/path/to/libyang/in/sysrepo_config_defines.sh"
+export SYSREPO_PATH="/please/specify/path/to/sysrepo/in/sysrepo_config_defines.sh"