From: Sven M. Hallberg <pesco@khjk.org>
Date: Fri, 29 Aug 2014 12:24:21 +0000 (+0200)
Subject: set the include flag for windows compat headers in configure
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=861b077a91c1e9a57ea54bb62c75e524c2be96ed;p=catta

set the include flag for windows compat headers in configure
---

diff --git a/configure.ac b/configure.ac
index 1be1466..401a9ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,13 @@ fi
 # Windows stuff
 AC_CHECK_DECL(_WIN32)
 AM_CONDITIONAL([WINDOWS], [ test "x$ac_cv_have_decl__WIN32" = "xyes" ])
+if test "x$ac_cv_have_decl__WIN32" = "xyes" ; then
+    CPPFLAGS="$CPPFLAGS -I`pwd`/src/compat/windows/include"
+fi
 AC_CHECK_MEMBER([struct in_pktinfo.ipi_spec_dst],
     AC_DEFINE([HAVE_IPI_SPEC_DST], [], [struct in_pktinfo has ipi_spec_dst member]),
     [],
-    [[#include <ws2tcpip.h>]])
+    [[#include <netinet/in.h>]])
 
 # -fstack-protector
 AC_ARG_ENABLE([stack-protector],
diff --git a/src/Makefile.am b/src/Makefile.am
index 68db4a1..5ce20e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,10 +17,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)/include
 
-if WINDOWS
-AM_CFLAGS += -Icompat/windows/include
-endif
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'