Fixed MW and XLC tests when using -C (cache) option with configure.

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

diff --git a/acinclude.m4 b/acinclude.m4
index 28ce34da201b6a5b4dd2dfa9c9dbc36d9af2e5f7..ea80b748255740a86d7a7b824dc844671541d0d3 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -66,7 +66,7 @@ dnl Loosely based on autoconf AC_PROG_CC
 AC_DEFUN([AC_WX_PROG_XLCC],
 [AC_LANG_PUSH(C)
 _AC_WX_LANG_COMPILER_XLC
-XLCC=`test $wx_compiler_xlc = yes && echo yes`
+XLCC=`test $wx_cv_c_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C)
 ])
 
@@ -74,7 +74,7 @@ dnl Loosely based on autoconf AC_PROG_CXX
 AC_DEFUN([AC_WX_PROG_XLCXX],
 [AC_LANG_PUSH(C++)
 _AC_WX_LANG_COMPILER_XLC
-XLCXX=`test $wx_compiler_xlc = yes && echo yes`
+XLCXX=`test $wx_cv_cxx_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C++)
 ])
 

diff --git a/aclocal.m4 b/aclocal.m4
index ab4f1f49f357fe9cf98e2b1aabd4091b2f443e13..e0e1e62f50e5f38c4820445e6897dc119bd77d32 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -79,7 +79,7 @@ dnl Loosely based on autoconf AC_PROG_CC
 AC_DEFUN([AC_WX_PROG_XLCC],
 [AC_LANG_PUSH(C)
 _AC_WX_LANG_COMPILER_XLC
-XLCC=`test $wx_compiler_xlc = yes && echo yes`
+XLCC=`test $wx_cv_c_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C)
 ])
 
@@ -87,7 +87,7 @@ dnl Loosely based on autoconf AC_PROG_CXX
 AC_DEFUN([AC_WX_PROG_XLCXX],
 [AC_LANG_PUSH(C++)
 _AC_WX_LANG_COMPILER_XLC
-XLCXX=`test $wx_compiler_xlc = yes && echo yes`
+XLCXX=`test $wx_cv_cxx_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C++)
 ])
 
@@ -776,7 +776,7 @@ dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
 AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
 [AC_LANG_PUSH(C)
 _AC_BAKEFILE_LANG_COMPILER_MWERKS
-MWCC=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
 AC_LANG_POP(C)
 ])
 
@@ -785,7 +785,7 @@ dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
 AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
 [AC_LANG_PUSH(C++)
 _AC_BAKEFILE_LANG_COMPILER_MWERKS
-MWCXX=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
 AC_LANG_POP(C++)
 ])
 

diff --git a/configure b/configure
index 9320415c813301114e2d13b16b025b5f83febb69..bdcacaec56488c8532b8e1d7012cb4b49d0492a8 100755 (executable)
--- a/configure
+++ b/configure
@@ -11728,7 +11728,7 @@ fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6
 
-MWCC=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11800,7 +11800,7 @@ fi
 echo "$as_me:$LINENO: result: $wx_cv_c_compiler_xlc" >&5
 echo "${ECHO_T}$wx_cv_c_compiler_xlc" >&6
 
-XLCC=`test $wx_compiler_xlc = yes && echo yes`
+XLCC=`test $wx_cv_c_compiler_xlc = yes && echo yes`
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12667,7 +12667,7 @@ fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6
 
-MWCXX=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12739,7 +12739,7 @@ fi
 echo "$as_me:$LINENO: result: $wx_cv_cxx_compiler_xlc" >&5
 echo "${ECHO_T}$wx_cv_cxx_compiler_xlc" >&6
 
-XLCXX=`test $wx_compiler_xlc = yes && echo yes`
+XLCXX=`test $wx_cv_cxx_compiler_xlc = yes && echo yes`
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'