From 95251a78e88f2fb44cc711b10d1243fe6671e470 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 16 Feb 2009 12:46:58 +0100
Subject: [PATCH] configure: Try to avoid warnings in checks to support
 configuring with -Werror.

---
 configure    | 5 ++++-
 configure.ac | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 91e19c817a6..0e2e26665d4 100755
--- a/configure
+++ b/configure
@@ -17203,7 +17203,7 @@ static int Array[3];
   for(i=0; i<B; i++) Array[i] = i - 3;
   for(i=0; i<4 - 1; i++) L[i] = L[i + 1];
   L[i] = 4;
-  exit( Array[1] != -2 || L[2] != 3)
+  return (Array[1] != -2 || L[2] != 3)
   ;
   return 0;
 }
@@ -17916,6 +17916,8 @@ MAIN_BINARY="wine-pthread"
 esac
 
 
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $BUILTINFLAG"
 
 
 
@@ -18163,6 +18165,7 @@ _ACEOF
 fi
 done
 
+CFLAGS="$ac_save_CFLAGS"
 
 if test "$ac_cv_func_dlopen" = no
 then
diff --git a/configure.ac b/configure.ac
index 57ec39d6380..3dfada3ff6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1316,7 +1316,7 @@ then
   for(i=0; i<B; i++) Array[[i]] = i - 3;
   for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
   L[[i]] = 4;
-  exit( Array[[1]] != -2 || L[[2]] != 3)]])],
+  return (Array[[1]] != -2 || L[[2]] != 3)]])],
     [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
   if test "$ac_cv_c_gcc_strength_bug" = "yes"
   then
@@ -1426,6 +1426,8 @@ esac
 
 dnl **** Check for functions ****
 
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $BUILTINFLAG"
 AC_CHECK_FUNCS(\
 	_pclose \
 	_popen \
@@ -1501,6 +1503,7 @@ AC_CHECK_FUNCS(\
 	wait4 \
 	waitpid \
 )
+CFLAGS="$ac_save_CFLAGS"
 
 dnl Check for -ldl
 if test "$ac_cv_func_dlopen" = no