From 6459a506bbab0ae508fa9db68f431358682a1408 Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Sat, 24 Sep 2005 04:38:57 +0000 Subject: [PATCH] Use CXXFLAGS rather than CFLAGS for -Werror when determining type of socket function parameter (socklen_t vs. int) so that OS X 10.2 will correctly determine the parameter as an int; using -Werror forces the warnings thrown when attempting size_t to make configure fall back to int. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 12 ++++++------ configure.in | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index d68bb65db2..07919ab2b6 100755 --- a/configure +++ b/configure @@ -39635,9 +39635,9 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - CFLAGS_OLD="$CFLAGS" + CXXFLAGS_OLD="$CXXFLAGS" if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -Werror" + CXXFLAGS="$CXXFLAGS -Werror" 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 - CFLAGS="$CFLAGS_OLD" + CXXFLAGS="$CXXFLAGS_OLD" fi @@ -39816,9 +39816,9 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - CFLAGS_OLD="$CFLAGS" + CXXFLAGS_OLD="$CXXFLAGS" if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -Werror" + CXXFLAGS="$CXXFLAGS -Werror" 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 - CFLAGS="$CFLAGS_OLD" + CXXFLAGS="$CXXFLAGS_OLD" fi diff --git a/configure.in b/configure.in index d2ba941656..60b52e4fe0 100644 --- 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) - CFLAGS_OLD="$CFLAGS" + CXXFLAGS_OLD="$CXXFLAGS" if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -Werror" + CXXFLAGS="$CXXFLAGS -Werror" 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) - CFLAGS_OLD="$CFLAGS" + CXXFLAGS_OLD="$CXXFLAGS" if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -Werror" + CXXFLAGS="$CXXFLAGS -Werror" fi AC_TRY_COMPILE( @@ -5705,7 +5705,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then ) ) - CFLAGS="$CFLAGS_OLD" + CXXFLAGS="$CXXFLAGS_OLD" ] ) ])