From 65c11337559c3b95e86d38723c37ca6b10a2bd5b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 15 May 2007 00:33:14 +0000 Subject: [PATCH] use C++ compiler for va_copy test, at least under IRIX the C99 C compiler has it but C++ compiler doesn't have it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 14 +++++++++++++- configure.in | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2f12a7f30f..40b9e8ef72 100755 --- a/configure +++ b/configure @@ -22236,6 +22236,12 @@ if test "${wx_cv_func_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF #include @@ -22267,7 +22273,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -22282,6 +22288,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi diff --git a/configure.in b/configure.in index 20396b1c11..92343b8535 100644 --- a/configure.in +++ b/configure.in @@ -1937,6 +1937,7 @@ dnl checks needed to define wxVaCopy AC_CACHE_CHECK([for va_copy], wx_cv_func_va_copy, [ + AC_LANG_PUSH(C++) AC_LINK_IFELSE([ #include void foo(char *f, ...) @@ -1955,6 +1956,7 @@ AC_CACHE_CHECK([for va_copy], wx_cv_func_va_copy=yes, wx_cv_func_va_copy=no ) + AC_LANG_POP() ] ) -- 2.45.2