build: Sprinkle quotations

According to:
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Autoconf-Language.html

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

1 files changed, 155 insertions, 155 deletions

diff --git a/configure.ac b/configure.ac
index acf5446b..f7d7e154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,17 @@ LT_INIT([disable-static])
 LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
-AC_ARG_ENABLE(documentation,
-              AS_HELP_STRING([--enable-documentation],
-                             [build documentation]),,
-              enable_documentation=yes)
+AC_ARG_ENABLE([documentation],
+              [AS_HELP_STRING([--enable-documentation],
+                              [build documentation])],,
+              [enable_documentation=yes])
 if test x$enable_documentation = xyes; then
    AC_PATH_PROG([XSLTPROC], [xsltproc])
    if test x$XSLTPROC = x; then
       AC_MSG_ERROR([xsltproc is required to build documentation])
    fi
 fi
-AM_CONDITIONAL(BUILD_DOCUMENTATION, test x$enable_documentation = xyes)
+AM_CONDITIONAL([BUILD_DOCUMENTATION], [test x$enable_documentation = xyes])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -61,13 +61,13 @@ GTK_DOC_CHECK
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.45.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.45.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0])
 
-PKG_CHECK_MODULES(DBUS, dbus-1)
+PKG_CHECK_MODULES([DBUS], [dbus-1])
 
-AC_ARG_WITH(dbus_service_dir,
-		AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]),
-            with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
+AC_ARG_WITH([dbus_service_dir],
+	    [AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]])],
+	    [with_dbus_service_dir="$withval"], [with_dbus_service_dir=$datadir/dbus-1/services])
 DBUS_SERVICE_DIR=$with_dbus_service_dir
 AC_SUBST(DBUS_SERVICE_DIR)
 
@@ -78,12 +78,12 @@ dnl *********************
 dnl *** Check for gcr ***
 dnl *********************
 
-AC_ARG_ENABLE(gcr, AS_HELP_STRING([--disable-gcr],[build without gcr]))
+AC_ARG_ENABLE([gcr], [AS_HELP_STRING([--disable-gcr],[build without gcr])])
 msg_gcr=no
 
 if test "x$enable_gcr" != "xno"; then
-  PKG_CHECK_MODULES(GCR, gcr-base-3, msg_gcr=yes)
-  AC_DEFINE(HAVE_GCR, 1, [Define to 1 if gcr is available])
+  PKG_CHECK_MODULES([GCR], [gcr-base-3], [msg_gcr=yes])
+  AC_DEFINE([HAVE_GCR], 1, [Define to 1 if gcr is available])
 fi
 
 dnl ****************************
@@ -137,46 +137,46 @@ AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)
 AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
 AC_CHECK_FUNC(openpty,[have_openpty=1],AC_CHECK_LIB(util,openpty,[have_openpty=1; LIBS="$LIBS -lutil"]))
 if test x$have_socketpair = x1 ; then
-	AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
+	AC_DEFINE([HAVE_SOCKETPAIR],1,[Define if you have the socketpair function.])
 fi
 if test x$have_openpty = x1 ; then
-	AC_DEFINE(HAVE_OPENPTY,1,[Define if you have the openpty function.])
+	AC_DEFINE([HAVE_OPENPTY],1,[Define if you have the openpty function.])
 fi
 
-AC_SEARCH_LIBS(login_tty, util, [AC_DEFINE([HAVE_LOGIN_TTY],[],[Whether login_tty is available])])
+AC_SEARCH_LIBS([login_tty], [util], [AC_DEFINE([HAVE_LOGIN_TTY],[],[Whether login_tty is available])])
 
 dnl **************************************************
 dnl *** Check if we should build with http backend ***
 dnl **************************************************
-AC_ARG_ENABLE(http, AS_HELP_STRING([--disable-http],[build without http/dav backend]))
+AC_ARG_ENABLE([http], [AS_HELP_STRING([--disable-http],[build without http/dav backend])])
 msg_http=no
 
 if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS(libsoup-2.4 >= 2.42.0, msg_http=yes)
+  PKG_CHECK_EXISTS([libsoup-2.4 >= 2.42.0], [msg_http=yes])
 
   if test "x$msg_http" = "xyes"; then
-    PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0)
-    AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built])
+    PKG_CHECK_MODULES([HTTP], [libsoup-2.4 libxml-2.0])
+    AC_DEFINE([HAVE_HTTP], 1, [Define to 1 if http/dav is going to be built])
   fi
 fi
 
 AC_SUBST(HTTP_CFLAGS)
 AC_SUBST(HTTP_LIBS)
-AM_CONDITIONAL(HAVE_HTTP, [test "$msg_http" = "yes"])
+AM_CONDITIONAL([HAVE_HTTP], [test "$msg_http" = "yes"])
 
 dnl **************************************************
 dnl *** Check if we should build with DNS-SD backend ***
 dnl **************************************************
 AM_CONDITIONAL(HAVE_AVAHI, false)
 			  
-AC_ARG_ENABLE(avahi, AS_HELP_STRING([--disable-avahi],[build without avahi support]))
+AC_ARG_ENABLE([avahi], [AS_HELP_STRING([--disable-avahi],[build without avahi support])])
 msg_avahi=no
 if test "x$enable_avahi" != "xno"; then
-	PKG_CHECK_MODULES(AVAHI, avahi-glib >= 0.6 avahi-client >= 0.6,
-		  	[AM_CONDITIONAL(HAVE_AVAHI, true)
-		   	AC_DEFINE(HAVE_AVAHI, [], [Set if we can use avahi])]
-                        msg_avahi=yes,
-	          	[AM_CONDITIONAL(HAVE_AVAHI, false)])
+	PKG_CHECK_MODULES([AVAHI], [avahi-glib >= 0.6 avahi-client >= 0.6],
+			[AM_CONDITIONAL([HAVE_AVAHI], [true])
+			AC_DEFINE([HAVE_AVAHI], [], [Set if we can use avahi])]
+                        [msg_avahi=yes],
+			[AM_CONDITIONAL([HAVE_AVAHI], [false])])
 	AC_SUBST(AVAHI_CFLAGS)
 	AC_SUBST(AVAHI_LIBS)
 fi
@@ -184,58 +184,58 @@ fi
 dnl ************************
 dnl *** Check for libXML ***
 dnl ************************
-PKG_CHECK_MODULES(LIBXML, libxml-2.0,
-	[AM_CONDITIONAL(HAVE_LIBXML, true)
-	AC_DEFINE(HAVE_LIBXML, [], [Set if we have libxml])]
-	msg_libxml=yes,
-        [AM_CONDITIONAL(HAVE_LIBXML, false)])
+PKG_CHECK_MODULES([LIBXML], [libxml-2.0],
+	[AM_CONDITIONAL([HAVE_LIBXML], [true])
+	AC_DEFINE([HAVE_LIBXML], [], [Set if we have libxml])]
+	[msg_libxml=yes],
+        [AM_CONDITIONAL([HAVE_LIBXML], [false])])
 
 dnl *************************
 dnl *** Check for libudev ***
 dnl *************************
-AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev],[build without libudev]))
+AC_ARG_ENABLE([udev], [AS_HELP_STRING([--disable-udev],[build without libudev])])
 msg_udev=no
 
 if test "x$enable_udev" != "xno"; then
-  PKG_CHECK_EXISTS(libudev >= 138, msg_udev=yes)
+  PKG_CHECK_EXISTS([libudev >= 138], [msg_udev=yes])
 
   if test "x$msg_udev" = "xyes"; then
-    PKG_CHECK_MODULES(UDEV, libudev)
-    AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev availible])
+    PKG_CHECK_MODULES([UDEV], [libudev])
+    AC_DEFINE([HAVE_LIBUDEV], 1, [Define to 1 if libudev availible])
   fi
 fi
 
 dnl **********************
 dnl *** Check for FUSE ***
 dnl **********************
-AC_ARG_ENABLE(fuse, AS_HELP_STRING([--disable-fuse],[build without FUSE support]))
+AC_ARG_ENABLE([fuse], [AS_HELP_STRING([--disable-fuse],[build without FUSE support])])
 msg_fuse=no
 
 if test "x$enable_fuse" != "xno"; then
-  PKG_CHECK_EXISTS(fuse, msg_fuse=yes)
+  PKG_CHECK_EXISTS([fuse], [msg_fuse=yes])
 
   if test "x$msg_fuse" = "xyes"; then
-    PKG_CHECK_MODULES(FUSE, fuse >= 2.8.0)
-    AC_DEFINE(HAVE_FUSE, 1, [Define to 1 if FUSE is available])
+    PKG_CHECK_MODULES([FUSE], [fuse >= 2.8.0])
+    AC_DEFINE([HAVE_FUSE], 1, [Define to 1 if FUSE is available])
   fi
 fi
 
-AM_CONDITIONAL(USE_FUSE, [test "$msg_fuse" = "yes"])
+AM_CONDITIONAL([USE_FUSE], [test "$msg_fuse" = "yes"])
 
 dnl ************************************
 dnl *** Check for gnome-disk-utility ***
 dnl ************************************
 
-AC_ARG_ENABLE(gdu, AS_HELP_STRING([--disable-gdu],[build without GDU volume monitor]))
+AC_ARG_ENABLE([gdu], [AS_HELP_STRING([--disable-gdu],[build without GDU volume monitor])])
 msg_gdu=no
 GDU_REQUIRED=3.0.2
 
 if test "x$enable_gdu" != "xno"; then
-  PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
+  PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], [msg_gdu=yes])
 
   if test "x$msg_gdu" = "xyes"; then
     PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED])
-    AC_DEFINE(HAVE_GDU, 1, [Define to 1 if gnome-disk-utility is available])
+    AC_DEFINE([HAVE_GDU], 1, [Define to 1 if gnome-disk-utility is available])
   fi
 fi
 
@@ -245,16 +245,16 @@ dnl *************************
 dnl *** Check for udisks2 ***
 dnl *************************
 
-AC_ARG_ENABLE(udisks2, AS_HELP_STRING([--disable-udisks2],[build without libudisks2]))
+AC_ARG_ENABLE([udisks2], [AS_HELP_STRING([--disable-udisks2],[build without libudisks2])])
 msg_udisks2=no
 UDISKS2_REQUIRED=1.97
 
 if test "x$enable_udisks2" != "xno"; then
-  PKG_CHECK_EXISTS([udisks2 >= $UDISKS2_REQUIRED], msg_udisks2=yes)
+  PKG_CHECK_EXISTS([udisks2 >= $UDISKS2_REQUIRED], [msg_udisks2=yes])
 
   if test "x$msg_udisks2" = "xyes"; then
     PKG_CHECK_MODULES([UDISKS2],[udisks2 >= $UDISKS2_REQUIRED])
-    AC_DEFINE(HAVE_UDISKS2, 1, [Define to 1 if libudisks2 is available])
+    AC_DEFINE([HAVE_UDISKS2], 1, [Define to 1 if libudisks2 is available])
   fi
 fi
 
@@ -264,18 +264,18 @@ dnl **********************************
 dnl *** Check for libsystemd-login ***
 dnl **********************************
 
-AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login]))
+AC_ARG_ENABLE([libsystemd_login], [AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])])
 msg_libsystemd_login=no
 LIBSYSTEMD_LOGIN_REQUIRED=44
 
 if test "x$enable_libsystemd_login" != "xno"; then
   PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],
-                   [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)])
+                   [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], [msg_libsystemd_login=yes])])
 
   if test "x$msg_libsystemd_login" = "xyes"; then
     PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],,
                       [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])])
-    AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available])
+    AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd_login is available])
   fi
 fi
 
@@ -284,45 +284,45 @@ AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
 dnl **********************
 dnl *** Check for HAL ***
 dnl **********************
-AC_ARG_ENABLE(hal, AS_HELP_STRING([--disable-hal],[build without HAL support]))
+AC_ARG_ENABLE([hal], [AS_HELP_STRING([--disable-hal],[build without HAL support])])
 msg_hal=no
 have_hal_fast_init=no
 HAL_REQUIRED=0.5.10
 
 if test "x$enable_hal" != "xno" && test "x$msg_gdu" = "xno"; then
-  PKG_CHECK_EXISTS([hal >= $HAL_REQUIRED], msg_hal=yes)
+  PKG_CHECK_EXISTS([hal >= $HAL_REQUIRED], [msg_hal=yes])
 
   if test "x$msg_hal" = "xyes"; then
     PKG_CHECK_MODULES([HAL],[hal >= $HAL_REQUIRED])
-    AC_DEFINE(HAVE_HAL, 1, [Define to 1 if HAL is available])
+    AC_DEFINE([HAVE_HAL], 1, [Define to 1 if HAL is available])
     save_libs="$LIBS"
     LIBS="$HAL_LIBS"
-    AC_CHECK_LIB(hal, libhal_get_all_devices_with_properties, have_hal_fast_init=yes)
+    AC_CHECK_LIB([hal], [libhal_get_all_devices_with_properties], [have_hal_fast_init=yes])
     if test "x$have_hal_fast_init" = "xyes"; then
-      AC_DEFINE(HAVE_HAL_FAST_INIT, 1, [Define to 1 if libhal_get_all_devices_with_properties is available])
+      AC_DEFINE([HAVE_HAL_FAST_INIT], 1, [Define to 1 if libhal_get_all_devices_with_properties is available])
     fi
     LIBS="$save_libs"
   fi
 fi
 
-AM_CONDITIONAL(USE_HAL, [test "$msg_hal" = "yes"])
+AM_CONDITIONAL([USE_HAL], [test "$msg_hal" = "yes"])
 
 dnl **********************
 dnl *** Check for gudev ***
 dnl **********************
-AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[build without gudev support]))
+AC_ARG_ENABLE([gudev], [AS_HELP_STRING([--disable-gudev],[build without gudev support])])
 msg_gudev=no
 GUDEV_REQUIRED=147
 
 if test "x$enable_gudev" != "xno"; then
-  PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], msg_gudev=yes)
+  PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], [msg_gudev=yes])
 
   if test "x$msg_gudev" = "xyes"; then
-    PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= $GUDEV_REQUIRED])
-    AC_DEFINE(HAVE_GUDEV, 1, [Define to 1 if gudev is available])
+    PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= $GUDEV_REQUIRED])
+    AC_DEFINE([HAVE_GUDEV], 1, [Define to 1 if gudev is available])
   fi
 fi
-AM_CONDITIONAL(USE_GUDEV, [test "$msg_gudev" = "yes"])
+AM_CONDITIONAL([USE_GUDEV], [test "$msg_gudev" = "yes"])
 
 if test "x$msg_gudev" = "xyes"; then
   msg_hotplug_backend="gudev"
@@ -337,21 +337,21 @@ fi
 dnl **************************************************
 dnl *** Check if we should build with CDDA backend ***
 dnl **************************************************
-AC_ARG_ENABLE(cdda, AS_HELP_STRING([--disable-cdda],[build without CDDA backend]))
+AC_ARG_ENABLE([cdda], [AS_HELP_STRING([--disable-cdda],[build without CDDA backend])])
 msg_cdda=no
 
 if test "x$enable_cdda" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
-  PKG_CHECK_EXISTS(libcdio_paranoia >= 0.78.2, msg_cdda=yes)
+  PKG_CHECK_EXISTS([libcdio_paranoia >= 0.78.2], [msg_cdda=yes])
 
   if test "x$msg_cdda" = "xyes"; then
-    PKG_CHECK_MODULES(CDDA, libcdio_paranoia)
-    AC_DEFINE(HAVE_CDDA, 1, [Define to 1 if CDDA is going to be built])
+    PKG_CHECK_MODULES([CDDA], [libcdio_paranoia])
+    AC_DEFINE([HAVE_CDDA], 1, [Define to 1 if CDDA is going to be built])
 
     # test for actual headers location
     CPPFLAGS_save="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $CDDA_CFLAGS"
     AC_CHECK_HEADER(cdio/paranoia/paranoia.h, [
-       AC_DEFINE(HAVE_PARANOIA_NEW_INCLUDES, 1, [Define to 1 if cdio/paranoia/paranoia.h is present]) ])
+       AC_DEFINE([HAVE_PARANOIA_NEW_INCLUDES], 1, [Define to 1 if cdio/paranoia/paranoia.h is present]) ])
     CPPFLAGS="$CPPFLAGS_save"
   fi
 fi
@@ -359,56 +359,56 @@ fi
 AC_SUBST(CDDA_LIBS)
 AC_SUBST(CDDA_CFLAGS)
 
-AM_CONDITIONAL(USE_CDDA, [test "$msg_cdda" = "yes"])
+AM_CONDITIONAL([USE_CDDA], [test "$msg_cdda" = "yes"])
 
 dnl *************************************************
 dnl *** Check if we should build with AFC backend ***
 dnl *************************************************
-AC_ARG_ENABLE(afc, AS_HELP_STRING([--disable-afc],[build without AFC backend]))
+AC_ARG_ENABLE([afc], [AS_HELP_STRING([--disable-afc],[build without AFC backend])])
 msg_afc=no
 
 if test "x$enable_afc" != "xno" ; then
-  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
+  PKG_CHECK_EXISTS([libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15], [msg_afc=yes])
 
   if test "x$msg_afc" = "xyes"; then
-    PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-    AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
+    PKG_CHECK_MODULES([AFC], [libimobiledevice-1.0 libplist])
+    AC_DEFINE([HAVE_AFC], 1, [Define to 1 if AFC is going to be built])
   fi
 fi
 
 AC_SUBST(AFC_LIBS)
 AC_SUBST(AFC_CFLAGS)
 
-AM_CONDITIONAL(USE_AFC, [test "$msg_afc" = "yes"])
+AM_CONDITIONAL([USE_AFC], [test "$msg_afc" = "yes"])
 
 dnl ********************************************************
 dnl *** Check if we should build with GOA volume monitor ***
 dnl ********************************************************
-AC_ARG_ENABLE(goa, AS_HELP_STRING([--disable-goa],[build without GOA volume monitor]))
+AC_ARG_ENABLE([goa], [AS_HELP_STRING([--disable-goa],[build without GOA volume monitor])])
 msg_goa=no
 
 if test "x$enable_goa" != "xno" ; then
-  PKG_CHECK_EXISTS(goa-1.0 >= 3.7.1, msg_goa=yes)
+  PKG_CHECK_EXISTS([goa-1.0 >= 3.7.1], [msg_goa=yes])
 
   if test "x$msg_goa" = "xyes"; then
-    PKG_CHECK_MODULES(GOA, goa-1.0)
-    AC_DEFINE(HAVE_GOA, 1, [Define to 1 if GOA is going to be built])
+    PKG_CHECK_MODULES([GOA], [goa-1.0])
+    AC_DEFINE([HAVE_GOA], 1, [Define to 1 if GOA is going to be built])
   fi
 fi
 
 AC_SUBST(GOA_LIBS)
 AC_SUBST(GOA_CFLAGS)
 
-AM_CONDITIONAL(USE_GOA, [test "$msg_goa" = "yes"])
+AM_CONDITIONAL([USE_GOA], [test "$msg_goa" = "yes"])
 
 dnl *************************
 dnl *** Check for gphoto2 ***
 dnl *************************
-AC_ARG_ENABLE(gphoto2, AS_HELP_STRING([--disable-gphoto2],[build without gphoto2 support]))
+AC_ARG_ENABLE([gphoto2], [AS_HELP_STRING([--disable-gphoto2],[build without gphoto2 support])])
 msg_gphoto2=no
 
 if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
-  PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0, [msg_gphoto2=yes])
+  PKG_CHECK_MODULES([GPHOTO2], [libgphoto2 >= 2.4.0], [msg_gphoto2=yes])
 
   # Need OS tweaks in hal volume monitor backend
   case "$host" in
@@ -426,9 +426,9 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
 
   if test "x$msg_gphoto2" = "xyes"; then
     if test "x$use_gphoto2" = "xyes"; then
-      AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-      PKG_CHECK_MODULES(GPHOTO25, libgphoto2 >= 2.5.0,
-         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available]),
+      AC_DEFINE([HAVE_GPHOTO2], 1, [Define to 1 if gphoto2 is available])
+      PKG_CHECK_MODULES([GPHOTO25], [libgphoto2 >= 2.5.0],
+         [AC_DEFINE([HAVE_GPHOTO25], 1, [Define to 1 if libgphoto2 2.5 is available])],
 	 []
       )
     else
@@ -442,64 +442,64 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
   fi
 fi
 
-AM_CONDITIONAL(USE_GPHOTO2, [test "$msg_gphoto2" = "yes"])
+AM_CONDITIONAL([USE_GPHOTO2], [test "$msg_gphoto2" = "yes"])
 
 dnl *******************************
 dnl *** Check for GNOME Keyring ***
 dnl *******************************
-AC_ARG_ENABLE(keyring, AS_HELP_STRING([--disable-keyring],[build without GNOME Keyring support]))
+AC_ARG_ENABLE([keyring], [AS_HELP_STRING([--disable-keyring],[build without GNOME Keyring support])])
 msg_keyring=no
 
 if test "x$enable_keyring" != "xno"; then
-  PKG_CHECK_EXISTS(libsecret-unstable, msg_keyring=yes)
+  PKG_CHECK_EXISTS([libsecret-unstable], [msg_keyring=yes])
 
   if test "x$msg_keyring" = "xyes"; then
-    PKG_CHECK_MODULES(KEYRING, libsecret-unstable)
-    AC_DEFINE(HAVE_KEYRING, 1, [Define to 1 if GNOME Keyring is available])
+    PKG_CHECK_MODULES([KEYRING], [libsecret-unstable])
+    AC_DEFINE([HAVE_KEYRING], 1, [Define to 1 if GNOME Keyring is available])
   fi
 fi
 
-AM_CONDITIONAL(USE_KEYRING, [test "$msg_keyring" = "yes"])
+AM_CONDITIONAL([USE_KEYRING], [test "$msg_keyring" = "yes"])
 
 dnl ***********************************************
 dnl *** Check if we should build with libbluray ***
 dnl ***********************************************
-AC_ARG_ENABLE(bluray, AS_HELP_STRING([--disable-bluray],[build without bluray metadata support]))
+AC_ARG_ENABLE([bluray], [AS_HELP_STRING([--disable-bluray],[build without bluray metadata support])])
 msg_bluray=no
 
 if test "x$enable_bluray" != "xno"; then
-  PKG_CHECK_EXISTS(libbluray, msg_bluray=yes)
+  PKG_CHECK_EXISTS([libbluray], [msg_bluray=yes])
 
   if test "x$msg_bluray" = "xyes"; then
-    PKG_CHECK_MODULES(BLURAY, libbluray)
-    AC_DEFINE(HAVE_BLURAY, 1, [Define to 1 if bluray metadata is going to be built])
+    PKG_CHECK_MODULES([BLURAY], [libbluray])
+    AC_DEFINE([HAVE_BLURAY], 1, [Define to 1 if bluray metadata is going to be built])
   fi
 fi
 
 AC_SUBST(BLURAY_CFLAGS)
 AC_SUBST(BLURAY_LIBS)
-AM_CONDITIONAL(HAVE_BLURAY, [test "$msg_bluray" = "yes"])
+AM_CONDITIONAL([HAVE_BLURAY], [test "$msg_bluray" = "yes"])
 
 dnl *************************
 dnl *** Check for libmtp ***
 dnl *************************
-AC_ARG_ENABLE(libmtp, AS_HELP_STRING([--disable-libmtp],[build without libmtp support]))
+AC_ARG_ENABLE([libmtp], [AS_HELP_STRING([--disable-libmtp],[build without libmtp support])])
 msg_libmtp=no
 
 if test "x$enable_libmtp" != "xno" -a "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS(libmtp, msg_libmtp=yes)
+  PKG_CHECK_EXISTS([libmtp], [msg_libmtp=yes])
 
   if test "x$msg_libmtp" = "xyes"; then
-    PKG_CHECK_MODULES(LIBMTP, libmtp >= 1.1.0)
-    AC_DEFINE(HAVE_LIBMTP, 1, [Define to 1 if libmtp is available])
+    PKG_CHECK_MODULES([LIBMTP], [libmtp >= 1.1.0])
+    AC_DEFINE([HAVE_LIBMTP], 1, [Define to 1 if libmtp is available])
 
-    PKG_CHECK_MODULES(LIBMTP_1_1_5, libmtp >= 1.1.5,
-        AC_DEFINE(HAVE_LIBMTP_1_1_5, 1, [Define to 1 if libmtp 1.1.5 is available]),
+    PKG_CHECK_MODULES([LIBMTP_1_1_5], [libmtp >= 1.1.5],
+        [AC_DEFINE([HAVE_LIBMTP_1_1_5], 1, [Define to 1 if libmtp 1.1.5 is available])],
         []
     )
 
-    PKG_CHECK_MODULES(LIBMTP_1_1_6, libmtp >= 1.1.6,
-        AC_DEFINE(HAVE_LIBMTP_1_1_6, 1, [Define to 1 if libmtp 1.1.6 is available]),
+    PKG_CHECK_MODULES([LIBMTP_1_1_6], [libmtp >= 1.1.6],
+        [AC_DEFINE([HAVE_LIBMTP_1_1_6], 1, [Define to 1 if libmtp 1.1.6 is available])],
         []
     )
   fi
@@ -516,13 +516,13 @@ dnl ==========================================================================
 dnl Samba 3.0
 
 dnl Samba 4 ships a pc file and requires a non-default include subdir, so pick it up:
-PKG_CHECK_MODULES(SMBCLIENT, smbclient, samba_default_cflags="$SMBCLIENT_CFLAGS",samba_default_cflags=-I/usr/include)
+PKG_CHECK_MODULES([SMBCLIENT], [smbclient], [samba_default_cflags="$SMBCLIENT_CFLAGS"], [samba_default_cflags=-I/usr/include])
 
-AC_ARG_ENABLE(samba, AS_HELP_STRING([--disable-samba],[build without samba support]))
+AC_ARG_ENABLE([samba], [AS_HELP_STRING([--disable-samba],[build without samba support])])
 msg_samba="no"
 if test "x$enable_samba" != "xno"; then
-  AC_ARG_WITH(samba-includes, AS_HELP_STRING([--with-samba-includes=PREFIX],[Location of samba includes.]),
-	      with_samba_includes="-I$withval", with_samba_includes=${samba_default_cflags})
+  AC_ARG_WITH([samba-includes], [AS_HELP_STRING([--with-samba-includes=PREFIX],[Location of samba includes.])],
+	      [with_samba_includes="-I$withval"], [with_samba_includes=${samba_default_cflags}])
   have_samba_includes="no"
   if test "x${with_samba_includes}" != "x-Ino"; then
 	CPPFLAGS_save="$CPPFLAGS"
@@ -542,16 +542,16 @@ if test "x$enable_samba" != "xno"; then
 		SAMBA_CFLAGS=""
 	fi
   fi
-  AC_ARG_WITH(samba-libs, AS_HELP_STRING([--with-samba-libs=PREFIX],[Location of Samba libs.]),
-	      with_samba_libs="$withval", with_samba_libs="/usr/lib")
+  AC_ARG_WITH([samba-libs], [AS_HELP_STRING([--with-samba-libs=PREFIX],[Location of Samba libs.])],
+	      [with_samba_libs="$withval"], [with_samba_libs="/usr/lib"])
   if test "x${with_samba_libs}" != "xno" -a "x${have_samba_includes}" != "xno"; then
 	LDFLAGS_save="$LDFLAGS"
 	
 	LDFLAGS="$LDFLAGS -L$with_samba_libs"
-	AC_CHECK_LIB(smbclient, smbc_getFunctionStatVFS,samba_libs="yes", samba_libs="no")
+	AC_CHECK_LIB([smbclient], [smbc_getFunctionStatVFS], [samba_libs="yes"], [samba_libs="no"])
 	LDFLAGS="$LDFLAGS_save"
 	if test "x${samba_libs}" != "xno"; then
-		AC_DEFINE(HAVE_SAMBA,, [Define to 1 if you have the samba libraries])
+		AC_DEFINE([HAVE_SAMBA],, [Define to 1 if you have the samba libraries])
 		msg_samba="yes"
                 if test x$with_samba_libs != x/usr/lib; then
                         SAMBA_LIBS="-L$with_samba_libs -lsmbclient"
@@ -559,7 +559,7 @@ if test "x$enable_samba" != "xno"; then
                 	SAMBA_LIBS="-lsmbclient"
                 fi
 	else
-		AC_CHECK_LIB(smbclient, smbc_new_context,samba_old_libs="yes", samba_old_libs="no")
+		AC_CHECK_LIB([smbclient], [smbc_new_context], [samba_old_libs="yes"], [samba_old_libs="no"])
 		if test "x${samba_old_libs}" != "xno"; then
 		   msg_samba="Too old, need at least samba 3.4.0"
 		fi
@@ -567,10 +567,10 @@ if test "x$enable_samba" != "xno"; then
 		SAMBA_LIBS=""
 	fi
   fi
-  AC_MSG_CHECKING(for Samba libraries)
+  AC_MSG_CHECKING([for Samba libraries])
   AC_MSG_RESULT($msg_samba)
 fi
-AM_CONDITIONAL(HAVE_SAMBA, test "$msg_samba" = "yes")
+AM_CONDITIONAL([HAVE_SAMBA], [test "$msg_samba" = "yes"])
 AC_SUBST(SAMBA_CFLAGS)
 AC_SUBST(SAMBA_LIBS)
 
@@ -580,20 +580,20 @@ dnl ****************************
 dnl *** Check for GTK        ***
 dnl ****************************
 
-AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk],[build without GTK+]))
+AC_ARG_ENABLE([gtk], [AS_HELP_STRING([--disable-gtk],[build without GTK+])])
 msg_gtk=no
 GTK_REQUIRED=3.0
 
 if test "x$enable_gtk" != "xno"; then
-  PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK_REQUIRED], msg_gtk=yes)
+  PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK_REQUIRED], [msg_gtk=yes])
 
   if test "x$msg_gtk" = "xyes"; then
     PKG_CHECK_MODULES([GTK],[gtk+-3.0 >= $GTK_REQUIRED])
-    AC_DEFINE(HAVE_GTK, 1, [Define to 1 if GTK+ is available])
+    AC_DEFINE([HAVE_GTK], 1, [Define to 1 if GTK+ is available])
   fi
 fi
 
-AM_CONDITIONAL(USE_GTK, [test "$msg_gtk" = "yes"])
+AM_CONDITIONAL([USE_GTK], [test "$msg_gtk" = "yes"])
 
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -602,17 +602,17 @@ dnl ****************************
 dnl *** Check for libarchive ***
 dnl ****************************
 
-AC_ARG_ENABLE(archive, AS_HELP_STRING([--disable-archive],[build without archive support]))
+AC_ARG_ENABLE([archive], [AS_HELP_STRING([--disable-archive],[build without archive support])])
 msg_archive="no"
 if test "x$enable_archive" != "xno"; then
-  AC_ARG_WITH(archive-includes, AS_HELP_STRING([--with-archive-includes=PREFIX],[Location of archive includes.]),
-	      with_archive_includes="$withval", with_archive_includes="/usr/include")
+  AC_ARG_WITH([archive-includes], [AS_HELP_STRING([--with-archive-includes=PREFIX],[Location of archive includes.])],
+	      [with_archive_includes="$withval"], [with_archive_includes="/usr/include"])
   have_archive_includes="no"
   if test "x${with_archive_includes}" != "xno"; then
 	CPPFLAGS_save="$CPPFLAGS"
 
 	CPPFLAGS="$CPPFLAGS -I$with_archive_includes"
-	AC_CHECK_HEADER(archive.h, [ archive_includes="yes" ])
+	AC_CHECK_HEADER([archive.h], [ archive_includes="yes" ])
 	CPPFLAGS="$CPPFLAGS_save"
 	
 	if test "x{archive_includes}" != "xno" -a "x${archive_includes}" != "x"; then
@@ -626,8 +626,8 @@ if test "x$enable_archive" != "xno"; then
 		ARCHIVE_CFLAGS=""
 	fi
   fi
-  AC_ARG_WITH(archive-libs, AS_HELP_STRING ([--with-archive-libs=PREFIX],[Location of Archive libs.]),
-	      with_archive_libs="$withval", with_archive_libs="/usr/lib")
+  AC_ARG_WITH([archive-libs], [AS_HELP_STRING([--with-archive-libs=PREFIX], [Location of Archive libs.])],
+	      [with_archive_libs="$withval"], [with_archive_libs="/usr/lib"])
   if test "x${with_archive_libs}" != "xno" -a "x${have_archive_includes}" != "xno"; then
 	LDFLAGS_save="$LDFLAGS"
 	
@@ -635,7 +635,7 @@ if test "x$enable_archive" != "xno"; then
 	AC_CHECK_LIB(archive, archive_entry_filetype, archive_libs="yes", archive_libs="no")
 	LDFLAGS="$LDFLAGS_save"
 	if test "x${archive_libs}" != "xno"; then
-		AC_DEFINE(HAVE_ARCHIVE,, [Define to 1 if you have the libarchive library])
+		AC_DEFINE([HAVE_ARCHIVE],, [Define to 1 if you have the libarchive library])
 		msg_archive="yes"
                 if test x$with_archive_libs != x/usr/lib; then
                         ARCHIVE_LIBS="-L$with_archive_libs -larchive"
@@ -643,7 +643,7 @@ if test "x$enable_archive" != "xno"; then
                 	ARCHIVE_LIBS="-larchive"
                 fi
 	else
-		AC_CHECK_LIB(archive, archive_entry_filetype, archive_old_libs="yes", archive_old_libs="no")
+		AC_CHECK_LIB([archive], [archive_entry_filetype], [archive_old_libs="yes"], [archive_old_libs="no"])
 		if test "x${archive_old_libs}" != "xno"; then
 		   msg_archive="Too old, need at least archive 3.0.22"
 		fi
@@ -654,7 +654,7 @@ if test "x$enable_archive" != "xno"; then
   AC_MSG_CHECKING(for Archive 3.libraries)
   AC_MSG_RESULT($msg_archive)
 fi
-AM_CONDITIONAL(HAVE_ARCHIVE, test "$msg_archive" = "yes")
+AM_CONDITIONAL([HAVE_ARCHIVE], [test "$msg_archive" = "yes"])
 AC_SUBST(ARCHIVE_CFLAGS)
 AC_SUBST(ARCHIVE_LIBS)
 
@@ -676,7 +676,7 @@ AC_SUBST([LIBGCRYPT_LIBS])
 dnl *******************
 dnl *** AFP backend ***
 dnl *******************
-AC_ARG_ENABLE(afp, AS_HELP_STRING([--disable-afp], [build without AFP support]))
+AC_ARG_ENABLE([afp], [AS_HELP_STRING([--disable-afp], [build without AFP support])])
 msg_afp="no"
 if test "x$enable_afp" != "xno"; then
 
@@ -686,20 +686,20 @@ if test "x$enable_afp" != "xno"; then
     msg_afp="partial (crypt support missing! Only anonymous logins)"
   fi
 fi
-AM_CONDITIONAL(USE_AFP, test "x$enable_afp" != "xno")
+AM_CONDITIONAL([USE_AFP], [test "x$enable_afp" != "xno"])
 
 dnl *******************
 dnl *** NFS backend ***
 dnl *******************
-AC_ARG_ENABLE(nfs, AS_HELP_STRING([--disable-nfs], [build without NFS support]))
+AC_ARG_ENABLE([nfs], [AS_HELP_STRING([--disable-nfs], [build without NFS support])])
 msg_nfs="no"
 
 if test "x$enable_nfs" != "xno"; then
-  PKG_CHECK_EXISTS([libnfs >= 1.9.7], msg_nfs=yes)
+  PKG_CHECK_EXISTS([libnfs >= 1.9.7], [msg_nfs=yes])
 
   if test "x$msg_nfs" = "xyes"; then
     PKG_CHECK_MODULES([NFS],[libnfs >= 1.9.7])
-    AC_DEFINE(HAVE_NFS, 1, [Define to 1 if nfs is going to be built])
+    AC_DEFINE([HAVE_NFS], 1, [Define to 1 if nfs is going to be built])
   fi
 fi
 
@@ -719,35 +719,35 @@ AC_CHECK_DECL(_NL_ADDRESS_COUNTRY_AB3,
 
 dnl Install bash-completion file?
 AC_ARG_ENABLE([bash-completion],
-	      AS_HELP_STRING([--disable-bash-completion],
-			     [build without bash-completion support]),
-	      msg_bash_completion=$enableval,
-	      msg_bash_completion=yes)
+	      [AS_HELP_STRING([--disable-bash-completion],
+			      [build without bash-completion support])],
+	      [msg_bash_completion=$enableval],
+	      [msg_bash_completion=yes])
 if test "x$enable_bash_completion" != "xno"; then
   msg_bash_completion=yes
 fi
-AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes")
+AM_CONDITIONAL([ENABLE_BASHCOMP], [test "$msg_bash_completion" = "yes"])
 
 AC_ARG_WITH([bash-completion-dir],
-	    AS_HELP_STRING([--with-bash-completion-dir=PATH],
-	    		   [choose directory for bash-completion file (default=DATADIR/bash-completion/completions)]),
-	    with_bashcomp_dir=$withval,
-	    with_bashcomp_dir=$datadir/bash-completion/completions)
+	    [AS_HELP_STRING([--with-bash-completion-dir=PATH],
+			    [choose directory for bash-completion file (default=DATADIR/bash-completion/completions)])],
+	    [with_bashcomp_dir=$withval],
+	    [with_bashcomp_dir=$datadir/bash-completion/completions])
 BASHCOMP_DIR=$with_bashcomp_dir
 AC_SUBST(BASHCOMP_DIR)
 
 dnl ==========================================================================
 	
 dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions
-AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions])
+AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU Extensions])
 
 dnl ==========================================================================
 	
-AC_DEFINE(_FILE_OFFSET_BITS, 64, [Enable LFS])
+AC_DEFINE([_FILE_OFFSET_BITS], 64, [Enable LFS])
 		       
 dnl ==========================================================================
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 dnl ==========================================================================
 dnl Look for various fs info getters
@@ -813,16 +813,16 @@ fi
 dnl ==========================================================================
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
 
-AC_ARG_ENABLE(more-warnings,
-AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings]),
-set_more_warnings="$enableval",[
+AC_ARG_ENABLE([more-warnings],
+[AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings])],
+[set_more_warnings="$enableval"],[
 if test -f $srcdir/.git; then
 	set_more_warnings=yes
 else
 	set_more_warnings=no
 fi
 ])
-AC_MSG_CHECKING(for more warnings)
+AC_MSG_CHECKING([for more warnings])
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
 	CFLAGS="\
@@ -852,24 +852,24 @@ else
 fi
 
 msg_installed_tests="no"
-AC_ARG_ENABLE(installed-tests,
-              AS_HELP_STRING([--enable-installed-tests],
-                             [Enable installation of some test cases]),
+AC_ARG_ENABLE([installed-tests],
+              [AS_HELP_STRING([--enable-installed-tests],
+                              [Enable installation of some test cases])],
               [case ${enableval} in
                 yes) ENABLE_INSTALLED_TESTS="1"  ;;
                 no)  ENABLE_INSTALLED_TESTS="" ;;
                 *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
                esac])
-AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
-AC_ARG_ENABLE(always-build-tests,
-              AS_HELP_STRING([--enable-always-build-tests],
-                             [Enable always building tests during 'make all']),
+AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "$ENABLE_INSTALLED_TESTS" = "1"])
+AC_ARG_ENABLE([always-build-tests],
+              [AS_HELP_STRING([--enable-always-build-tests],
+                              [Enable always building tests during 'make all'])],
               [case ${enableval} in
                 yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
                 no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
                 *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
                esac])
-AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], [test "$ENABLE_ALWAYS_BUILD_TESTS" = "1"])
 if test "$ENABLE_INSTALLED_TESTS" = "1"; then
   AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
   AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
@@ -933,7 +933,7 @@ echo "
 
 # The gudev gphoto monitor needs a recent libgphoto; point to the required patch if the version is too old
 if test "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS(libgphoto2 >= 2.4.7,, msg_gphoto_patch=yes)
+  PKG_CHECK_EXISTS([libgphoto2 >= 2.4.7],, [msg_gphoto_patch=yes])
   if test "x$msg_gphoto_patch" = "xyes"; then
     AC_MSG_WARN([You are using a libgphoto2 version earlier than 2.4.7. To work with gudev, you must apply the patch in http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874])
   fi