summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-05-10 15:44:41 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-05-10 15:44:41 +0200
commit9d5193baac437479232973205e9e0d8f5ad7a8e7 (patch)
treeb51e504b9f458283b11b16194c107cd77ff44037 /configure
parent548b2141d8a12f51e1a427e0d67db6fa95954276 (diff)
parenta05f8e28905b1c5ce6a2de468e83c9472c184328 (diff)
CWS-TOOLING: integrate CWS odfmetadata4
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 17 insertions, 9 deletions
diff --git a/configure b/configure
index 470f3284c0d1..03db67238bc4 100755
--- a/configure
+++ b/configure
@@ -1239,6 +1239,8 @@ Optional Packages:
--with-system-cppunit Use cppunit already on system
+ --with-system-redland Use redland library already on system
+
--with-system-mozilla Use mozilla already on system. Note that some
components cannot be built against a contemporary
mozilla. The flavour used can be specified by
@@ -2725,6 +2727,12 @@ if test "${with_system_cppunit+set}" = set; then
fi;
+# Check whether --with-system-redland or --without-system-redland was given.
+if test "${with_system_redland+set}" = set; then
+ withval="$with_system_redland"
+
+fi;
+
# Check whether --with-system-mozilla or --without-system-mozilla was given.
if test "${with_system_mozilla+set}" = set; then
withval="$with_system_mozilla"
@@ -22507,7 +22515,7 @@ fi
echo "$as_me:$LINENO: checking which redland library to use" >&5
echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6
-if test -n "$with_system_redland" && \
+if test -n "$with_system_redland" -o -n "$with_system_libs" && \
test "$with_system_redland" != "no"; then
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
@@ -22566,23 +22574,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 redland" >&5
-echo $ECHO_N "checking for redland... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for redland >= 1.0.8" >&5
+echo $ECHO_N "checking for redland >= 1.0.8... $ECHO_C" >&6
- if $PKG_CONFIG --exists "redland" ; then
+ if $PKG_CONFIG --exists "redland >= 1.0.8" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6
- REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"`
+ REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.8"`
echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
echo "${ECHO_T}$REDLAND_CFLAGS" >&6
echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6
- REDLAND_LIBS=`$PKG_CONFIG --libs "redland"`
+ REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.8"`
echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
echo "${ECHO_T}$REDLAND_LIBS" >&6
else
@@ -22590,7 +22598,7 @@ echo "${ECHO_T}$REDLAND_LIBS" >&6
REDLAND_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- REDLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "redland"`
+ REDLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "redland >= 1.0.8"`
echo $REDLAND_PKG_ERRORS
fi
@@ -22605,8 +22613,8 @@ echo "${ECHO_T}$REDLAND_LIBS" >&6
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Library requirements (redland) 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 (redland) 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 (redland >= 1.0.8) 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 (redland >= 1.0.8) 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