summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-11-11 11:41:07 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-11-11 11:41:07 +0100
commit60bb7401108b52fe7856eb5688bafb183322bc01 (patch)
tree0d74c7f18eef4fc4ad97888e8dc711696d268f65
parent828326fd750f96f1ab140cdc81d122341654b44c (diff)
#i10000# regenerated configure
Notes
split repo tag: bootstrap_ooo/DEV300_m93
-rwxr-xr-xconfigure20
1 files changed, 9 insertions, 11 deletions
diff --git a/configure b/configure
index abb52724df4a..b6cb2c24bfdb 100755
--- a/configure
+++ b/configure
@@ -13815,9 +13815,7 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
SYSTEM_CPPUNIT=YES
- # might work for earlier, too but go sure. We didn't have
- # a system-cppunit before the first version using a proper cppunit
- # (and that being 1.12.1) anyway
+ # might work for earlier, too but go sure:
succeeded=no
@@ -13872,23 +13870,23 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5
-echo $ECHO_N "checking for cppunit >= 1.12.1 ... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for cppunit >= 1.12.0 " >&5
+echo $ECHO_N "checking for cppunit >= 1.12.0 ... $ECHO_C" >&6
- if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then
+ if $PKG_CONFIG --exists "cppunit >= 1.12.0 " ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5
echo $ECHO_N "checking CPPUNIT_CFLAGS... $ECHO_C" >&6
- CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "`
+ CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0 "`
echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5
echo "${ECHO_T}$CPPUNIT_CFLAGS" >&6
echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5
echo $ECHO_N "checking CPPUNIT_LIBS... $ECHO_C" >&6
- CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "`
+ CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0 "`
echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5
echo "${ECHO_T}$CPPUNIT_LIBS" >&6
else
@@ -13896,7 +13894,7 @@ echo "${ECHO_T}$CPPUNIT_LIBS" >&6
CPPUNIT_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.1 "`
+ CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.0 "`
echo $CPPUNIT_PKG_ERRORS
fi
@@ -13911,8 +13909,8 @@ echo "${ECHO_T}$CPPUNIT_LIBS" >&6
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: 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." >&5
-echo "$as_me: 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." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (cppunit >= 1.12.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi