From b86864a9b058a18eaaded2273dc5f40a9ec97c78 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 18 Apr 2019 16:21:27 +0300 Subject: [PATCH] fixed merge --- tools/sysrepo_config | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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" -- 2.47.2