From: Francis Dupont <fdupont@isc.org>
Date: Fri, 31 Aug 2018 15:56:15 +0000 (+0200)
Subject: [65-libyang-generic] Extra fixes
X-Git-Tag: libyang-generic_to_be_rebased~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e16c9bd3574eda7e13591aaddb743f0093d3dd3;p=thirdparty%2Fkea.git

[65-libyang-generic] Extra fixes
---

diff --git a/configure.ac b/configure.ac
index 51a56741a0..77090df372 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,9 @@ if test "$cross_compiling" = "yes"; then
 fi
 AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"])
 
+# pkg-config can be required.
+AC_PATH_PROG([PKG_CONFIG], [pkg-config])
+
 # Enable low-performing debugging facilities? This option optionally
 # enables some debugging aids that perform slowly and hence aren't built
 # by default.
@@ -817,7 +820,6 @@ AC_ARG_WITH([cql],
     [cql_config="$withval"])
 
 if test "${cql_config}" = "yes" ; then
-    AC_PATH_PROG([PKG_CONFIG], [pkg-config])
     CQL_CONFIG="$PKG_CONFIG"
 elif test "${cql_config}" != "no" ; then
     CQL_CONFIG="${cql_config}"
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9de3269c32..72176d47e2 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,9 @@
 # The following build order must be maintained.
 SUBDIRS = exceptions util log cryptolink dns asiolink cc testutils hooks dhcp \
-          config stats asiodns dhcp_ddns eval dhcpsrv cfgrpt process http
+          config stats
+
+if HAVE_SYSREPO
+SUBDIRS += yang
+endif
+
+SUBDIRS += asiodns dhcp_ddns eval dhcpsrv cfgrpt process http
diff --git a/src/lib/yang/tests/Makefile.am b/src/lib/yang/tests/Makefile.am
index 6e8ddef064..4391cddf84 100644
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@ -20,8 +20,7 @@ run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD =  $(top_builddir)/src/lib/yang/testutils/libyangtest.la
-run_unittests_LDADD += $(top_builddir)/src/lib/yang/libkea-yang.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/yang/libkea-yang.la
 run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la