[4088] Finished merge of trac4091 from master

diff --cc src/lib/eval/Makefile.am
index 59f9e77c22002313da1225faa5f91509bfccd40d,05c4902e08ddf306d7945b7b4624fcb3e7387cf3..0f204f181cf9d371844be430b477a1b7b195ee7e
--- 1/src/lib/eval/Makefile.am
--- 2/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@@ -12,12 -12,11 +12,15 @@@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIE
  
  lib_LTLIBRARIES = libkea-eval.la
  libkea_eval_la_SOURCES  =
+ libkea_eval_la_SOURCES += eval_log.cc eval_log.h
  libkea_eval_la_SOURCES += token.cc token.h
  
 +libkea_eval_la_SOURCES += parser.cc parser.h
 +libkea_eval_la_SOURCES += lexer.cc
 +libkea_eval_la_SOURCES += eval_context.cc
 +
+ nodist_libkea_eval_la_SOURCES = eval_messages.h eval_messages.cc
+ 
  libkea_eval_la_CXXFLAGS = $(AM_CXXFLAGS)
  libkea_eval_la_CPPFLAGS = $(AM_CPPFLAGS)
  libkea_eval_la_LIBADD   = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
@@@ -43,32 -47,4 +51,32 @@@ s-messages: eval_messages.me
  # first.
  BUILT_SOURCES = eval_messages.h eval_messages.cc
  
- CLEANFILES = eval_messages.h eval_messages.cc
+ CLEANFILES = eval_messages.h eval_messages.cc s-messages
 +
 +# If we want to get rid of all flex/bison generated files, we need to use
 +# make maintainer-clean. The proper way to introduce custom commands for
 +# that operation is to define maintainer-clean-local target. However,
 +# make maintainer-clean also removes Makefile, so running configure script
 +# is required. To make it easy to rebuild flex/bison without going through
 +# reconfigure, a new target parser-clean has been added.
 +maintainer-clean-local:
 +      rm -f location.hh lexer.cc parser.cc parser.h position.hh stack.hh
 +
 +# To regenerate flex/bison files, one can do:
 +#
 +# make parser-clean
 +# make parser
 +#
 +# This is needed only when the lexer.ll or parser.yy files are modified.
 +# Make sure you have both flex and bison installed.
 +parser-clean: maintainer-clean-local
 +
 +parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
 +      @echo "Flex/bison files regenerated"
 +
 +# --- Flex/Bison stuff below --------------------------------------------------
 +location.hh position.hh stack.hh parser.cc parser.h: parser.yy
 +      $(YACC) --defines=parser.h -o parser.cc parser.yy
 +
 +lexer.cc: lexer.ll
 +      $(LEX) -o lexer.cc lexer.ll

diff --cc src/lib/eval/tests/Makefile.am
index dbf6ce35ee53b137a6e03156654efea6911851cd,c9bd2bcd1342103ea5445de1d0dcc1cb37464516..1dc5b350d29be0dfa3689ee4fc969636e6e1727a
--- 1/src/lib/eval/tests/Makefile.am
--- 2/src/lib/eval/tests/Makefile.am
+++ b/src/lib/eval/tests/Makefile.am
@@@ -24,8 -26,7 +26,9 @@@ if HAVE_GTES
  
  TESTS += libeval_unittests
  
- libeval_unittests_SOURCES  = token_unittest.cc main.cc
- libeval_unittests_SOURCES += context_unittest.cc
 -libeval_unittests_SOURCES  = token_unittest.cc run_unittests.cc
++libeval_unittests_SOURCES  = context_unittest.cc
++libeval_unittests_SOURCES += token_unittest.cc
++libeval_unittests_SOURCES += run_unittests.cc
  libeval_unittests_CXXFLAGS = $(AM_CXXFLAGS)
  libeval_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  libeval_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)

diff --cc src/lib/eval/token.h
Simple merge