diff options
| author | Rene Engelhard <rene@openoffice.org> | 2010-03-04 10:44:35 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@openoffice.org> | 2010-03-04 10:44:35 +0100 |
| commit | 8fe75b63d75073a1711f7fd566be11037d2c72d0 (patch) | |
| tree | 1f3f5a0758d9da667143ce74d3f4eb18b37124b6 | |
| parent | 64ab18462d52103c8ac878af9f0f6502560baa88 (diff) | |
sb118: we need the same STL as cppunit, so we need --without-stlport. Add check... :(
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configure b/configure index fe289e08e43a..fee39c7e7845 100755 --- a/configure +++ b/configure @@ -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; } diff --git a/configure.in b/configure.in index 9afad7672a14..8d1015441097 100644 --- a/configure.in +++ b/configure.in @@ -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 |