From 9f99b9bb3ce89207f74de7393e592b25bd923332 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Tue, 9 Mar 2010 13:27:16 +0100
Subject: odfmetadata4: #i108911#: configure.in: enable with-system-redland: 
 based on patch by cmc.  no patches are required for redland any more, so
 enable system redland.  minimum version is redland 1.0.8.

---
 configure | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index fcd3bddc2949..148e676d46db 100755
--- a/configure
+++ b/configure
@@ -1236,6 +1236,8 @@ Optional Packages:
 
   --with-system-lpsolve         Use lpsolve 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
@@ -2710,6 +2712,12 @@ if test "${with_system_lpsolve+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"
@@ -22196,7 +22204,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
@@ -22255,23 +22263,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
@@ -22279,7 +22287,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
 
@@ -22294,8 +22302,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
 
-- 
cgit v1.2.3