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:
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`
|
||||
|
19
configure
vendored
19
configure
vendored
@@ -18630,12 +18630,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
|
||||
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_IOSTREAMH 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
|
||||
|
||||
ac_ext=cc
|
||||
@@ -18811,7 +18805,6 @@ 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
|
||||
|
||||
|
||||
|
||||
@@ -21884,7 +21877,7 @@ fi
|
||||
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
|
||||
@@ -39842,6 +39835,7 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-precomp-headers or --disable-precomp-headers was given.
|
||||
if test "${enable_precomp_headers+set}" = set; then
|
||||
enableval="$enable_precomp_headers"
|
||||
@@ -41481,6 +41475,8 @@ echo $ECHO_N "checking for Cppunit - version >= $cppunit_version_min... $ECHO_C"
|
||||
no_cppunit=""
|
||||
if test "$CPPUNIT_CONFIG" = "no" ; then
|
||||
no_cppunit=yes
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
else
|
||||
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
|
||||
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
|
||||
@@ -41519,14 +41515,11 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if test "x$no_cppunit" = x ; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
SUBDIRS="$SUBDIRS tests"
|
||||
SUBDIRS="$SUBDIRS tests"
|
||||
else
|
||||
CPPUNIT_CFLAGS=""
|
||||
CPPUNIT_LIBS=""
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
:
|
||||
fi
|
||||
|
||||
|
||||
|
@@ -6212,9 +6212,7 @@ else dnl we build wxBase only
|
||||
SUBDIRS="samples utils"
|
||||
fi
|
||||
dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
|
||||
AM_PATH_CPPUNIT(1.8.0, [AC_MSG_RESULT([yes])
|
||||
SUBDIRS="$SUBDIRS tests"],
|
||||
[AC_MSG_RESULT([no])])
|
||||
AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"])
|
||||
|
||||
for subdir in `echo $SUBDIRS`; do
|
||||
if test -d ${srcdir}/${subdir} ; then
|
||||
|
Reference in New Issue
Block a user