|
 |
7ca8afc |
diff -up gvfs-0.1.8/configure.ac.libxml gvfs-0.1.8/configure.ac
|
|
|
7ca8afc |
--- gvfs-0.1.8/configure.ac.libxml 2008-02-26 14:18:48.000000000 +0100
|
|
|
7ca8afc |
+++ gvfs-0.1.8/configure.ac 2008-02-26 14:19:03.000000000 +0100
|
|
|
7ca8afc |
@@ -120,7 +120,7 @@ if test "x$enable_http" != "xno"; then
|
|
|
7ca8afc |
PKG_CHECK_EXISTS(libsoup-2.4 >= 2.3.0, msg_http=yes)
|
|
|
7ca8afc |
|
|
|
7ca8afc |
if test "x$msg_http" == "xyes"; then
|
|
|
7ca8afc |
- PKG_CHECK_MODULES(HTTP, libsoup-2.4)
|
|
|
7ca8afc |
+ PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0)
|
|
|
7ca8afc |
AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built])
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
diff -up gvfs-0.1.8/configure.libxml gvfs-0.1.8/configure
|
|
|
7ca8afc |
--- gvfs-0.1.8/configure.libxml 2008-02-26 14:18:53.000000000 +0100
|
|
|
7ca8afc |
+++ gvfs-0.1.8/configure 2008-02-26 14:20:41.000000000 +0100
|
|
|
7ca8afc |
@@ -24600,12 +24600,12 @@ if test -n "$PKG_CONFIG"; then
|
|
|
7ca8afc |
pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS"
|
|
|
7ca8afc |
else
|
|
|
7ca8afc |
if test -n "$PKG_CONFIG" && \
|
|
|
7ca8afc |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
|
|
|
7ca8afc |
- ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
|
|
|
7ca8afc |
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5
|
|
|
7ca8afc |
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5
|
|
|
7ca8afc |
ac_status=$?
|
|
|
7ca8afc |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7ca8afc |
(exit $ac_status); }; then
|
|
|
7ca8afc |
- pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
|
|
|
7ca8afc |
+ pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 libxml-2.0" 2>/dev/null`
|
|
|
7ca8afc |
else
|
|
|
7ca8afc |
pkg_failed=yes
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
@@ -24618,12 +24618,12 @@ if test -n "$PKG_CONFIG"; then
|
|
|
7ca8afc |
pkg_cv_HTTP_LIBS="$HTTP_LIBS"
|
|
|
7ca8afc |
else
|
|
|
7ca8afc |
if test -n "$PKG_CONFIG" && \
|
|
|
7ca8afc |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
|
|
|
7ca8afc |
- ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
|
|
|
7ca8afc |
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5
|
|
|
7ca8afc |
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5
|
|
|
7ca8afc |
ac_status=$?
|
|
|
7ca8afc |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7ca8afc |
(exit $ac_status); }; then
|
|
|
7ca8afc |
- pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
|
|
|
7ca8afc |
+ pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 libxml-2.0" 2>/dev/null`
|
|
|
7ca8afc |
else
|
|
|
7ca8afc |
pkg_failed=yes
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
@@ -24642,14 +24642,14 @@ else
|
|
|
7ca8afc |
_pkg_short_errors_supported=no
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
if test $_pkg_short_errors_supported = yes; then
|
|
|
7ca8afc |
- HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
|
|
|
7ca8afc |
+ HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 libxml-2.0"`
|
|
|
7ca8afc |
else
|
|
|
7ca8afc |
- HTTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
|
|
|
7ca8afc |
+ HTTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 libxml-2.0"`
|
|
|
7ca8afc |
fi
|
|
|
7ca8afc |
# Put the nasty error message in config.log where it belongs
|
|
|
7ca8afc |
echo "$HTTP_PKG_ERRORS" >&5
|
|
|
7ca8afc |
|
|
|
7ca8afc |
- { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4) were not met:
|
|
|
7ca8afc |
+ { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 libxml-2.0) were not met:
|
|
|
7ca8afc |
|
|
|
7ca8afc |
$HTTP_PKG_ERRORS
|
|
|
7ca8afc |
|
|
|
7ca8afc |
@@ -24660,7 +24660,7 @@ Alternatively, you may set the environme
|
|
|
7ca8afc |
and HTTP_LIBS to avoid the need to call pkg-config.
|
|
|
7ca8afc |
See the pkg-config man page for more details.
|
|
|
7ca8afc |
" >&5
|
|
|
7ca8afc |
-echo "$as_me: error: Package requirements (libsoup-2.4) were not met:
|
|
|
7ca8afc |
+echo "$as_me: error: Package requirements (libsoup-2.4 libxml-2.0) were not met:
|
|
|
7ca8afc |
|
|
|
7ca8afc |
$HTTP_PKG_ERRORS
|
|
|
7ca8afc |
|