Kaydet (Commit) 8fe75b63 authored tarafından Rene Engelhard's avatar Rene Engelhard

sb118: we need the same STL as cppunit, so we need --without-stlport. Add check... :(

üst 64ab1846
......@@ -12311,6 +12311,14 @@ $as_echo "$CPPUNIT_LIBS" >&6; }
as_fn_error "Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking STL compatibility" >&5
$as_echo_n "checking STL compatibility... " >&6; }
if test "$WITH_STLPORT" != "no"; then
as_fn_error "to use system cppunit you need to use --without-stlport" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
$as_echo "OK" >&6; }
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
$as_echo "internal" >&6; }
......
......@@ -3593,6 +3593,12 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
# a system-cppunit before the first version using a proper cppunit
# (and that being 1.12.1) anyway
PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
AC_MSG_CHECKING([STL compatibility])
if test "$WITH_STLPORT" != "no"; then
AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
else
AC_MSG_RESULT([OK])
fi
else
AC_MSG_RESULT([internal])
SYSTEM_CPPUNIT=NO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment