Module: wine Branch: master Commit: eae5829ed2e2ef39c134e6fe6e267f3ef9bd73e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae5829ed2e2ef39c134e6fe6e...
Author: Gerald Pfeifer gerald@pfeifer.com Date: Sat Jan 2 15:13:43 2010 +0100
configure: Sort WINE_TRY_CFLAGS entries alphabetically.
---
configure | 40 ++++++++++++++++++++-------------------- configure.ac | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/configure b/configure index cc9580e..68af9e1 100755 --- a/configure +++ b/configure @@ -11456,55 +11456,55 @@ $as_echo "$ac_cv_cflags__Wstrict_prototypes" >&6; } if test $ac_cv_cflags__Wstrict_prototypes = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wstrict-prototypes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 -$as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } -if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wtype-limits" >&5 +$as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; } +if test "${ac_cv_cflags__Wtype_limits+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wwrite-strings" +CFLAGS="$CFLAGS -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wwrite_strings=yes + ac_cv_cflags__Wtype_limits=yes else - ac_cv_cflags__Wwrite_strings=no + ac_cv_cflags__Wtype_limits=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wwrite_strings" >&5 -$as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } -if test $ac_cv_cflags__Wwrite_strings = yes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wtype_limits" >&5 +$as_echo "$ac_cv_cflags__Wtype_limits" >&6; } +if test $ac_cv_cflags__Wtype_limits = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wtype-limits" >&5 -$as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; } -if test "${ac_cv_cflags__Wtype_limits+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 +$as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } +if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wtype-limits" +CFLAGS="$CFLAGS -Wwrite-strings" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wtype_limits=yes + ac_cv_cflags__Wwrite_strings=yes else - ac_cv_cflags__Wtype_limits=no + ac_cv_cflags__Wwrite_strings=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wtype_limits" >&5 -$as_echo "$ac_cv_cflags__Wtype_limits" >&6; } -if test $ac_cv_cflags__Wtype_limits = yes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wwrite_strings" >&5 +$as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } +if test $ac_cv_cflags__Wwrite_strings = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi
saved_CFLAGS="$CFLAGS" diff --git a/configure.ac b/configure.ac index 2a9c83a..03a80d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1494,8 +1494,8 @@ then WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) - WINE_TRY_CFLAGS([-Wwrite-strings]) WINE_TRY_CFLAGS([-Wtype-limits]) + WINE_TRY_CFLAGS([-Wwrite-strings])
dnl Check for noisy string.h saved_CFLAGS="$CFLAGS"