[65-libyang-config-build] Updated configure and top Makefile

diff --git a/Makefile.am b/Makefile.am
index 2c0733c29ca33c3de61c03dc9811d88091cb1532..2cd1c326dc8a7016414da1afd9d727e00d7804af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=@DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
 DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=@DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
 DISTCHECK_PREMIUM_CONFIGURE_FLAG=@DISTCHECK_PREMIUM_CONFIGURE_FLAG@
 DISTCHECK_CONTRIB_CONFIGURE_FLAG=@DISTCHECK_CONTRIB_CONFIGURE_FLAG@
+DISTCHECK_SYSREPO_CONFIGURE_FLAG=@DISTCHECK_SYSREPO_CONFIGURE_FLAG@
 
 OVERALL_COVERAGE_DIR=$(abs_top_builddir)/coverage-cpp-html
 
@@ -43,6 +44,9 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_PREMIUM_CONFIGURE_FLAG)
 # Keep the contrib config
 DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_CONTRIB_CONFIGURE_FLAG)
 
+# keerp the sysrepo config
+DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_SYSREPO_CONFIGURE_FLAG)
+
 dist_doc_DATA = AUTHORS COPYING ChangeLog README
 
 .PHONY: check-valgrind check-valgrind-suppress

diff --git a/configure.ac b/configure.ac
index b784dfc19a970b5b0ea1dd7cd33d160bb6f886fc..b5eed020afdf1dc335de821c393f1622017c865c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -863,6 +863,7 @@ fi
 # ... and at the shell level, so Makefile.am can take action depending on this.
 AM_CONDITIONAL(HAVE_CQL, test "$CQL_CONFIG" != "")
 
+DISTCHECK_SYSREPO_CONFIGURE_FLAG=
 sysrepo_config="no"
 AC_ARG_WITH([sysrepo],
   AC_HELP_STRING([--with-sysrepo=PATH],
@@ -871,13 +872,16 @@ AC_ARG_WITH([sysrepo],
 
 if test "${sysrepo_config}" = "yes" ; then
     SYSREPO_CONFIG="$PKG_CONFIG"
+    DISTCHECK_SYSREPO_CONFIGURE_FLAG="-with-sysrepo=${sysrepo_config}"
 elif test "${sysrepo_config}" != "no" ; then
     SYSREPO_CONFIG="${sysrepo_config}"
+    DISTCHECK_SYSREPO_CONFIGURE_FLAG="-with-sysrepo=${sysrepo_config}"
 fi
+AC_SUBST(DISTCHECK_SYSREPO_CONFIGURE_FLAG)
 
 if test "$SYSREPO_CONFIG" != "" ; then
     if test -d "$SYSREPO_CONFIG" -o ! -x "$SYSREPO_CONFIG" ; then
-        AC_MSG_ERROR([--with-sysrepo should point to a sysrepo_config program])
+        AC_MSG_ERROR([--with-sysrepo should point to a pkg-config or sysrepo_config program])
     fi
 
     # Let's get the configuration environment for pure Sysrepo (written in C) first
@@ -885,6 +889,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
     SYSREPO_CPPFLAGS="$SYSREPO_INCLUDEDIR `$SYSREPO_CONFIG --cflags-only-other libsysrepo`"
     SYSREPO_LIBS="`$SYSREPO_CONFIG --libs libsysrepo`"
     SYSREPO_VERSION=`$SYSREPO_CONFIG --modversion libsysrepo`
+    SYSREPO_REPO=`$SYSREPO_CONFIG --variable=SR_REPOSITORY_LOC libsysrepo`
 
     # Now get the environment for C++ bindings for Sysrepo.
     SYSREPOCPP_INCLUDEDIR=`$SYSREPO_CONFIG --cflags-only-I libSysrepo-cpp`
@@ -908,6 +913,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
 
     AC_SUBST(SYSREPO_CPPFLAGS)
     AC_SUBST(SYSREPO_LIBS)
+    AC_SUBST(SYSREPO_REPO)
 
     # Check that a simple program using Sysrepo functions can compile and link.
     CPPFLAGS_SAVED="$CPPFLAGS"
@@ -1810,6 +1816,7 @@ Sysrepo:
   SYSREPO_VERSION:     ${SYSREPO_VERSION}
   SYSREPO_CPPFLAGS:    ${SYSREPO_CPPFLAGS}
   SYSREPO_LIBS:        ${SYSREPO_LIBS}
+  SYSREPO_REPO:        ${SYSREPO_REPO}
 END
 else
 cat >> config.report << END

diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index 6da9404e63a3848b05fc8a262e47f6c0d203aee5..a4f1165bca65bbdbd33b67245057c6507e08941c 100755 (executable)
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -39,6 +39,8 @@ then
        echo "    get lib path"
        echo "--modversion"
        echo "    get version"
+       echo "--variable=SR_REPOSITORY_LOC"
+       echo "    get repo path"
        echo "libraries:"
        echo "    libsysrepo"
        exit 0
@@ -67,7 +69,8 @@ then
 fi
 if [ $1 == "--libs" ]
 then
-       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 -lprotobuf -lavl -lprotobuf-c"
+# 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"
        exit 0
 fi
 if [ $1 == "--modversion" ]
@@ -78,5 +81,9 @@ then
        echo "${MAJOR}.${MINOR}.${PATCH}"
        exit 0
 fi
+if [ $1 == "--variable=SR_REPOSITORY_LOC" ]
+then
+       echo "${SYSREPO_PATH}/build/repository"
+fi
 echo "wrong parameter"
 echo "run: \`$0 --help\` for more help"