stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "added switches and comments for d0 protocol"

Browse source 
This reverts commit 0b4117ccd5.
This commit is contained in:
Justin Otherguy 2011-10-24 23:03:55 +02:00
parent 0b4117ccd5
commit 933e7507d5
4 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/logger/Makefile.am
View file

@ -20,10 +20,3 @@ if SML_SUPPORT
vzlogger_LDADD += $(DEPS_SML_LIBS) vzlogger_LDADD += $(DEPS_SML_LIBS)
AM_CFLAGS += $(DEPS_SML_CFLAGS) AM_CFLAGS += $(DEPS_SML_CFLAGS)
endif endif
# D0 support
####################################################################
if D0_SUPPORT
vzlogger_LDADD += $(DEPS_D0_LIBS)
AM_CFLAGS += $(DEPS_D0_CFLAGS)
endif

12
bin/logger/Makefile.in
View file

@ -44,11 +44,6 @@ bin_PROGRAMS = vzlogger$(EXEEXT)
#################################################################### ####################################################################
@SML_SUPPORT_TRUE@am__append_4 = $(DEPS_SML_LIBS) @SML_SUPPORT_TRUE@am__append_4 = $(DEPS_SML_LIBS)
@SML_SUPPORT_TRUE@am__append_5 = $(DEPS_SML_CFLAGS) @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 subdir = bin/logger
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -72,8 +67,7 @@ am__DEPENDENCIES_1 =
@LOCAL_SUPPORT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @LOCAL_SUPPORT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@SML_SUPPORT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) @SML_SUPPORT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
vzlogger_DEPENDENCIES = $(top_srcdir)/src/libmeter.a \ 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) \ vzlogger_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vzlogger_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@ -186,12 +180,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CFLAGS = -Wall -D_REENTRANT -std=gnu99 $(DEPS_VZ_CFLAGS) \ AM_CFLAGS = -Wall -D_REENTRANT -std=gnu99 $(DEPS_VZ_CFLAGS) \
$(am__append_3) $(am__append_5) $(am__append_7) $(am__append_3) $(am__append_5)
AM_CPPFLAGS = -I$(top_srcdir)/include -Iinclude AM_CPPFLAGS = -I$(top_srcdir)/include -Iinclude
vzlogger_SOURCES = src/vzlogger.c src/channel.c src/api.c \ vzlogger_SOURCES = src/vzlogger.c src/channel.c src/api.c \
src/configuration.c src/threads.c src/buffer.c $(am__append_1) src/configuration.c src/threads.c src/buffer.c $(am__append_1)
vzlogger_LDADD = $(top_srcdir)/src/libmeter.a $(am__append_2) \ vzlogger_LDADD = $(top_srcdir)/src/libmeter.a $(am__append_2) \
$(am__append_4) $(am__append_6) $(am__append_4)
vzlogger_LDFLAGS = -lpthread -lm $(DEPS_VZ_LIBS) vzlogger_LDFLAGS = -lpthread -lm $(DEPS_VZ_LIBS)
all: all-am all: all-am

3
config.h.in
View file

@ -1,8 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* D0, aka DIN EN 62056-21 */
#undef D0_SUPPORT
/* Debug Mode */ /* Debug Mode */
#undef DEBUG #undef DEBUG

13
configure.ac
View file

@ -56,19 +56,6 @@ if test x"$sml" = x"yes"; then
PKG_CHECK_MODULES([DEPS_SML], [sml >= 0.1]) PKG_CHECK_MODULES([DEPS_SML], [sml >= 0.1])
fi 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 # local interface support
AC_ARG_ENABLE( AC_ARG_ENABLE(
[local], [local],