Use CXXFLAGS rather than CFLAGS for -Werror when determining type of socket function...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index d68bb65db2f5e044a48c057476ab52708f71f6d2..07919ab2b609089778a8678bbcbe162cd1b6ae8c 100755 (executable)
--- a/configure
+++ b/configure
@@ -39635,9 +39635,9 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                                                                                                                                                        CFLAGS_OLD="$CFLAGS"
+                                                                                                                                                                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF
                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF


@@ -39742,7 +39742,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

 
 
 fi
 
 
 fi


@@ -39816,9 +39816,9 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                                                                                                                                                        CFLAGS_OLD="$CFLAGS"
+                                                                                                                                                                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF
                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF


@@ -39923,7 +39923,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

 
 
 fi
 
 
 fi

diff --git a/configure.in b/configure.in
index d2ba94165642dd1afb404e2fab5a137578b6a7a0..60b52e4fe0bacb2f833926b34ff43c59cb09e1d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5615,9 +5615,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                         dnl converting between incompatible pointer types, so
                         dnl try to use it to get the correct behaviour at
                         dnl least with gcc (otherwise we'd always use size_t)
                         dnl converting between incompatible pointer types, so
                         dnl try to use it to get the correct behaviour at
                         dnl least with gcc (otherwise we'd always use size_t)

-                        CFLAGS_OLD="$CFLAGS"
+                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         AC_TRY_COMPILE(
                         fi
 
                         AC_TRY_COMPILE(


@@ -5644,7 +5644,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                             )
                         )
 
                             )
                         )
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

                     ]
                 )
             ])
                     ]
                 )
             ])


@@ -5676,9 +5676,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                         dnl converting between incompatible pointer types, so
                         dnl try to use it to get the correct behaviour at
                         dnl least with gcc (otherwise we'd always use size_t)
                         dnl converting between incompatible pointer types, so
                         dnl try to use it to get the correct behaviour at
                         dnl least with gcc (otherwise we'd always use size_t)

-                        CFLAGS_OLD="$CFLAGS"
+                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         AC_TRY_COMPILE(
                         fi
 
                         AC_TRY_COMPILE(


@@ -5705,7 +5705,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                             )
                         )
 
                             )
                         )
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

                     ]
                 )
             ])
                     ]
                 )
             ])