X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=c5314af0e042c63e3d4e698a9e8696b8a9fa74ec;hb=6ce8abeff8a93a7defcad963737eafc1fc7856c2;hp=01df09db9800f74b478db3247feec12b5f16448e;hpb=99e591849f99bee5b31b584c2c7acd6a7194c096;p=catta

diff --git a/configure.ac b/configure.ac
index 01df09d..c5314af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ fi
 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"
+    CPPFLAGS="$CPPFLAGS -I`pwd`/include/compat/windows"
 fi
 AC_CHECK_MEMBER([struct in_pktinfo.ipi_spec_dst],
     AC_DEFINE([HAVE_IPI_SPEC_DST], [], [struct in_pktinfo has ipi_spec_dst member]),
@@ -254,7 +254,13 @@ test_gcc_flag() {
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
 
-    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -fdiagnostics-show-option -Wno-cast-qual -fno-strict-aliasing"
+    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wold-style-definition -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wshadow -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -fdiagnostics-show-option -fno-strict-aliasing"
+
+    # when compiling for MingW, -Wmissing-noreturn is triggered a bunch of
+    # times from autogenerated libtool wrappers, so leave it out on Windows.
+    if test "x$ac_cv_have_decl__WIN32" != "xyes" ; then
+        DESIRED_FLAGS="$DESIRED_FLAGS -Wmissing-noreturn"
+    fi
 
     for flag in $DESIRED_FLAGS ; do
         AC_MSG_CHECKING([whether $CC accepts $flag])