[Powerguru-commit] [SCM] powerguru branch, master, updated. d8e1668698904a0701e432489d900f6d909810c8

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "powerguru".

The branch, master has been updated
       via  d8e1668698904a0701e432489d900f6d909810c8 (commit)
      from  cd8d3f0c599f1355d8f4828dd2c6de40377e2446 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=d8e1668698904a0701e432489d900f6d909810c8


commit d8e1668698904a0701e432489d900f6d909810c8
Author: Rob Savoye <address@hidden>
Date:   Wed Nov 21 21:02:03 2018 -0700

    Add flags for optional dependencies

diff --git a/sim/Makefile.am b/sim/Makefile.am
index 91e4fe0..3e43891 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -21,12 +21,26 @@ AUTOMAKE_OPTIONS =
 PGURU = ../lib/libpguru.la
 noinst_PROGRAMS = osim # xsim
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib  $(LIBXML_CPPFLAGS)
-
+osim_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/devices
 osim_SOURCES = fakeuart.cc fakeuart.h osim.cc
 osim_LDADD =  $(PGURU)  $(SNMP_LIBS) -lpthread
+
+if BUILD_LIBXML
+osim_CPPFLAGS += $(LIBXML_CPPFLAGS)
+osim_LDADD += $(LIBXML_LIBS)
+endif
+
 if BUILD_SNMP
-osim_LDADD += ../snmp/libpgsnmp.la
+osim_LDADD += ../snmp/libpgsnmp.la $(SNMP_LIBS)
+endif
+
+if BUILD_OWNET
+osim_LDADD += $(OWNET_LIBS)
+endif
+
+if BUILD_POSTGRESQL
+osim_CPPFLAGS += $(PQ_CPPFLAGS)
+osim_LDADD += $(PQ_LIBS)
 endif
 
 osim_DEPENDENCIES = $(PGURU)

-----------------------------------------------------------------------

Summary of changes:
 sim/Makefile.am | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
powerguru