diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-02-27 15:06:41 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-02-27 15:06:41 +0000 |
| commit | 374082f8237276cc901e7f5393fc174a52c6dc31 (patch) | |
| tree | cfd698c29e363a17dc9b91f2a5f94307d5252865 /configure.ac | |
| parent | aef24654f86f1d50d11594393c83d9eeddbd4ee1 (diff) | |
| download | gvfs-374082f8237276cc901e7f5393fc174a52c6dc31.tar.gz | |
add test for obex URIs Require expat for the obexftp backend
2008-02-27 Bastien Nocera <hadess@hadess.net>
* client/test-uri-utils.c: add test for obex URIs
* configure.ac: Require expat for the obexftp backend
* daemon/Makefile.am:
* daemon/gvfsbackendobexftp-cap-parser.c:
* daemon/gvfsbackendobexftp-cap-parser.h:
* daemon/gvfsbackendobexftp-fl-parser.c:
* daemon/gvfsbackendobexftp-fl-parser.h:
Added ObexFTP folder listing and capability parser from
gnome-vfs-obexftp, ported to gio
* daemon/gvfsbackendobexftp.c:
* daemon/gvfsbackendobexftp.h:
* daemon/obexftp-marshal.list:
* daemon/obexftp.mount.in: Add read-only ObexFTP backend
(Closes: #509621)
svn path=/trunk/; revision=1406
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d528f8ac..8e74ea1f 100644 --- a/configure.ac +++ b/configure.ac @@ -240,6 +240,41 @@ AC_SUBST(HAL_CFLAGS) AM_CONDITIONAL(USE_HAL, [test "$msg_hal" = "yes"]) +dnl ***************************************************** +dnl *** Check if we should build with obexftp backend *** +dnl ***************************************************** +AC_ARG_ENABLE(obexftp, [ --disable-obexftp build without ObexFTP backend]) +msg_obexftp=no +OBEXFTP_LIBS= +OBEXFTP_CFLAGS= + +if test "x$enable_obexftp" != "xno"; then + PKG_CHECK_EXISTS(dbus-glib-1 bluez >= 3.12, msg_obexftp=yes) + + dnl Make sure we have expat + AC_CHECK_LIB(expat, XML_ParserCreate_MM, + [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], + have_expat=false) + + if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then + PKG_CHECK_MODULES(OBEXFTP, dbus-glib-1 bluez >= 3.12) + AC_SUBST(OBEXFTP_LIBS) + AC_SUBST(OBEXFTP_CFLAGS) + + msg_obexftp=yes + AC_DEFINE(HAVE_OBEXFTP, 1, [Define to 1 if ObexFTP is going to be built]) + XML_CFLAGS="" + XML_LIBS="-lexpat" + else + msg_obexftp=no + fi +fi + +AC_SUBST(XML_LIBS) +AC_SUBST(XML_CFLAGS) + +AM_CONDITIONAL(USE_OBEXFTP, [test "$msg_obexftp" = "yes"]) + dnl ************************* dnl *** Check for gphoto2 *** dnl ************************* @@ -438,6 +473,7 @@ echo echo "gvfs configuration summary:" echo " HTTP/WebDAV support $msg_http + ObexFTP support $msg_obexftp Samba support: $msg_samba FUSE support: $msg_fuse CDDA support: $msg_cdda |