From: Andrei PAVEL <andrei.pavel@cti.pub.ro>
Date: Sun, 18 Mar 2018 11:53:39 +0000 (+0000)
Subject: use pkg-config for sysrepo
X-Git-Tag: gitlab29-base~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9c44b24a847aaf202a9dcd3dd130e95a18c8402;p=thirdparty%2Fkea.git

use pkg-config for sysrepo
---

diff --git a/configure.ac b/configure.ac
index 910831b7b7..dcab81dfab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,7 +829,7 @@ if test "$CQL_CONFIG" != "" ; then
     fi
 
     CQL_INCLUDEDIR=`$CQL_CONFIG --cflags-only-I $cql_lib`
-    CQL_CPPFLAGS="`$CQL_CONFIG --cflags-only-other $cql_lib` $CQL_INCLUDEDIR"
+    CQL_CPPFLAGS="$CQL_INCLUDEDIR `$CQL_CONFIG --cflags-only-other $cql_lib`"
     CQL_LIBS="`$CQL_CONFIG --libs $cql_lib`"
     CQL_VERSION=`$CQL_CONFIG --modversion $cql_lib`
 
@@ -878,15 +878,15 @@ if test "SYSREPO_CONFIG" != "" ; then
         AC_MSG_ERROR([--with-sysrepo should point to a sysrepo_config program])
     fi
 
-    SYSREPO_INCLUDEDIR=`$SYSREPO_CONFIG --cflags-only-I sysrepo`
-    SYSREPO_CPPFLAGS="`$SYSREPO_CONFIG --cflags-only-other sysrepo` $SYSREPO_INCLUDEDIR"
-    SYSREPO_LIBS="`$SYSREPO_CONFIG --libs sysrepo`"
-    SYSREPO_VERSION=`$SYSREPO_CONFIG --modversion sysrepo`
+    SYSREPO_INCLUDEDIR=`$SYSREPO_CONFIG --cflags-only-I libsysrepo`
+    SYSREPO_CPPFLAGS="$SYSREPO_INCLUDEDIR `$SYSREPO_CONFIG --cflags-only-other libsysrepo`"
+    SYSREPO_LIBS="`$SYSREPO_CONFIG --libs libsysrepo`"
+    SYSREPO_VERSION=`$SYSREPO_CONFIG --modversion libsysrepo`
 
     AC_SUBST(SYSREPO_CPPFLAGS)
     AC_SUBST(SYSREPO_LIBS)
 
-    # Check that a simple program using CQL functions can compile and link.
+    # Check that a simple program using Sysrepo functions can compile and link.
     CPPFLAGS_SAVED="$CPPFLAGS"
     LIBS_SAVED="$LIBS"
 
@@ -894,7 +894,9 @@ if test "SYSREPO_CONFIG" != "" ; then
     LIBS="$SYSREPO_LIBS $LIBS"
 
     AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM([#include <sysrepo.h>],
+            [AC_LANG_PROGRAM([extern "C" {
+                              #include <sysrepo.h>
+                              }],
                               [sr_conn_ctx_t *connection = NULL;
                               sr_session_ctx_t *session = NULL;
                               sr_connect("configure_test", SR_CONN_DEFAULT, &connection);
@@ -906,7 +908,7 @@ if test "SYSREPO_CONFIG" != "" ; then
     CPPFLAGS=$CPPFLAGS_SAVED
     LIBS=$LIBS_SAVED
 
-    # Note that CQL is present in the config.h file
+    # Note that Sysrepo is present in the config.h file
     AC_DEFINE([HAVE_SYSREPO], [1], [SYSREPO is present])
 fi
 
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index 31ab3520a1..6da9404e63 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sysrepo_lib="sysrepo"
+sysrepo_lib="libsysrepo"
 
 if [ -z ${YANG_LIBRARY_PATH} ]
 then
@@ -40,13 +40,13 @@ then
 	echo "--modversion"
 	echo "    get version"
 	echo "libraries:"
-	echo "    sysrepo"
+	echo "    libsysrepo"
 	exit 0
 else if [ $# -ne 2 ]
 	then
 		echo "run: \`$0 --help\` for more help"
 		exit 0
-	else if [ $2 != "sysrepo" ]
+	else if [ $2 != "libsysrepo" ]
 		then
 			echo "library $2 not supported"
 			echo "run: \`$0 --help\` for more help"