[rebasing] Rebased

diff --cc src/lib/Makefile.am
index 1c462abd36e11bbc4f7a039580dc16e401c57a1b,fcaa33931e1ebda2e8d6602a5e8968204c66cbce..319c99549062345c26e13faa1a294bb3d777abe4
--- 1/src/lib/Makefile.am
--- 2/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@@ -13,5 -13,10 +13,10 @@@ if HAVE_CQ
  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 dhcpsrv cfgrpt process http
++SUBDIRS += asiodns dhcp_ddns eval cfgrpt process dhcpsrv http