Module: wine Branch: master Commit: 0f37b55211ec0b44e2ee03b313d62cd7dc675db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f37b55211ec0b44e2ee03b313...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 17 12:55:58 2008 +0100
configure: Get rid of the va_copy checks.
---
configure | 129 --------------------------------------------------- configure.ac | 18 ------- include/config.h.in | 6 -- 3 files changed, 0 insertions(+), 153 deletions(-)
diff --git a/configure b/configure index 20d0182..475bc08 100755 --- a/configure +++ b/configure @@ -14990,135 +14990,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for va_copy" >&5 -$as_echo_n "checking for va_copy... " >&6; } -if test "${ac_cv_c_va_copy+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -int -main () -{ -va_list ap1, ap2; va_copy(ap1,ap2); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_c_va_copy="yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_va_copy="no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5 -$as_echo "$ac_cv_c_va_copy" >&6; } -if test "$ac_cv_c_va_copy" = "yes" -then - -cat >>confdefs.h <<_ACEOF -#define HAVE_VA_COPY 1 -_ACEOF - -fi -{ $as_echo "$as_me:$LINENO: checking for __va_copy" >&5 -$as_echo_n "checking for __va_copy... " >&6; } -if test "${ac_cv_c___va_copy+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -int -main () -{ -va_list ap1, ap2; __va_copy(ap1,ap2); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_c___va_copy="yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c___va_copy="no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5 -$as_echo "$ac_cv_c___va_copy" >&6; } -if test "$ac_cv_c___va_copy" = "yes" -then - -cat >>confdefs.h <<_ACEOF -#define HAVE___VA_COPY 1 -_ACEOF - -fi - { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 $as_echo_n "checking for pthread_rwlock_t... " >&6; } if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then diff --git a/configure.ac b/configure.ac index b74fb19..4a0048e 100644 --- a/configure.ac +++ b/configure.ac @@ -1075,24 +1075,6 @@ then AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi
-dnl **** Check for va_copy **** -AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[va_list ap1, ap2; va_copy(ap1,ap2);]])], - [ac_cv_c_va_copy="yes"],[ac_cv_c_va_copy="no"]) - ) -if test "$ac_cv_c_va_copy" = "yes" -then - AC_DEFINE(HAVE_VA_COPY, 1, [Define if we have va_copy]) -fi -AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[va_list ap1, ap2; __va_copy(ap1,ap2);]])], - [ac_cv_c___va_copy="yes"],[ac_cv_c___va_copy="no"]) - ) -if test "$ac_cv_c___va_copy" = "yes" -then - AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) -fi - dnl **** Check for pthread_rwlock_t **** AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE #include <pthread.h>]) diff --git a/include/config.h.in b/include/config.h.in index c45765e..330564e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -942,9 +942,6 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #undef HAVE_VALGRIND_VALGRIND_H
-/* Define if we have va_copy */ -#undef HAVE_VA_COPY - /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF
@@ -1038,9 +1035,6 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF
-/* Define if we have __va_copy */ -#undef HAVE___VA_COPY - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT