corrected cppunit test's output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e04b7e8e71
commit
c2218763d5
3 changed files with 11 additions and 24 deletions
12
aclocal.m4
vendored
12
aclocal.m4
vendored
|
|
@ -18,7 +18,6 @@ dnl Vadim Zeitlin and Ron Lee
|
|||
dnl
|
||||
dnl This script is under the wxWindows licence.
|
||||
dnl
|
||||
dnl Version: $Id$
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
dnl ===========================================================================
|
||||
|
|
@ -101,14 +100,11 @@ 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 <iostream> exists, the other "new" headers (without .h) exist too.
|
||||
dnl
|
||||
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
|
||||
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN([WX_CPP_NEW_HEADERS],
|
||||
[
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
|
|
@ -121,7 +117,6 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
|
|||
fi
|
||||
|
||||
AC_LANG_RESTORE
|
||||
fi
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
|
@ -638,7 +633,7 @@ dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [,
|
|||
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
|
||||
dnl pass to pkg-config
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_GTK_2_0,
|
||||
AC_DEFUN([AM_PATH_GTK_2_0],
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from pkg-config
|
||||
dnl
|
||||
|
|
@ -663,7 +658,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
|
|||
if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
||||
:
|
||||
else
|
||||
echo *** pkg-config too old; version 0.7 or better required.
|
||||
echo "*** pkg-config too old; version 0.7 or better required."
|
||||
no_gtk=yes
|
||||
PKG_CONFIG=no
|
||||
fi
|
||||
|
|
@ -2569,6 +2564,7 @@ AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix w
|
|||
no_cppunit=""
|
||||
if test "$CPPUNIT_CONFIG" = "no" ; then
|
||||
no_cppunit=yes
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
|
||||
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue