Commit d5603654 authored by Francis Dupont's avatar Francis Dupont

[65-libyang-generic] Extra fixes

parent 284c7ed9
...@@ -74,6 +74,9 @@ if test "$cross_compiling" = "yes"; then ...@@ -74,6 +74,9 @@ if test "$cross_compiling" = "yes"; then
fi fi
AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"]) 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 # Enable low-performing debugging facilities? This option optionally
# enables some debugging aids that perform slowly and hence aren't built # enables some debugging aids that perform slowly and hence aren't built
# by default. # by default.
...@@ -817,7 +820,6 @@ AC_ARG_WITH([cql], ...@@ -817,7 +820,6 @@ AC_ARG_WITH([cql],
[cql_config="$withval"]) [cql_config="$withval"])
if test "${cql_config}" = "yes" ; then if test "${cql_config}" = "yes" ; then
AC_PATH_PROG([PKG_CONFIG], [pkg-config])
CQL_CONFIG="$PKG_CONFIG" CQL_CONFIG="$PKG_CONFIG"
elif test "${cql_config}" != "no" ; then elif test "${cql_config}" != "no" ; then
CQL_CONFIG="${cql_config}" CQL_CONFIG="${cql_config}"
......
...@@ -13,5 +13,10 @@ if HAVE_CQL ...@@ -13,5 +13,10 @@ if HAVE_CQL
SUBDIRS += cql SUBDIRS += cql
endif endif
SUBDIRS += testutils hooks dhcp config stats asiodns dhcp_ddns eval \ SUBDIRS += testutils hooks dhcp config stats
cfgrpt process dhcpsrv http
if HAVE_SYSREPO
SUBDIRS += yang
endif
SUBDIRS += asiodns dhcp_ddns eval cfgrpt process dhcpsrv http
...@@ -20,8 +20,7 @@ run_unittests_SOURCES += run_unittests.cc ...@@ -20,8 +20,7 @@ run_unittests_SOURCES += run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) 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/testutils/libkea-testutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment