git - Merge pull request #160 from xambroz/glib

fix the compile time problem with GLIB libraries
DinoTools · Mar 26, 2018 · 1748f3b · 1748f3b
2 parents ea5d540 + ffa8e4f
commit 1748f3b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/modules/curl/Makefile.am b/modules/curl/Makefile.am
@@ -5,9 +5,12 @@ AUTOMAKE_OPTIONS = foreign
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS += -fno-strict-aliasing
 
-AM_CFLAGS += $(LIB_CURL_CFLAGS) 
+AM_CFLAGS += $(LIB_CURL_CFLAGS)
 AM_LDFLAGS = $(LIB_CURL_LIBS)
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
+
 pkglib_LTLIBRARIES = curl.la
 
 curl_la_SOURCES = module.c module.h

diff --git a/modules/emu/Makefile.am b/modules/emu/Makefile.am
@@ -8,9 +8,13 @@ AM_CFLAGS += -fms-extensions -fno-strict-aliasing
 AM_CFLAGS += $(LIB_EMU_CFLAGS)
 AM_LDFLAGS = $(LIB_EMU_LIBS)
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
+
+
 
 pkglib_LTLIBRARIES = emu.la
 
 emu_la_SOURCES = module.c module.h detect.c emulate.c profile.c hooks.c
 
-emu_la_LDFLAGS = -module -no-undefined -avoid-version ${AM_LDFLAGS} 
+emu_la_LDFLAGS = -module -no-undefined -avoid-version ${AM_LDFLAGS}
diff --git a/modules/nc/Makefile.am b/modules/nc/Makefile.am
@@ -7,6 +7,10 @@ AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS += 
 AM_LDFLAGS = 
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
+
+
 
 pkglib_LTLIBRARIES = nc.la
 

diff --git a/modules/nfq/Makefile.am b/modules/nfq/Makefile.am
@@ -5,8 +5,8 @@ AUTOMAKE_OPTIONS = foreign
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -pipe -D _GNU_SOURCE -fno-strict-aliasing
 AM_CFLAGS += -Wall -Werror
 
-AM_CFLAGS += ${LIB_GLIB_CFLAGS} 
-AM_LDFLAGS = ${LIB_GLIB_LIBS} 
+AM_CFLAGS += ${LIB_GLIB_CFLAGS}
+AM_LDFLAGS = ${LIB_GLIB_LIBS}
 
 
 pkglib_LTLIBRARIES = nfq.la

diff --git a/modules/nl/Makefile.am b/modules/nl/Makefile.am
@@ -10,6 +10,8 @@ AM_CFLAGS += $(LIB_NL_CFLAGS)
 #AM_LDFLAGS = -Wl,-rpath,/opt/dionaea/lib -L/opt/dionaea/lib -lnl -lnl-route -lnl-genl -lnl-nf
 AM_LDFLAGS = $(LIB_NL_LIBS)
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
 
 pkglib_LTLIBRARIES = nl.la
 

diff --git a/modules/pcap/Makefile.am b/modules/pcap/Makefile.am
@@ -8,6 +8,9 @@ AM_CFLAGS += -fno-strict-aliasing
 AM_CFLAGS += $(LIB_PCAP_CFLAGS)
 AM_LDFLAGS = $(LIB_PCAP_LIBS)
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
+
 pkglib_LTLIBRARIES = pcap.la
 
 pcap_la_SOURCES = pcap.c

diff --git a/modules/xmatch/Makefile.am b/modules/xmatch/Makefile.am
@@ -8,6 +8,9 @@ AM_CFLAGS += -fno-strict-aliasing
 AM_CFLAGS += $(LIB_XMATCH_CFLAGS)
 AM_LDFLAGS = $(LIB_XMATCH_LIBS)
 
+AM_CFLAGS += $(LIB_GLIB_CFLAGS)
+AM_LDFLAGS += $(LIB_GLIB_LDFLAGS)
+
 pkglib_LTLIBRARIES = xmatch.la
 
 xmatch_la_SOURCES = module.c xmatch.c