build: Reorder meson options and update description

meson_options.txt is hard to read. Let's create sorted groups of options
and unify the description. Also change some option names to match
correspoding backend names.

https://bugzilla.gnome.org/show_bug.cgi?id=786149

5 files changed, 39 insertions, 36 deletions

diff --git a/common/meson.build b/common/meson.build
index 5318d7a6..226d98b3 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -58,7 +58,7 @@ libgvfscommon_monitor_dep = declare_dependency(
   include_directories: common_inc
 )
 
-if enable_avahi
+if enable_dnssd
   sources = files(
     'gvfsdnssdresolver.c',
     'gvfsdnssdutils.c'
@@ -84,7 +84,7 @@ if enable_avahi
   )
 endif
 
-if enable_libmtp or enable_gphoto2
+if enable_mtp or enable_gphoto2
   libgvfscommon_gphoto2 = static_library(
     'gvfscommon-gphoto2',
     sources: 'gvfsgphoto2utils.c',
diff --git a/daemon/meson.build b/daemon/meson.build
index 268ad574..d483a0af 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -288,7 +288,7 @@ if enable_samba
   mounts += ['smb-browse']
 endif
 
-if enable_avahi
+if enable_dnssd
   sources = files('gvfsbackenddnssd.c')
 
   deps = [
@@ -425,7 +425,7 @@ if enable_gphoto2
   mounts += ['gphoto2']
 endif
 
-if enable_libmtp
+if enable_mtp
   sources = files('gvfsbackendmtp.c')
 
   deps = [
@@ -479,7 +479,7 @@ if enable_http
     '-DMAX_JOB_THREADS=1'
   ]
 
-  if enable_avahi
+  if enable_dnssd
     deps += libgvfscommon_dnssd_dep
 
     cflags += '-DBACKEND_TYPES="dav", G_VFS_TYPE_BACKEND_DAV, "dav+sd", G_VFS_TYPE_BACKEND_DAV, "davs+sd", G_VFS_TYPE_BACKEND_DAV,'
diff --git a/meson.build b/meson.build
index dfaff361..3f6d22d7 100644
--- a/meson.build
+++ b/meson.build
@@ -329,12 +329,12 @@ if enable_http
 endif
 
 # *** Check if we should build with DNS-SD backend ***
-enable_avahi = get_option('enable-avahi')
-if enable_avahi
+enable_dnssd = get_option('enable-dnssd')
+if enable_dnssd
   avahi_client_dep = dependency('avahi-client', version: '>= 0.6')
   avahi_glib_dep = dependency('avahi-glib', version: '>= 0.6')
 endif
-config_h.set('HAVE_AVAHI', enable_avahi)
+config_h.set('HAVE_AVAHI', enable_dnssd)
 
 # *** Check for libudev ***
 enable_udev = get_option('enable-udev')
@@ -414,7 +414,7 @@ endif
 config_h.set10('HAVE_LIBUSB', enable_libusb)
 
 # *** Check for samba ***
-enable_samba = get_option('enable-samba')
+enable_samba = get_option('enable-smb')
 if enable_samba
   smbclient_dep = dependency('smbclient')
 endif
@@ -456,8 +456,8 @@ if enable_gphoto2
 endif
 
 # *** Check for libmtp ***
-enable_libmtp = get_option('enable-libmtp')
-if enable_libmtp
+enable_mtp = get_option('enable-mtp')
+if enable_mtp
   assert(enable_gudev, 'libmtp requested but gudev is required')
 
   libmtp_dep = dependency('libmtp', version: '>= 1.1.0')
@@ -466,7 +466,7 @@ if enable_libmtp
   config_h.set10('HAVE_LIBMTP_1_1_9', libmtp_dep.version().version_compare('>= 1.1.9'))
   config_h.set10('HAVE_LIBMTP_1_1_12', libmtp_dep.version().version_compare('>= 1.1.12'))
 endif
-config_h.set('HAVE_LIBMTP', enable_libmtp)
+config_h.set('HAVE_LIBMTP', enable_mtp)
 
 # *** AFP backend ***
 enable_afp = get_option('enable-afp')
diff --git a/meson_options.txt b/meson_options.txt
index ea48b4d7..c7899291 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,28 +1,31 @@
 option('with-dbus-service-dir', type: 'string', value: '', description: 'choose directory for dbus service files [default=PREFIX/share/dbus-1/services]')
 option('with-systemduserunitdir', type: 'string', value: '', description: 'choose directory for systemd user units, or \'no\' to disable [default=PREFIX/lib/systemd/user]')
-option('enable-gcr', type: 'boolean', value: true, description: 'build with gcr')
+
 option('enable-admin', type: 'boolean', value: true, description: 'build with admin backend')
-option('enable-http', type: 'boolean', value: true, description: 'build with http/dav backend')
-option('enable-avahi', type: 'boolean', value: true, description: 'build with avahi backend')
-option('enable-udev', type: 'boolean', value: true, description: 'build with libudev')
-option('enable-gudev', type: 'boolean', value: true, description: 'build with gudev support')
-option('enable-fuse', type: 'boolean', value: true, description: 'build with FUSE support')
-option('enable-gdu', type: 'boolean', value: true, description: 'build with GDU volume monitor')
-option('enable-udisks2', type: 'boolean', value: true, description: 'build with libudisks2')
-option('enable-libsystemd-login', type: 'boolean', value: true, description: 'build with libsystemd-login')
-option('enable-afc', type: 'boolean', value: true, description: 'build with AFC backend')
-option('enable-goa', type: 'boolean', value: true, description: 'build with GOA volume monitor')
-option('enable-keyring', type: 'boolean', value: true, description: 'build with GNOME Keyring support')
+option('enable-afc', type: 'boolean', value: true, description: 'build with afc backend and volume monitor')
+option('enable-afp', type: 'boolean', value: true, description: 'build with afp backends')
+option('enable-archive', type: 'boolean', value: true, description: 'build with archive backend')
+option('enable-cdda', type: 'boolean', value: true, description: 'build with cdda backend')
+option('enable-dnssd', type: 'boolean', value: true, description: 'build with dnssd backend')
+option('enable-gdu', type: 'boolean', value: true, description: 'build with gdu volume monitor')
+option('enable-goa', type: 'boolean', value: true, description: 'build with goa volume monitor')
+option('enable-google', type: 'boolean', value: true, description: 'build with google backend')
+option('enable-gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor')
+option('enable-http', type: 'boolean', value: true, description: 'build with http/dav backends')
+option('enable-mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
+option('enable-nfs', type: 'boolean', value: true, description: 'build with nfs backend')
+option('enable-smb', type: 'boolean', value: true, description: 'build with smb backends')
+option('enable-udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
+
 option('enable-bluray', type: 'boolean', value: true, description: 'build with bluray metadata support')
-option('enable-libusb', type: 'boolean', value: true, description: 'build with libusb support')
-option('enable-samba', type: 'boolean', value: true, description: 'build with samba support')
-option('enable-archive', type: 'boolean', value: true, description: 'build with archive support')
-option('enable-nfs', type: 'boolean', value: true, description: 'build with NFS support')
-option('enable-cdda', type: 'boolean', value: true, description: 'build with CDDA backend')
-option('enable-google', type: 'boolean', value: true, description: 'build with Google backend')
-option('enable-gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 support')
-option('enable-libmtp', type: 'boolean', value: true, description: 'build with libmtp support')
-option('enable-afp', type: 'boolean', value: true, description: 'build with AFP support')
-option('enable-man', type: 'boolean', value: false, description: 'generate man pages')
-option('enable-devel-utils', type: 'boolean', value: false, description: 'generate development utility programs')
+option('enable-fuse', type: 'boolean', value: true, description: 'build with fuse support')
+option('enable-gcr', type: 'boolean', value: true, description: 'build with gcr certificate support')
+option('enable-gudev', type: 'boolean', value: true, description: 'build with gudev device support')
+option('enable-keyring', type: 'boolean', value: true, description: 'build with keyring support')
+option('enable-libsystemd-login', type: 'boolean', value: true, description: 'build with logind support')
+option('enable-libusb', type: 'boolean', value: true, description: 'build with libusb interruption support')
+option('enable-udev', type: 'boolean', value: true, description: 'build with libudev device support')
+
+option('enable-devel-utils', type: 'boolean', value: false, description: 'build with development utility programs')
 option('enable-installed-tests', type: 'boolean', value: false, description: 'enable installed unit tests')
+option('enable-man', type: 'boolean', value: false, description: 'generate man pages')
diff --git a/monitor/meson.build b/monitor/meson.build
index b02c291a..b6aa8de5 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -16,7 +16,7 @@ if enable_afc
   subdir('afc')
 endif
 
-if enable_libmtp
+if enable_mtp
   subdir('mtp')
 endif