diff --git a/src/confd/configure.ac b/src/confd/configure.ac index 110e15a0..e3d46a94 100644 --- a/src/confd/configure.ac +++ b/src/confd/configure.ac @@ -22,9 +22,10 @@ AC_REPLACE_FUNCS(asprintf) # Check for pkg-config first, warn if it's not installed PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([sysrepo], [sysrepo >= 2.2.36]) PKG_CHECK_MODULES([augeas], [augeas >= 1.12.0]) PKG_CHECK_MODULES([jansson], [jansson >= 2.0.0]) +PKG_CHECK_MODULES([libite], [libite >= 2.5.0]) +PKG_CHECK_MODULES([sysrepo], [sysrepo >= 2.2.36]) # Plugin installation path for sysrepo-plugind PKG_CHECK_VAR([srpdplugindir], [sysrepo], [SRPD_PLUGINS_PATH]) diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am index 489e4982..9a2178df 100644 --- a/src/confd/src/Makefile.am +++ b/src/confd/src/Makefile.am @@ -4,8 +4,8 @@ AM_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG plugindir = $(srpdplugindir) plugin_LTLIBRARIES = confd-plugin.la -confd_plugin_la_CFLAGS = $(augeas_CFLAGS) $(sysrepo_CFLAGS) $(CFLAGS) -confd_plugin_la_LIBADD = $(augeas_LIBS) $(sysrepo_LIBS) +confd_plugin_la_CFLAGS = $(augeas_CFLAGS) $(libite_CFLAGS) $(sysrepo_CFLAGS) $(CFLAGS) +confd_plugin_la_LIBADD = $(augeas_LIBS) $(libite_LIBS) $(sysrepo_LIBS) confd_plugin_la_LDFLAGS = -module -avoid-version -shared confd_plugin_la_SOURCES = core.c core.h run.c sr_ext.c sr_ext.h srx_val.c srx_val.h \ ietf-system.c ietf-interfaces.c diff --git a/src/confd/src/core.h b/src/confd/src/core.h index 3f78c72f..3872a99f 100644 --- a/src/confd/src/core.h +++ b/src/confd/src/core.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -25,8 +26,6 @@ int vasprintf(char **strp, const char *fmt, va_list ap); int asprintf(char **strp, const char *fmt, ...); #endif -#define NELEMS(arr) (sizeof(arr) / sizeof(arr[0])) - #define DEBUG(fmt, ...) //#define DEBUG(fmt, ...) syslog(LOG_DEBUG, "%s: "fmt, __func__, ##__VA_ARGS__) #define ERROR(fmt, ...) syslog(LOG_ERR, "%s: " fmt, __func__, ##__VA_ARGS__)