Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-03-17 17:47:33 +00:00
parent 27b2dd53f6
commit 0e6fa1d908
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -66,7 +66,7 @@ dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_WX_PROG_XLCC], AC_DEFUN([AC_WX_PROG_XLCC],
[AC_LANG_PUSH(C) [AC_LANG_PUSH(C)
_AC_WX_LANG_COMPILER_XLC _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) AC_LANG_POP(C)
]) ])
@@ -74,7 +74,7 @@ dnl Loosely based on autoconf AC_PROG_CXX
AC_DEFUN([AC_WX_PROG_XLCXX], AC_DEFUN([AC_WX_PROG_XLCXX],
[AC_LANG_PUSH(C++) [AC_LANG_PUSH(C++)
_AC_WX_LANG_COMPILER_XLC _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++) AC_LANG_POP(C++)
]) ])

8
aclocal.m4 vendored
View File

@@ -79,7 +79,7 @@ dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_WX_PROG_XLCC], AC_DEFUN([AC_WX_PROG_XLCC],
[AC_LANG_PUSH(C) [AC_LANG_PUSH(C)
_AC_WX_LANG_COMPILER_XLC _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) AC_LANG_POP(C)
]) ])
@@ -87,7 +87,7 @@ dnl Loosely based on autoconf AC_PROG_CXX
AC_DEFUN([AC_WX_PROG_XLCXX], AC_DEFUN([AC_WX_PROG_XLCXX],
[AC_LANG_PUSH(C++) [AC_LANG_PUSH(C++)
_AC_WX_LANG_COMPILER_XLC _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++) 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_DEFUN([AC_BAKEFILE_PROG_MWCC],
[AC_LANG_PUSH(C) [AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_MWERKS _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) 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_DEFUN([AC_BAKEFILE_PROG_MWCXX],
[AC_LANG_PUSH(C++) [AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_MWERKS _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++) AC_LANG_POP(C++)
]) ])

8
configure vendored
View File

@@ -11728,7 +11728,7 @@ fi
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6 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_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 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 "$as_me:$LINENO: result: $wx_cv_c_compiler_xlc" >&5
echo "${ECHO_T}$wx_cv_c_compiler_xlc" >&6 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_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 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 "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6 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_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 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 "$as_me:$LINENO: result: $wx_cv_cxx_compiler_xlc" >&5
echo "${ECHO_T}$wx_cv_cxx_compiler_xlc" >&6 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_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'