summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-11-23 09:53:31 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-11-23 09:53:31 +0100
commit98dd585c888f38631544743054ea3b2c30efd53b (patch)
tree3b4e8655e37f46092ccfc356eaf9534284e74d82
parent078b1e581aba73f740c8e0d2e6faab963540aaab (diff)
downloaddabmux-98dd585c888f38631544743054ea3b2c30efd53b.tar.gz
dabmux-98dd585c888f38631544743054ea3b2c30efd53b.tar.bz2
dabmux-98dd585c888f38631544743054ea3b2c30efd53b.zip
Do not pull in boost into odr-zmq2farsync
-rw-r--r--src/Makefile.am2
-rw-r--r--src/dabOutput/dabOutputRaw.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 48680ad..badc0b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,7 +121,7 @@ odr_zmq2farsync_SOURCES = zmq2farsync/zmq2farsync.cpp \
dabOutput/dabOutputRaw.cpp \
Log.h Log.cpp \
zmq.hpp
-odr_zmq2farsync_LDADD = $(ZMQ_LIBS) -lboost_system
+odr_zmq2farsync_LDADD = $(ZMQ_LIBS)
odr_zmq2farsync_CFLAGS = -Wall $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
odr_zmq2farsync_CXXFLAGS = -Wall -std=c++11 $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
diff --git a/src/dabOutput/dabOutputRaw.cpp b/src/dabOutput/dabOutputRaw.cpp
index 3bed6f1..4e57835 100644
--- a/src/dabOutput/dabOutputRaw.cpp
+++ b/src/dabOutput/dabOutputRaw.cpp
@@ -33,7 +33,6 @@
#include <cstdio>
#include <cstring>
-#include "utils.h"
#include "dabOutput.h"
#ifdef _WIN32
# include <fscfg.h>
@@ -43,6 +42,7 @@
# include <sys/types.h>
# include <sys/socket.h>
# include <sys/ioctl.h>
+/* Careful, including boost here can lead to errors because of conflicting struct definitions */
# include <linux/if_packet.h>
# include <linux/netdevice.h>
# include <net/if_arp.h>