Changes that were in aclocal.m4 but not here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8afef13331
commit
fe947a6116
@ -88,11 +88,14 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
|
|||||||
dnl or only the old <iostream.h> one - it may be generally assumed that if
|
dnl or only the old <iostream.h> one - it may be generally assumed that if
|
||||||
dnl <iostream> exists, the other "new" headers (without .h) exist too.
|
dnl <iostream> exists, the other "new" headers (without .h) exist too.
|
||||||
dnl
|
dnl
|
||||||
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
|
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
AC_DEFUN([WX_CPP_NEW_HEADERS],
|
AC_DEFUN([WX_CPP_NEW_HEADERS],
|
||||||
[
|
[
|
||||||
|
if test "$cross_compiling" = "yes"; then
|
||||||
|
ifelse([$2], , :, [$2])
|
||||||
|
else
|
||||||
AC_LANG_SAVE
|
AC_LANG_SAVE
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
|
|
||||||
@ -105,6 +108,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user