[gvfs] afp: make the afp backends optional

[Christian Kellner <gicmo src gnome org>]

commit c5ecea345cda45f670d89e0f2627afa199fadb30
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Thu Aug 25 20:43:51 2011 +0200

    afp: make the afp backends optional

 configure.ac       |   16 ++++++++++++++++
 daemon/Makefile.am |   12 +++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9951ab0..c79e4e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,6 +569,21 @@ fi
 AC_SUBST([LIBGCRYPT_CFLAGS])
 AC_SUBST([LIBGCRYPT_LIBS])
 
+dnl *******************
+dnl *** AFP backend ***
+dnl *******************
+AC_ARG_ENABLE(afp, AS_HELP_STRING([--disable-afp], [build without AFP support]))
+msg_afp="no"
+if test "x$enable_afp" != "xno"; then
+
+  if test "x$have_gcrypt" = "xyes"; then
+    msg_afp="yes"
+  else
+    msg_afp="partial (crypt support missing! Only anonymous logins)"
+  fi
+fi
+AM_CONDITIONAL(USE_AFP, test "x$enable_afp" != "xno")
+
 dnl Install bash-completion file?
 AC_ARG_ENABLE([bash-completion],
 	      AC_HELP_STRING([--disable-bash-completion],
@@ -738,6 +753,7 @@ echo "
         Gphoto2 support:              $msg_gphoto2
 	archive support:              $msg_archive
 	AFC support:                  $msg_afc
+        AFP support:                  $msg_afp
         DNS-SD support:               $msg_avahi
 	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
 	Build GDU volume monitor:     $msg_gdu
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 67e1d54..6ca840b 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -40,10 +40,10 @@ service_DATA = gvfs-daemon.service
 %.mount: %.mount.in ../config.log
 	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-afp-browse gvfsd-afp
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
 
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in afp-browse.mount.in afp.mount.in
-mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount afp-browse.mount afp.mount
+mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
+mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
 
 mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in 
 if HAVE_HTTP
@@ -108,6 +108,12 @@ mount_DATA += afc.mount
 libexec_PROGRAMS += gvfsd-afc
 endif
 
+mount_in_files += afp-browse.mount.in afp.mount.in
+if USE_AFP
+mount_DATA += afp-browse.mount afp.mount
+libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp
+endif
+
 EXTRA_DIST = 				\
 	gvfs-daemon.service.in		\
 	$(mount_in_files)		\