diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index ba5815d1a5940660dff6b6ca18c38a700252521c..9d3db48a3f8cd57d9bc8d37cc0fa7dee7c9d56d9 100644
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -16,7 +16,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 46
+# serial 47
 
 
 dnl CARES_CHECK_COMPILER
@@ -908,11 +908,11 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
         #
         if test "$want_warnings" = "yes"; then
           dnl Issue all warnings
-          dnl tmp_CFLAGS="$tmp_CFLAGS +w1"
+          tmp_CFLAGS="$tmp_CFLAGS +w1"
           dnl Due to the HP-UX socklen_t issue it is insane to use the +w1
           dnl warning level. Until the issue is somehow fixed we will just
           dnl use the +w2 warning level.
-          tmp_CFLAGS="$tmp_CFLAGS +w2"
+          dnl tmp_CFLAGS="$tmp_CFLAGS +w2"
         fi
         ;;
         #
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index d832a6fd872d9fa803dab384deb182eb6425b550..ffd906dbee7964d4725674cc8c0422726a156cf3 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 46
+# serial 47
 
 
 dnl CURL_CHECK_COMPILER
@@ -914,11 +914,11 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
         #
         if test "$want_warnings" = "yes"; then
           dnl Issue all warnings
-          dnl tmp_CFLAGS="$tmp_CFLAGS +w1"
+          tmp_CFLAGS="$tmp_CFLAGS +w1"
           dnl Due to the HP-UX socklen_t issue it is insane to use the +w1
           dnl warning level. Until the issue is somehow fixed we will just
           dnl use the +w2 warning level.
-          tmp_CFLAGS="$tmp_CFLAGS +w2"
+          dnl tmp_CFLAGS="$tmp_CFLAGS +w2"
         fi
         ;;
         #