X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=d760f340af3c5c40b76658830f07419f9239c5db;hb=dfdbd757b3e51e2fb52df8c6144af26562d44e75;hp=401a9ae1f28cf999a5d74ebd1646da377220aa5d;hpb=861b077a91c1e9a57ea54bb62c75e524c2be96ed;p=catta

diff --git a/configure.ac b/configure.ac
index 401a9ae..d760f34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,15 +132,10 @@ fi
 if test x"$enable_ssp" = x"yes"; then
     # Do this the long way so we don't call GCC_STACK_PROTECT_LIB twice
     GCC_STACK_PROTECT_CC
-
-    AC_LANG_PUSH([C++])
-    GCC_STACK_PROTECT_CXX
-    AC_LANG_POP([C++])
-    # XXX: Update the enable_ssp value now for output later?
 fi
 
 # libtool stuff
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
 
 ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
 
@@ -259,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])
@@ -282,7 +283,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h sys/ioctl.h sys/socket.h sys/
 
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([gethostname select socket uname strcasecmp gettimeofday strncasecmp strlcpy])
+AC_CHECK_FUNCS([gethostname select socket uname strcasecmp gettimeofday strncasecmp strlcpy fcntl])
 
 AC_FUNC_CHOWN
 AC_FUNC_STAT