Tomas Heinrich 433b99f
diff -ur a/runtime/Makefile.am b/runtime/Makefile.am
Tomas Heinrich 433b99f
--- a/runtime/Makefile.am	2014-01-20 13:00:47.922000000 -0500
Tomas Heinrich 433b99f
+++ b/runtime/Makefile.am	2014-01-20 12:57:44.048000000 -0500
Tomas Heinrich 433b99f
@@ -102,8 +102,8 @@
Tomas Heinrich 433b99f
 librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
Tomas Heinrich 433b99f
 endif
Tomas Heinrich 433b99f
 #librsyslog_la_LDFLAGS = -module -avoid-version
Tomas Heinrich 433b99f
-librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
-librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
Tomas Heinrich 433b99f
+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
Tomas Heinrich 433b99f
 
Tomas Heinrich 433b99f
 #
Tomas Heinrich 433b99f
 # regular expression support
Tomas Heinrich 433b99f
diff -ur a/runtime/Makefile.in b/runtime/Makefile.in
Tomas Heinrich 433b99f
--- a/runtime/Makefile.in	2014-01-20 13:00:47.924000000 -0500
Tomas Heinrich 433b99f
+++ b/runtime/Makefile.in	2014-01-20 12:57:44.050000000 -0500
Tomas Heinrich 433b99f
@@ -574,19 +574,17 @@
Tomas Heinrich 433b99f
 @WITH_MODDIRS_FALSE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
Tomas Heinrich 433b99f
 @WITH_MODDIRS_FALSE@	-D_PATH_MODDIR=\"$(pkglibdir)/\" \
Tomas Heinrich 433b99f
 @WITH_MODDIRS_FALSE@	-I\$(top_srcdir) -I\$(top_srcdir)/grammar \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_FALSE@	$(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_FALSE@	$(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_FALSE@	-I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
+@WITH_MODDIRS_FALSE@	$(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
Tomas Heinrich 433b99f
+@WITH_MODDIRS_FALSE@	$(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
 # the files with ../ we need to work on - so that they either become part of the
Tomas Heinrich 433b99f
 # runtime or will no longer be needed. -- rgerhards, 2008-06-13
Tomas Heinrich 433b99f
 #
Tomas Heinrich 433b99f
 #librsyslog_la_LDFLAGS = -module -avoid-version
Tomas Heinrich 433b99f
 @WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
Tomas Heinrich 433b99f
 @WITH_MODDIRS_TRUE@	-D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_TRUE@	$(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_TRUE@	$(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
Tomas Heinrich 433b99f
-@WITH_MODDIRS_TRUE@	-I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
Tomas Heinrich 433b99f
+@WITH_MODDIRS_TRUE@	$(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
Tomas Heinrich 433b99f
+@WITH_MODDIRS_TRUE@	$(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
Tomas Heinrich 433b99f
+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
Tomas Heinrich 433b99f
 @ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h
Tomas Heinrich 433b99f
 @ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
Tomas Heinrich 433b99f
 @ENABLE_REGEXP_TRUE@lmregexp_la_LDFLAGS = -module -avoid-version