diff --git a/configure.ac b/configure.ac
index cf8a04153c028ca13db364cb541af9f2f2c3f4ee..e9f2b0b486a725f7262edfa1fbe06ca2bb179d1e 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 1c462abd36e11bbc4f7a039580dc16e401c57a1b..319c99549062345c26e13faa1a294bb3d777abe4 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -13,5 +13,10 @@ if HAVE_CQL
 SUBDIRS += cql
 endif
 
-SUBDIRS += testutils hooks dhcp config stats asiodns dhcp_ddns eval \
-	cfgrpt process dhcpsrv http
+SUBDIRS += testutils hooks dhcp config stats
+
+if HAVE_SYSREPO
+SUBDIRS += yang
+endif
+
+SUBDIRS += asiodns dhcp_ddns eval cfgrpt process dhcpsrv http
diff --git a/src/lib/yang/tests/Makefile.am b/src/lib/yang/tests/Makefile.am
index 6e8ddef064bf2874ade9afeb218346e0896f445c..4391cddf84a9e3a7ab9d3f8f1f55c75158c54fed 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