diff --git a/bin/logger/Makefile.am b/bin/logger/Makefile.am index 876883c..08ef123 100644 --- a/bin/logger/Makefile.am +++ b/bin/logger/Makefile.am @@ -20,3 +20,10 @@ if SML_SUPPORT vzlogger_LDADD += $(DEPS_SML_LIBS) AM_CFLAGS += $(DEPS_SML_CFLAGS) endif + +# D0 support +#################################################################### +if D0_SUPPORT +vzlogger_LDADD += $(DEPS_D0_LIBS) +AM_CFLAGS += $(DEPS_D0_CFLAGS) +endif diff --git a/bin/logger/Makefile.in b/bin/logger/Makefile.in index 707c3b8..b140fac 100644 --- a/bin/logger/Makefile.in +++ b/bin/logger/Makefile.in @@ -44,6 +44,11 @@ bin_PROGRAMS = vzlogger$(EXEEXT) #################################################################### @SML_SUPPORT_TRUE@am__append_4 = $(DEPS_SML_LIBS) @SML_SUPPORT_TRUE@am__append_5 = $(DEPS_SML_CFLAGS) + +# D0 support +#################################################################### +@D0_SUPPORT_TRUE@am__append_6 = $(DEPS_D0_LIBS) +@D0_SUPPORT_TRUE@am__append_7 = $(DEPS_D0_CFLAGS) subdir = bin/logger DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -67,7 +72,8 @@ am__DEPENDENCIES_1 = @LOCAL_SUPPORT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @SML_SUPPORT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) vzlogger_DEPENDENCIES = $(top_srcdir)/src/libmeter.a \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_1) vzlogger_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vzlogger_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -180,12 +186,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -Wall -D_REENTRANT -std=gnu99 $(DEPS_VZ_CFLAGS) \ - $(am__append_3) $(am__append_5) + $(am__append_3) $(am__append_5) $(am__append_7) AM_CPPFLAGS = -I$(top_srcdir)/include -Iinclude vzlogger_SOURCES = src/vzlogger.c src/channel.c src/api.c \ src/configuration.c src/threads.c src/buffer.c $(am__append_1) vzlogger_LDADD = $(top_srcdir)/src/libmeter.a $(am__append_2) \ - $(am__append_4) + $(am__append_4) $(am__append_6) vzlogger_LDFLAGS = -lpthread -lm $(DEPS_VZ_LIBS) all: all-am diff --git a/config.h.in b/config.h.in index b1a3859..3f75aed 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* D0, aka DIN EN 62056-21 */ +#undef D0_SUPPORT + /* Debug Mode */ #undef DEBUG diff --git a/configure.ac b/configure.ac index 3feab4d..21ec6f5 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,19 @@ if test x"$sml" = x"yes"; then PKG_CHECK_MODULES([DEPS_SML], [sml >= 0.1]) fi +# D0 support +AC_ARG_ENABLE( + [d0], + [AS_HELP_STRING([--enable-d0], [enable support for smart messaging language (def=yes)])], + [d0=$enableval], + [d0=yes] +) + +AM_CONDITIONAL([D0_SUPPORT], [test x"$d0" = x"yes"]) +if test x"$d0" = x"yes"; then + AC_DEFINE([D0_SUPPORT], [], [D0, aka DIN EN 62056-21]) +fi + # local interface support AC_ARG_ENABLE( [local],