Paul Wouters 3055b2
--- /home/paul/BUILD/socat-1.7.1.1/configure.in	2009-05-06 14:09:03.000000000 -0400
Paul Wouters 3055b2
+++ configure.in	2009-05-09 09:29:03.000000000 -0400
Paul Wouters 3055b2
@@ -84,7 +84,7 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB
Paul Wouters 3055b2
 dnl Check for hstrerror prototype
Paul Wouters 3055b2
 AC_MSG_CHECKING(for hstrerror prototype)
Paul Wouters 3055b2
 AC_CACHE_VAL(sc_cv_have_prototype_hstrerror,
Paul Wouters 3055b2
-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1";
Paul Wouters 3055b2
+[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')";
Paul Wouters 3055b2
  AC_TRY_COMPILE([#include <netdb.h>],[hstrerror();],
Paul Wouters 3055b2
  [sc_cv_have_prototype_hstrerror=no],
Paul Wouters 3055b2
  [sc_cv_have_prototype_hstrerror=yes]);
Paul Wouters 3055b2
@@ -1296,7 +1296,7 @@ dnl   output values: 1..short, 2..unsign
Paul Wouters 3055b2
 dnl                  5..long, 6..u-long; others not yet supported
Paul Wouters 3055b2
 define(AC_BASIC_TYPE,[
Paul Wouters 3055b2
 AC_CACHE_CHECK(for equivalent simple type of $2, $4,
Paul Wouters 3055b2
-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1"
Paul Wouters 3055b2
+[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')"
Paul Wouters 3055b2
  AC_TRY_COMPILE([$1],[$2 u; short v; &u==&v;],
Paul Wouters 3055b2
  [$4="1 /* short */"],
Paul Wouters 3055b2
  [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u==&v;],
Paul Wouters 3055b2
@@ -1328,7 +1328,7 @@ dnl arg4: output variable, values see AC
Paul Wouters 3055b2
 dnl arg5: cache variable (might be constructed automatically)
Paul Wouters 3055b2
 define(AC_TYPEOF_COMPONENT,[
Paul Wouters 3055b2
 AC_CACHE_CHECK(for basic type of $2.$3, $5,
Paul Wouters 3055b2
-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1"
Paul Wouters 3055b2
+[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')"
Paul Wouters 3055b2
 AC_TRY_COMPILE([$1],[$2 u;short v; &u.$3==&v;],
Paul Wouters 3055b2
 [$5="1 /* short */"],
Paul Wouters 3055b2
 [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u.$3==&v;],