diff -Nru udisks-1.0.4/aclocal.m4 udisks-1.0.5/aclocal.m4 --- udisks-1.0.4/aclocal.m4 2011-08-26 15:08:40.000000000 +0000 +++ udisks-1.0.5/aclocal.m4 2014-03-10 09:03:41.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -260,6 +261,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -332,7 +337,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -454,17 +458,34 @@ dnl -*- mode: autoconf -*- -# serial 1 +# serial 2 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) @@ -481,17 +502,22 @@ [use gtk-doc to build documentation [[default=no]]]),, [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - fi - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + dnl enable/disable output formats AC_ARG_ENABLE([gtk-doc-html], AS_HELP_STRING([--enable-gtk-doc-html], @@ -506,7 +532,12 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) @@ -516,7 +547,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -529,13 +560,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -548,25 +577,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -612,7 +664,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -711,8 +763,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -721,8 +773,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -856,6 +908,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1341,7 +1395,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1505,6 +1559,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1526,6 +1581,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1556,6 +1634,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1658,7 +1740,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1666,6 +1754,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1677,6 +1766,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1694,7 +1784,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1739,8 +1831,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1751,6 +1843,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1972,7 +2066,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1984,9 +2078,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -2005,7 +2109,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -2034,14 +2141,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2118,13 +2238,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2304,6 +2424,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2330,7 +2455,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2343,7 +2469,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2889,7 +3015,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2898,7 +3024,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2963,7 +3089,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -3102,7 +3228,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3110,10 +3236,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -3121,7 +3243,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3139,7 +3261,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3158,18 +3280,8 @@ esac ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3230,7 +3342,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3246,7 +3358,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3283,9 +3395,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3314,14 +3426,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -3333,6 +3441,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3352,7 +3472,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3421,7 +3541,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3446,7 +3566,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3470,7 +3590,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -3501,7 +3621,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3511,7 +3631,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3892,10 +4012,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3933,12 +4049,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4353,6 +4469,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4685,7 +4802,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4749,7 +4866,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4937,7 +5054,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4982,7 +5101,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -5029,18 +5148,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5200,13 +5334,18 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5225,7 +5364,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5270,6 +5408,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5476,8 +5617,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5492,7 +5632,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5669,6 +5809,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5772,6 +5913,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5818,10 +5960,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5834,7 +5972,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5873,7 +6011,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5977,7 +6114,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6315,9 +6452,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6471,7 +6605,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6841,7 +6974,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6857,9 +6990,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -7021,7 +7151,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -7602,12 +7732,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7804,7 +7940,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7937,7 +8072,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8120,6 +8254,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8189,6 +8390,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -8853,9 +9061,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -9027,15 +9250,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -9140,7 +9363,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9200,7 +9423,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9246,7 +9470,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9294,9 +9519,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -9309,7 +9534,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -9320,7 +9545,7 @@ _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -9330,7 +9555,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9342,10 +9567,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9361,22 +9586,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -9395,7 +9620,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -9419,47 +9644,21 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) - -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# This was merged into AC_PROG_CC in Autoconf. - -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -]) -AU_DEFUN([fp_PROG_CC_STDC]) - # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -9478,16 +9677,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -9497,7 +9694,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -9510,12 +9707,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -9523,8 +9721,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -9563,16 +9762,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -9581,16 +9780,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -9638,7 +9837,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -9648,34 +9847,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9688,7 +9892,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -9700,21 +9904,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -9732,7 +9934,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -9740,32 +9942,23 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -9778,7 +9971,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9807,31 +10000,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -9842,34 +10044,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -9891,7 +10137,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9910,16 +10156,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -9936,20 +10180,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -9957,13 +10198,14 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -9971,18 +10213,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -10000,7 +10238,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -10025,52 +10263,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -10078,11 +10278,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -10095,63 +10294,64 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -10162,24 +10362,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -10190,32 +10448,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -10225,36 +10491,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10262,34 +10577,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -10297,24 +10610,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -10324,75 +10635,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru udisks-1.0.4/compile udisks-1.0.5/compile --- udisks-1.0.4/compile 2010-03-29 11:21:24.000000000 +0000 +++ udisks-1.0.5/compile 2014-01-02 19:14:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru udisks-1.0.4/config.guess udisks-1.0.5/config.guess --- udisks-1.0.4/config.guess 2010-03-29 11:21:24.000000000 +0000 +++ udisks-1.0.5/config.guess 2013-08-11 11:49:21.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1032,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1284,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1332,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1356,11 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru udisks-1.0.4/config.h.in udisks-1.0.5/config.h.in --- udisks-1.0.4/config.h.in 2011-08-26 15:13:58.000000000 +0000 +++ udisks-1.0.5/config.h.in 2014-03-10 09:04:21.000000000 +0000 @@ -61,9 +61,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -97,6 +94,11 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff -Nru udisks-1.0.4/config.sub udisks-1.0.5/config.sub --- udisks-1.0.4/config.sub 2010-03-29 11:21:24.000000000 +0000 +++ udisks-1.0.5/config.sub 2013-08-11 11:49:21.000000000 +0000 @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,27 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +286,45 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +334,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +363,30 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +404,34 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +456,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +526,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +571,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -771,10 +829,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +905,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +993,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -948,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1153,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1224,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1324,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1413,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1462,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1498,14 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1528,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1543,23 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1579,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1613,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru udisks-1.0.4/configure udisks-1.0.5/configure --- udisks-1.0.4/configure 2011-08-26 15:08:43.000000000 +0000 +++ udisks-1.0.5/configure 2014-03-10 09:03:43.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for udisks 1.0.4. +# Generated by GNU Autoconf 2.69 for udisks 1.0.5. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='udisks' PACKAGE_TARNAME='udisks' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='udisks 1.0.4' +PACKAGE_VERSION='1.0.5' +PACKAGE_STRING='udisks 1.0.5' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=udisks' PACKAGE_URL='' @@ -654,10 +674,19 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE USE_NLS +HAVE_SYSTEMD_FALSE +HAVE_SYSTEMD_TRUE +systemdsystemunitdir REMOTE_ACCESS_ENABLED_FALSE REMOTE_ACCESS_ENABLED_TRUE slashsbindir @@ -700,18 +729,21 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG MAN_PAGES_ENABLED_FALSE MAN_PAGES_ENABLED_TRUE XSLTPROC -AM_BACKSLASH -AM_DEFAULT_VERBOSITY OTOOL64 OTOOL LIPO @@ -745,6 +777,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -761,6 +794,10 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -825,6 +862,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_shared @@ -835,7 +873,6 @@ with_sysroot enable_libtool_lock enable_largefile -enable_silent_rules enable_ansi enable_verbose_mode enable_man_pages @@ -848,6 +885,7 @@ enable_lvm2 enable_dmmp enable_remote_access +with_systemdsystemunitdir enable_nls ' ac_precious_vars='build_alias @@ -862,6 +900,8 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS GUDEV_CFLAGS GUDEV_LIBS GLIB_CFLAGS @@ -1339,8 +1379,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1426,7 +1464,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures udisks 1.0.4 to adapt to many kinds of systems. +\`configure' configures udisks 1.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1534,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of udisks 1.0.4:";; + short | recursive ) echo "Configuration of udisks 1.0.5:";; esac cat <<\_ACEOF @@ -1504,18 +1542,21 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') --enable-ansi enable -ansi -pedantic gcc flags --enable-verbose-mode support verbose debug mode --enable-man-pages build manual pages @@ -1532,12 +1573,14 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --with-html-dir=PATH path to installed docs + --with-systemdsystemunitdir=DIR + Directory for systemd service files Some influential environment variables: CC C compiler command @@ -1553,6 +1596,10 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config GUDEV_CFLAGS C compiler flags for GUDEV, overriding pkg-config GUDEV_LIBS linker flags for GUDEV, overriding pkg-config @@ -1655,10 +1702,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -udisks configure 1.0.4 -generated by GNU Autoconf 2.68 +udisks configure 1.0.5 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1734,7 +1781,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2024,8 +2071,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by udisks $as_me 1.0.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by udisks $as_me 1.0.5, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2372,7 +2419,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2440,7 +2487,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2498,9 +2545,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2511,32 +2555,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2548,6 +2600,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2570,12 +2632,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2587,10 +2649,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2609,7 +2671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2649,7 +2711,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2700,7 +2762,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2729,12 +2791,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2753,7 +2809,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2817,6 +2873,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2838,8 +2933,9 @@ # Define the identity of the package. + PACKAGE=udisks - VERSION=1.0.4 + VERSION=1.0.5 cat >>confdefs.h <<_ACEOF @@ -2867,18 +2963,70 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_config_headers="$ac_config_headers config.h" @@ -2924,7 +3072,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -2957,6 +3105,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -2989,7 +3138,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3029,7 +3178,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3082,7 +3231,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3123,7 +3272,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3181,7 +3330,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3225,7 +3374,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3671,8 +3820,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3757,6 +3905,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3768,8 +3975,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3803,16 +4011,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3821,16 +4029,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3963,7 +4171,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4003,7 +4211,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4056,7 +4264,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4097,7 +4305,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4155,7 +4363,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4199,7 +4407,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4395,8 +4603,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4481,6 +4688,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4492,8 +4758,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4527,16 +4794,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4545,16 +4812,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4630,7 +4897,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4670,7 +4937,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4723,7 +4990,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4764,7 +5031,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4822,7 +5089,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4866,7 +5133,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5062,8 +5329,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5148,6 +5414,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5159,8 +5484,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5194,16 +5520,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5212,16 +5538,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5275,7 +5601,6 @@ fi - am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ac_ext=c @@ -5432,7 +5757,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5498,7 +5823,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5666,8 +5991,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5845,7 +6170,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5924,7 +6249,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6180,7 +6505,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6224,7 +6549,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6382,6 +6707,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -6408,7 +6738,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -6421,7 +6752,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6643,7 +6974,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6683,7 +7014,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6809,10 +7140,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6850,12 +7177,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6989,7 +7316,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7029,7 +7356,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7132,7 +7459,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7176,7 +7503,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7301,7 +7628,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7341,7 +7668,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7400,7 +7727,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7440,7 +7767,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7490,13 +7817,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -7643,6 +7970,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7931,7 +8259,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7947,9 +8275,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7968,7 +8306,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8031,7 +8372,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -8042,7 +8383,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -8075,7 +8429,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8115,7 +8469,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8195,7 +8549,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8235,7 +8589,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8287,7 +8641,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8327,7 +8681,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8379,7 +8733,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8419,7 +8773,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8471,7 +8825,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8511,7 +8865,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8563,7 +8917,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8603,7 +8957,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8682,7 +9036,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8693,6 +9053,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -8725,6 +9086,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -8746,7 +9108,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8901,7 +9265,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8979,6 +9358,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9434,7 +9817,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -9478,7 +9863,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9525,18 +9910,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9898,7 +10298,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9942,6 +10341,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -10148,8 +10550,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -10164,7 +10565,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10341,6 +10742,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10528,6 +10930,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10573,6 +10976,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10601,10 +11005,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10617,7 +11017,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10656,7 +11056,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10797,7 +11196,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11280,11 +11679,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -11374,7 +11768,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11383,7 +11777,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11448,7 +11842,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11587,7 +11981,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11595,10 +11989,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11606,7 +11996,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11624,7 +12014,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11643,18 +12033,8 @@ esac ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11715,7 +12095,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11731,7 +12111,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11768,9 +12148,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11818,14 +12198,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11837,6 +12213,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11856,7 +12244,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11925,7 +12313,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11950,7 +12338,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11974,7 +12362,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -12005,7 +12393,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12015,7 +12403,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12797,6 +13185,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -13043,133 +13433,10 @@ esac rm -rf conftest* fi -fi - -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h fi -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Check whether --enable-silent-rules was given. @@ -13177,11 +13444,38 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -13247,7 +13541,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13288,6 +13582,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13308,7 +13603,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13351,7 +13646,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13403,16 +13698,79 @@ fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + + gtk_doc_requires="gtk-doc >= 1.3" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13421,8 +13779,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -13433,10 +13791,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13463,7 +13821,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13507,7 +13865,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13549,23 +13907,91 @@ fi - if test x$enable_gtk_doc = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.3") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - : + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - as_fn_error $? "You need to have gtk-doc >= 1.3 installed to build $PACKAGE_NAME" "$LINENO" 5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : @@ -13586,6 +14012,18 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + + + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -13770,6 +14208,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 147" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13786,6 +14225,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 147" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13805,9 +14245,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0 >= 147" 2>&1` else - GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0 >= 147" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUDEV_PKG_ERRORS" >&5 @@ -13822,7 +14262,6 @@ Alternatively, you may set the environment variables GUDEV_CFLAGS and GUDEV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13838,7 +14277,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS GUDEV_LIBS=$pkg_cv_GUDEV_LIBS @@ -13864,6 +14302,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13880,6 +14319,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13899,9 +14339,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.6.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.6.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.6.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.6.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -13916,7 +14356,6 @@ Alternatively, you may set the environment variables GLIB_CFLAGS and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13932,7 +14371,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -13958,6 +14396,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.15.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13974,6 +14413,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.15.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13993,9 +14433,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= 2.15.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.15.0" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= 2.15.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.15.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 @@ -14010,7 +14450,6 @@ Alternatively, you may set the environment variables GIO_CFLAGS and GIO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14026,7 +14465,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS GIO_LIBS=$pkg_cv_GIO_LIBS @@ -14052,6 +14490,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14068,6 +14507,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14087,9 +14527,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -14104,7 +14544,6 @@ Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14120,7 +14559,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -14146,6 +14584,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.82" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14162,6 +14601,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.82" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14181,9 +14621,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.82" 2>&1` + DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.82" 2>&1` else - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.82" 2>&1` + DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.82" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_GLIB_PKG_ERRORS" >&5 @@ -14198,7 +14638,6 @@ Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS and DBUS_GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14214,7 +14653,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS @@ -14240,6 +14678,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_GOBJECT_1_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= 0.97" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14256,6 +14695,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_GOBJECT_1_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= 0.97" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14275,9 +14715,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POLKIT_GOBJECT_1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= 0.97" 2>&1` + POLKIT_GOBJECT_1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1` else - POLKIT_GOBJECT_1_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= 0.97" 2>&1` + POLKIT_GOBJECT_1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$POLKIT_GOBJECT_1_PKG_ERRORS" >&5 @@ -14292,7 +14732,6 @@ Alternatively, you may set the environment variables POLKIT_GOBJECT_1_CFLAGS and POLKIT_GOBJECT_1_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14308,7 +14747,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else POLKIT_GOBJECT_1_CFLAGS=$pkg_cv_POLKIT_GOBJECT_1_CFLAGS POLKIT_GOBJECT_1_LIBS=$pkg_cv_POLKIT_GOBJECT_1_LIBS @@ -14334,6 +14772,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPARTED_CFLAGS=`$PKG_CONFIG --cflags "libparted >= 1.8.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14350,6 +14789,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPARTED_LIBS=`$PKG_CONFIG --libs "libparted >= 1.8.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14369,9 +14809,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libparted >= 1.8.8" 2>&1` + LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libparted >= 1.8.8" 2>&1` else - LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors "libparted >= 1.8.8" 2>&1` + LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libparted >= 1.8.8" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBPARTED_PKG_ERRORS" >&5 @@ -14386,7 +14826,6 @@ Alternatively, you may set the environment variables LIBPARTED_CFLAGS and LIBPARTED_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14402,7 +14841,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBPARTED_CFLAGS=$pkg_cv_LIBPARTED_CFLAGS LIBPARTED_LIBS=$pkg_cv_LIBPARTED_LIBS @@ -14428,6 +14866,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DEVMAPPER_CFLAGS=`$PKG_CONFIG --cflags "devmapper >= 1.02" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14444,6 +14883,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DEVMAPPER_LIBS=`$PKG_CONFIG --libs "devmapper >= 1.02" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14463,9 +14903,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "devmapper >= 1.02" 2>&1` + DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "devmapper >= 1.02" 2>&1` else - DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --print-errors "devmapper >= 1.02" 2>&1` + DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "devmapper >= 1.02" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEVMAPPER_PKG_ERRORS" >&5 @@ -14480,7 +14920,6 @@ Alternatively, you may set the environment variables DEVMAPPER_CFLAGS and DEVMAPPER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14496,7 +14935,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DEVMAPPER_CFLAGS=$pkg_cv_DEVMAPPER_CFLAGS DEVMAPPER_LIBS=$pkg_cv_DEVMAPPER_LIBS @@ -14529,6 +14967,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LVM2_CFLAGS=`$PKG_CONFIG --cflags "lvm2app >= 2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14545,6 +14984,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LVM2_LIBS=`$PKG_CONFIG --libs "lvm2app >= 2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14564,9 +15004,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LVM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lvm2app >= 2.2" 2>&1` + LVM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lvm2app >= 2.2" 2>&1` else - LVM2_PKG_ERRORS=`$PKG_CONFIG --print-errors "lvm2app >= 2.2" 2>&1` + LVM2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lvm2app >= 2.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LVM2_PKG_ERRORS" >&5 @@ -14636,6 +15076,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBATASMART_CFLAGS=`$PKG_CONFIG --cflags "libatasmart >= 0.14" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14652,6 +15093,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBATASMART_LIBS=`$PKG_CONFIG --libs "libatasmart >= 0.14" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14671,9 +15113,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBATASMART_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libatasmart >= 0.14" 2>&1` + LIBATASMART_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libatasmart >= 0.14" 2>&1` else - LIBATASMART_PKG_ERRORS=`$PKG_CONFIG --print-errors "libatasmart >= 0.14" 2>&1` + LIBATASMART_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libatasmart >= 0.14" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBATASMART_PKG_ERRORS" >&5 @@ -14688,7 +15130,6 @@ Alternatively, you may set the environment variables LIBATASMART_CFLAGS and LIBATASMART_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14704,7 +15145,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBATASMART_CFLAGS=$pkg_cv_LIBATASMART_CFLAGS LIBATASMART_LIBS=$pkg_cv_LIBATASMART_LIBS @@ -14730,6 +15170,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 143" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14746,6 +15187,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 143" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14765,9 +15207,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= 143" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 143" 2>&1` else - LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 143" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 143" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBUDEV_PKG_ERRORS" >&5 @@ -14782,7 +15224,6 @@ Alternatively, you may set the environment variables LIBUDEV_CFLAGS and LIBUDEV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14798,7 +15239,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS @@ -14847,6 +15287,28 @@ fi +# systemd + +# Check whether --with-systemdsystemunitdir was given. +if test "${with_systemdsystemunitdir+set}" = set; then : + withval=$with_systemdsystemunitdir; +else + with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) +fi + +if test "x$with_systemdsystemunitdir" != "xno"; then + systemdsystemunitdir=$with_systemdsystemunitdir + +fi + if test -n "$systemdsystemunitdir"; then + HAVE_SYSTEMD_TRUE= + HAVE_SYSTEMD_FALSE='#' +else + HAVE_SYSTEMD_TRUE='#' + HAVE_SYSTEMD_FALSE= +fi + + # ******************** # Internationalization # ******************** @@ -14875,14 +15337,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.36.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.36.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.36.0" >&5 $as_echo_n "checking for intltool >= 0.36.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.36.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -14907,7 +15367,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14947,7 +15407,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14987,7 +15447,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15013,25 +15473,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -15148,7 +15631,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15188,7 +15671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15228,7 +15711,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15268,7 +15751,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15319,7 +15802,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15350,7 +15833,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -15909,7 +16392,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15996,6 +16479,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -16217,7 +16704,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -16232,6 +16718,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16264,6 +16758,10 @@ as_fn_error $? "conditional \"MAN_PAGES_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16296,6 +16794,10 @@ as_fn_error $? "conditional \"REMOTE_ACCESS_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi ac_config_commands="$ac_config_commands po/stamp-it" @@ -16598,16 +17100,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16667,28 +17169,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16709,8 +17199,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by udisks $as_me 1.0.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by udisks $as_me 1.0.5, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16775,11 +17265,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -udisks config.status 1.0.4 -configured by $0, generated by GNU Autoconf 2.68, +udisks config.status 1.0.5 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16870,7 +17360,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -16912,6 +17402,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -16994,7 +17485,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -17050,6 +17540,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -17100,7 +17591,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -17797,7 +18287,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -17810,7 +18300,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -17844,21 +18334,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -17912,8 +18400,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17967,6 +18455,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -18268,10 +18759,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -18599,6 +19086,7 @@ docdir: ${docdir} slashlibdir: ${slashlibdir} slashsbindir: ${slashsbindir} + systemdsystemunitdir: ${systemdsystemunitdir} compiler: ${CC} cflags: ${CFLAGS} diff -Nru udisks-1.0.4/configure.ac udisks-1.0.5/configure.ac --- udisks-1.0.4/configure.ac 2011-08-26 15:08:35.000000000 +0000 +++ udisks-1.0.5/configure.ac 2014-03-10 08:57:48.000000000 +0000 @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59c) -AC_INIT(udisks, 1.0.4, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks) -AM_INIT_AUTOMAKE(udisks, 1.0.4) +AC_INIT(udisks, 1.0.5, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks) +AM_INIT_AUTOMAKE(udisks, 1.0.5) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -218,6 +218,16 @@ fi AM_CONDITIONAL(REMOTE_ACCESS_ENABLED, [test "$remote_access" = "yes"]) +# systemd +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], + [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != "xno"; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) + # ******************** # Internationalization # ******************** @@ -261,6 +271,7 @@ docdir: ${docdir} slashlibdir: ${slashlibdir} slashsbindir: ${slashsbindir} + systemdsystemunitdir: ${systemdsystemunitdir} compiler: ${CC} cflags: ${CFLAGS} diff -Nru udisks-1.0.4/data/80-udisks.rules udisks-1.0.5/data/80-udisks.rules --- udisks-1.0.4/data/80-udisks.rules 2011-08-25 21:31:20.000000000 +0000 +++ udisks-1.0.5/data/80-udisks.rules 2014-03-10 08:57:48.000000000 +0000 @@ -137,6 +137,7 @@ # Realtek card readers DRIVERS=="rts_pstor", ENV{ID_DRIVE_FLASH_SD}="1" +DRIVERS=="rts_bpp", ENV{ID_DRIVE_FLASH_SD}="1" # Common theme # @@ -179,20 +180,24 @@ # Partitions which desktops should not display # +# (note that RAID/LVM members are not normally shown in an user +# interface so setting UDISKS__PRESENTATION_HIDE at first does not +# seem to achieve anything. However it helps for RAID/LVM members that +# are encrypted using LUKS. See bug #51439.) # Apple Bootstrap partitions ENV{UDISKS_PARTITION_SCHEME}=="apm", ENV{UDISKS_PARTITION_TYPE}=="Apple_Bootstrap", ENV{UDISKS_PRESENTATION_HIDE}="1" -# special MBR partition types (EFI, hidden, etc.) +# special MBR partition types (EFI, hidden, etc.) and RAID/LVM # see http://www.win.tue.nl/~aeb/partitions/partition_types-1.html ENV{UDISKS_PARTITION_SCHEME}=="mbr", \ - ENV{UDISKS_PARTITION_TYPE}=="0x00|0x11|0x12|0x14|0x16|0x17|0x1b|0x1c|0x1e|0x27|0x3d|0x84|0x8d|0x90|0x91|0x92|0x93|0x97|0x98|0x9a|0x9b|0xbb|0xc2|0xc3|0xdd|0xef", \ + ENV{UDISKS_PARTITION_TYPE}=="0x00|0x11|0x12|0x14|0x16|0x17|0x1b|0x1c|0x1e|0x27|0x3d|0x84|0x8d|0x8e|0x90|0x91|0x92|0x93|0x97|0x98|0x9a|0x9b|0xbb|0xc2|0xc3|0xdd|0xef|0xfd", \ ENV{UDISKS_PRESENTATION_HIDE}="1" # special GUID-identified partition types # see http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs ENV{UDISKS_PARTITION_SCHEME}=="gpt", \ - ENV{UDISKS_PARTITION_TYPE}=="C12A7328-F81F-11D2-BA4B-00A0C93EC93B|21686148-6449-6E6F-744E-656564454649", \ + ENV{UDISKS_PARTITION_TYPE}=="C12A7328-F81F-11D2-BA4B-00A0C93EC93B|21686148-6449-6E6F-744E-656564454649|A19D880F-05FC-4D3B-A006-743F0F84911E|E6D6D379-F507-44C2-A23C-238F2A3DF928", \ ENV{UDISKS_PRESENTATION_HIDE}="1" # APM recovery/tool partitions which are useless on Linux diff -Nru udisks-1.0.4/data/Makefile.am udisks-1.0.5/data/Makefile.am --- udisks-1.0.4/data/Makefile.am 2011-08-25 18:27:33.000000000 +0000 +++ udisks-1.0.5/data/Makefile.am 2014-03-10 08:57:48.000000000 +0000 @@ -24,6 +24,16 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ +systemdservice_in_files = systemd/udisks.service.in + +if HAVE_SYSTEMD +systemdservicedir = $(systemdsystemunitdir) +systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) + +$(systemdservice_DATA): $(systemdservice_in_files) Makefile + @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ +endif + udevrulesdir = $(slashlibdir)/udev/rules.d udevrules_DATA = 80-udisks.rules @@ -38,6 +48,7 @@ EXTRA_DIST = \ 80-udisks.rules \ $(dbusif_DATA) \ + $(systemdservice_in_files) \ $(service_in_files) \ $(dbusconf_in_files) \ udisks.pc.in \ @@ -45,4 +56,4 @@ $(NULL) clean-local : - rm -f *~ $(service_DATA) $(dbusconf_DATA) + rm -f *~ $(service_DATA) $(dbusconf_DATA) $(systemdservice_DATA) diff -Nru udisks-1.0.4/data/Makefile.in udisks-1.0.5/data/Makefile.in --- udisks-1.0.4/data/Makefile.in 2011-08-26 15:08:42.000000000 +0000 +++ udisks-1.0.5/data/Makefile.in 2014-03-10 09:04:33.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/udisks.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -45,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = udisks.pc CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -74,12 +129,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(avahiservicedir)" \ "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusifdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(servicedir)" \ - "$(DESTDIR)$(udevrulesdir)" + "$(DESTDIR)$(systemdservicedir)" "$(DESTDIR)$(udevrulesdir)" DATA = $(avahiservice_DATA) $(dbusconf_DATA) $(dbusif_DATA) \ - $(pkgconfig_DATA) $(service_DATA) $(udevrules_DATA) + $(pkgconfig_DATA) $(service_DATA) $(systemdservice_DATA) \ + $(udevrules_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -125,6 +188,9 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ @@ -141,6 +207,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ @@ -232,6 +302,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -249,6 +321,7 @@ slashsbindir = @slashsbindir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -269,6 +342,9 @@ dbusconfdir = $(sysconfdir)/dbus-1/system.d dbusconf_in_files = org.freedesktop.UDisks.conf.in dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) +systemdservice_in_files = systemd/udisks.service.in +@HAVE_SYSTEMD_TRUE@systemdservicedir = $(systemdsystemunitdir) +@HAVE_SYSTEMD_TRUE@systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) udevrulesdir = $(slashlibdir)/udev/rules.d udevrules_DATA = 80-udisks.rules pkgconfigdir = $(datadir)/pkgconfig @@ -278,6 +354,7 @@ EXTRA_DIST = \ 80-udisks.rules \ $(dbusif_DATA) \ + $(systemdservice_in_files) \ $(service_in_files) \ $(dbusconf_in_files) \ udisks.pc.in \ @@ -327,8 +404,11 @@ -rm -rf .libs _libs install-avahiserviceDATA: $(avahiservice_DATA) @$(NORMAL_INSTALL) - test -z "$(avahiservicedir)" || $(MKDIR_P) "$(DESTDIR)$(avahiservicedir)" @list='$(avahiservice_DATA)'; test -n "$(avahiservicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(avahiservicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(avahiservicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -342,13 +422,14 @@ @$(NORMAL_UNINSTALL) @list='$(avahiservice_DATA)'; test -n "$(avahiservicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(avahiservicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(avahiservicedir)" && rm -f $$files + dir='$(DESTDIR)$(avahiservicedir)'; $(am__uninstall_files_from_dir) install-dbusconfDATA: $(dbusconf_DATA) @$(NORMAL_INSTALL) - test -z "$(dbusconfdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)" @list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -362,13 +443,14 @@ @$(NORMAL_UNINSTALL) @list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbusconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbusconfdir)" && rm -f $$files + dir='$(DESTDIR)$(dbusconfdir)'; $(am__uninstall_files_from_dir) install-dbusifDATA: $(dbusif_DATA) @$(NORMAL_INSTALL) - test -z "$(dbusifdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusifdir)" @list='$(dbusif_DATA)'; test -n "$(dbusifdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusifdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusifdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -382,13 +464,14 @@ @$(NORMAL_UNINSTALL) @list='$(dbusif_DATA)'; test -n "$(dbusifdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbusifdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbusifdir)" && rm -f $$files + dir='$(DESTDIR)$(dbusifdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -402,13 +485,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -422,13 +506,35 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) +install-systemdserviceDATA: $(systemdservice_DATA) + @$(NORMAL_INSTALL) + @list='$(systemdservice_DATA)'; test -n "$(systemdservicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdservicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdservicedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdservicedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdservicedir)" || exit $$?; \ + done + +uninstall-systemdserviceDATA: + @$(NORMAL_UNINSTALL) + @list='$(systemdservice_DATA)'; test -n "$(systemdservicedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(systemdservicedir)'; $(am__uninstall_files_from_dir) install-udevrulesDATA: $(udevrules_DATA) @$(NORMAL_INSTALL) - test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -442,14 +548,12 @@ @$(NORMAL_UNINSTALL) @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(udevrulesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(udevrulesdir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -486,7 +590,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(avahiservicedir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusifdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(udevrulesdir)"; do \ + for dir in "$(DESTDIR)$(avahiservicedir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusifdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdservicedir)" "$(DESTDIR)$(udevrulesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -499,10 +603,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -536,7 +645,7 @@ install-data-am: install-avahiserviceDATA install-dbusconfDATA \ install-dbusifDATA install-pkgconfigDATA install-serviceDATA \ - install-udevrulesDATA + install-systemdserviceDATA install-udevrulesDATA install-dvi: install-dvi-am @@ -582,25 +691,27 @@ uninstall-am: uninstall-avahiserviceDATA uninstall-dbusconfDATA \ uninstall-dbusifDATA uninstall-pkgconfigDATA \ - uninstall-serviceDATA uninstall-udevrulesDATA + uninstall-serviceDATA uninstall-systemdserviceDATA \ + uninstall-udevrulesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-avahiserviceDATA install-data \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-avahiserviceDATA install-data \ install-data-am install-dbusconfDATA install-dbusifDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-pkgconfigDATA \ install-ps install-ps-am install-serviceDATA install-strip \ - install-udevrulesDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-avahiserviceDATA \ - uninstall-dbusconfDATA uninstall-dbusifDATA \ - uninstall-pkgconfigDATA uninstall-serviceDATA \ + install-systemdserviceDATA install-udevrulesDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-avahiserviceDATA uninstall-dbusconfDATA \ + uninstall-dbusifDATA uninstall-pkgconfigDATA \ + uninstall-serviceDATA uninstall-systemdserviceDATA \ uninstall-udevrulesDATA @@ -610,8 +721,11 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ +@HAVE_SYSTEMD_TRUE@$(systemdservice_DATA): $(systemdservice_in_files) Makefile +@HAVE_SYSTEMD_TRUE@ @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ + clean-local : - rm -f *~ $(service_DATA) $(dbusconf_DATA) + rm -f *~ $(service_DATA) $(dbusconf_DATA) $(systemdservice_DATA) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru udisks-1.0.4/data/org.freedesktop.UDisks.service.in udisks-1.0.5/data/org.freedesktop.UDisks.service.in --- udisks-1.0.4/data/org.freedesktop.UDisks.service.in 2011-08-25 18:27:33.000000000 +0000 +++ udisks-1.0.5/data/org.freedesktop.UDisks.service.in 2014-03-10 08:57:48.000000000 +0000 @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.freedesktop.UDisks -Exec=@libexecdir@/udisks-daemon +Exec=@libexecdir@/udisks-daemon --no-debug User=root - +SystemdService=udisks.service diff -Nru udisks-1.0.4/data/systemd/udisks.service.in udisks-1.0.5/data/systemd/udisks.service.in --- udisks-1.0.4/data/systemd/udisks.service.in 1970-01-01 00:00:00.000000000 +0000 +++ udisks-1.0.5/data/systemd/udisks.service.in 2014-03-10 08:57:48.000000000 +0000 @@ -0,0 +1,8 @@ +[Unit] +Description=Disk Manager (legacy version) +Documentation=man:udisks(7) + +[Service] +Type=dbus +BusName=org.freedesktop.UDisks +ExecStart=@libexecdir@/udisks-daemon --no-debug diff -Nru udisks-1.0.4/debian/changelog udisks-1.0.5/debian/changelog --- udisks-1.0.4/debian/changelog 2013-10-07 14:46:53.000000000 +0000 +++ udisks-1.0.5/debian/changelog 2014-03-10 10:10:52.000000000 +0000 @@ -1,9 +1,20 @@ -udisks (1.0.4-8ubuntu1) saucy; urgency=low +udisks (1.0.5-1) unstable; urgency=high - * Use dh-autoreconf to update config.{sub,guess} to fix FTBFS on arm64. - (LP: #1235051) + * New upstream security/bug fix release. Fixes buffer overflow in mount path + parsing. (CVE-2014-0004, LP: #1288226) + * Drop 00git_fix_smart_test.patch, 00git_rts_bpp_sdcard.patch: contained in + this upstream release. + * Replace Debian specific systemd integration with upstream's: + - Drop 11-systemd-service.patch and udisks.service. + - debian/rules: Configure with --with-systemdsystemunitdir. + - debian/udisks.install: Adjust .service path. + * Use dh-autoreconf to update config.{sub,guess} for new ports. + Thanks Dann Frazier. (LP: #1235051) + * Add 15-dont-watch-lvm.patch: Stop udev-watching devmapper devices. It is + not necessary any more with current kernels/LVM and breaks removal of + snapshots. (Closes: #721303) - -- dann frazier Thu, 03 Oct 2013 17:27:36 -0600 + -- Martin Pitt Mon, 10 Mar 2014 11:09:46 +0100 udisks (1.0.4-8) unstable; urgency=low diff -Nru udisks-1.0.4/debian/control udisks-1.0.5/debian/control --- udisks-1.0.4/debian/control 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/control 2014-03-10 10:10:52.000000000 +0000 @@ -1,8 +1,7 @@ Source: udisks Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Utopia Maintenance Team +Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl , Martin Pitt Build-Depends: debhelper (>= 8), autotools-dev, diff -Nru udisks-1.0.4/debian/patches/00git_fix_smart_test.patch udisks-1.0.5/debian/patches/00git_fix_smart_test.patch --- udisks-1.0.4/debian/patches/00git_fix_smart_test.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/00git_fix_smart_test.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From 3643b38e70f5ea30b7037d8b3e7aa6df0195c861 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 11 Nov 2011 16:41:13 +0100 -Subject: [PATCH] tests/run: Fix crash if first hard disk is not SMART capable - ---- - tests/run | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/tests/run b/tests/run -index 2fae2c8..fca6503 100755 ---- a/tests/run -+++ b/tests/run -@@ -1223,6 +1223,7 @@ class Smart(UDisksTestCase): - self.assertEqual(e._dbus_error_name, 'org.freedesktop.UDisks.Error.Failed') - else: - sys.stderr.write('[N/A] ') -+ info = self.get_info(devname=hd) - self.assertEqual(info['ATA SMART'], 'not available') - self.assertEqual(props.Get(I_D, 'DriveAtaSmartTimeCollected'), 0) - self.assertEqual(props.Get(I_D, 'DriveAtaSmartBlob'), []) --- -1.7.7.1 - diff -Nru udisks-1.0.4/debian/patches/00git_media_card_device_tags.patch udisks-1.0.5/debian/patches/00git_media_card_device_tags.patch --- udisks-1.0.4/debian/patches/00git_media_card_device_tags.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/00git_media_card_device_tags.patch 2014-03-10 10:10:52.000000000 +0000 @@ -4,9 +4,9 @@ Index: udisks/data/80-udisks.rules =================================================================== ---- udisks.orig/data/80-udisks.rules 2011-11-11 16:44:35.952825890 +0100 -+++ udisks/data/80-udisks.rules 2012-03-30 07:35:08.254419828 +0200 -@@ -146,6 +146,11 @@ +--- udisks.orig/data/80-udisks.rules 2014-03-10 11:01:55.932715419 +0100 ++++ udisks/data/80-udisks.rules 2014-03-10 11:01:55.928715419 +0100 +@@ -147,6 +147,11 @@ SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*SM_Reader*", ENV{ID_DRIVE_FLASH_SM}="1" SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*MS_Reader*", ENV{ID_DRIVE_FLASH_MS}="1" diff -Nru udisks-1.0.4/debian/patches/00git_rts_bpp_sdcard.patch udisks-1.0.5/debian/patches/00git_rts_bpp_sdcard.patch --- udisks-1.0.4/debian/patches/00git_rts_bpp_sdcard.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/00git_rts_bpp_sdcard.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From ae2baf66dd73a14e88608ae9aca8b5d4be116b57 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Thu, 12 Apr 2012 12:20:23 +0200 -Subject: [PATCH] Mark rts_bpp devices as SD card readers - -Similar to commit cd0644df. - -https://launchpad.net/bugs/971876 ---- - data/80-udisks.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/80-udisks.rules b/data/80-udisks.rules -index 6720394..6ac526c 100644 ---- a/data/80-udisks.rules -+++ b/data/80-udisks.rules -@@ -137,6 +137,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="8403", ENV{ID_DRI - - # Realtek card readers - DRIVERS=="rts_pstor", ENV{ID_DRIVE_FLASH_SD}="1" -+DRIVERS=="rts_bpp", ENV{ID_DRIVE_FLASH_SD}="1" - - # Common theme - # --- -1.7.9.5 - diff -Nru udisks-1.0.4/debian/patches/02-defer_smart_probing.patch udisks-1.0.5/debian/patches/02-defer_smart_probing.patch --- udisks-1.0.4/debian/patches/02-defer_smart_probing.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/02-defer_smart_probing.patch 2014-03-10 10:10:52.000000000 +0000 @@ -18,8 +18,8 @@ Index: udisks/src/device.c =================================================================== ---- udisks.orig/src/device.c 2011-06-29 18:16:14.521696991 +0200 -+++ udisks/src/device.c 2011-08-30 00:40:44.572260123 +0200 +--- udisks.orig/src/device.c 2014-03-10 11:02:07.508715776 +0100 ++++ udisks/src/device.c 2014-03-10 11:02:07.504715776 +0100 @@ -5094,6 +5094,32 @@ force_removal (device, NULL, NULL); } @@ -53,7 +53,7 @@ Device * device_new (Daemon *daemon, GUdevDevice *d) -@@ -5140,9 +5166,8 @@ +@@ -5147,9 +5173,8 @@ /* if just added, update the smart data if applicable */ if (device->priv->drive_ata_smart_is_available) { diff -Nru udisks-1.0.4/debian/patches/11-systemd-service.patch udisks-1.0.5/debian/patches/11-systemd-service.patch --- udisks-1.0.4/debian/patches/11-systemd-service.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/11-systemd-service.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Index: udisks/data/org.freedesktop.UDisks.service.in -=================================================================== ---- udisks.orig/data/org.freedesktop.UDisks.service.in 2011-06-29 18:16:14.000000000 +0200 -+++ udisks/data/org.freedesktop.UDisks.service.in 2012-02-11 16:39:57.804348611 +0100 -@@ -2,4 +2,4 @@ - Name=org.freedesktop.UDisks - Exec=@libexecdir@/udisks-daemon - User=root -- -+SystemdService=udisks.service diff -Nru udisks-1.0.4/debian/patches/12-bogus-uevent-paths.patch udisks-1.0.5/debian/patches/12-bogus-uevent-paths.patch --- udisks-1.0.4/debian/patches/12-bogus-uevent-paths.patch 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/12-bogus-uevent-paths.patch 2014-03-10 10:10:52.000000000 +0000 @@ -43,13 +43,13 @@ src/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) -diff --git a/src/device.c b/src/device.c -index f24cb88..2ae7f38 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -5108,6 +5108,13 @@ device_new (Daemon *daemon, - if (g_str_has_prefix (native_path, "/sys/devices/virtual/block/ram")) - goto out; +Index: udisks/src/device.c +=================================================================== +--- udisks.orig/src/device.c 2014-03-10 11:02:13.924715974 +0100 ++++ udisks/src/device.c 2014-03-10 11:02:13.920715974 +0100 +@@ -5141,6 +5141,13 @@ + goto out; + } + /* ignore bogus events */ + if (!g_file_test (native_path, G_FILE_TEST_EXISTS)) @@ -61,6 +61,3 @@ PROFILE ("device_new(native_path=%s): start", native_path); device = DEVICE (g_object_new (TYPE_DEVICE, NULL)); --- -1.7.9.1 - diff -Nru udisks-1.0.4/debian/patches/15-dont-watch-lvm.patch udisks-1.0.5/debian/patches/15-dont-watch-lvm.patch --- udisks-1.0.4/debian/patches/15-dont-watch-lvm.patch 1970-01-01 00:00:00.000000000 +0000 +++ udisks-1.0.5/debian/patches/15-dont-watch-lvm.patch 2014-03-10 10:10:52.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Stop udev-watching devmapper devices. It is not necessary any more with current kernels/LVM and breaks removal of snapshots. +Bug-Debian: https://bugs.debian.org/721303 +Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=577798 + +Index: udisks/data/80-udisks.rules +=================================================================== +--- udisks.orig/data/80-udisks.rules 2014-03-05 14:34:18.799660864 +0100 ++++ udisks/data/80-udisks.rules 2014-03-05 14:34:57.775660509 +0100 +@@ -56,10 +56,6 @@ + # + KERNEL=="dm-*", IMPORT{program}="udisks-dm-export %M %m" + +-# Make udevd synthesize a 'change' uevent when last opener of a rw-fd closes the fd - this +-# should be part of the device-mapper rules +-KERNEL=="dm-*", OPTIONS+="watch" +- + ############################################################################################################## + # Probe LVM2 Physical Volumes - this will eventually be part of the LVM2 package + diff -Nru udisks-1.0.4/debian/patches/series udisks-1.0.5/debian/patches/series --- udisks-1.0.4/debian/patches/series 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/patches/series 2014-03-10 10:10:52.000000000 +0000 @@ -1,14 +1,12 @@ # Debian patches for udisks -00git_fix_smart_test.patch 00git_media_card_device_tags.patch -00git_rts_bpp_sdcard.patch 02-defer_smart_probing.patch 05-german-translations.patch #08-dont-probe-dm-devices.patch 06-test-for-mdadm.patch 07-fix-typos-udisks-man-page.patch 10-po-pt_BR.patch -11-systemd-service.patch 12-bogus-uevent-paths.patch 13-dosfslabel.patch 14-test-for-pci-db.patch +15-dont-watch-lvm.patch diff -Nru udisks-1.0.4/debian/rules udisks-1.0.5/debian/rules --- udisks-1.0.4/debian/rules 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/rules 2014-03-10 10:10:52.000000000 +0000 @@ -7,7 +7,8 @@ dh_auto_configure -- \ --enable-gtk-doc \ --disable-dmmp \ - --enable-lvm2 + --enable-lvm2 \ + --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_build: dh_auto_build diff -Nru udisks-1.0.4/debian/udisks.install udisks-1.0.5/debian/udisks.install --- udisks-1.0.4/debian/udisks.install 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/udisks.install 2014-03-10 10:10:52.000000000 +0000 @@ -1,5 +1,6 @@ etc/dbus-1/ etc/avahi/ +lib/systemd/ lib/udev/ sbin/ usr/bin/ @@ -9,4 +10,3 @@ usr/share/locale/ usr/share/man/ usr/share/pkgconfig/ -debian/udisks.service lib/systemd/system/ diff -Nru udisks-1.0.4/debian/udisks.service udisks-1.0.5/debian/udisks.service --- udisks-1.0.4/debian/udisks.service 2013-10-07 14:39:45.000000000 +0000 +++ udisks-1.0.5/debian/udisks.service 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -[Unit] -Description=Storage Daemon - -[Service] -Type=dbus -BusName=org.freedesktop.UDisks -ExecStart=/usr/lib/udisks/udisks-daemon --no-debug diff -Nru udisks-1.0.4/depcomp udisks-1.0.5/depcomp --- udisks-1.0.4/depcomp 2010-03-29 11:21:24.000000000 +0000 +++ udisks-1.0.5/depcomp 2014-01-02 19:14:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru udisks-1.0.4/doc/dbus/Makefile.in udisks-1.0.5/doc/dbus/Makefile.in --- udisks-1.0.4/doc/dbus/Makefile.in 2011-08-26 15:08:42.000000000 +0000 +++ udisks-1.0.5/doc/dbus/Makefile.in 2014-03-10 09:04:33.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc/dbus -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -43,14 +87,26 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -96,6 +152,9 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ @@ -112,6 +171,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ @@ -203,6 +266,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -220,6 +285,7 @@ slashsbindir = @slashsbindir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -264,11 +330,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -315,10 +381,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -399,16 +470,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am all : org.freedesktop.UDisks.ref.xml org.freedesktop.UDisks.Device.ref.xml org.freedesktop.UDisks.Adapter.ref.xml org.freedesktop.UDisks.Port.ref.xml org.freedesktop.UDisks.Expander.ref.xml diff -Nru udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Adapter.ref.xml udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Adapter.ref.xml --- udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Adapter.ref.xml 2011-08-25 21:16:13.000000000 +0000 +++ udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Adapter.ref.xml 2014-03-10 09:04:46.000000000 +0000 @@ -13,7 +13,7 @@ Signals - Changed () + Changed() @@ -26,12 +26,12 @@ Properties - 'NativePath' read 's' -'Vendor' read 's' -'Model' read 's' -'Driver' read 's' -'NumPorts' read 'u' -'Fabric' read 's' + 'NativePath'read's' +'Vendor'read's' +'Model'read's' +'Driver'read's' +'NumPorts'read'u' +'Fabric'read's' @@ -60,7 +60,7 @@ NativePath Adapter - 'NativePath' read 's' + 'NativePath'read's' @@ -73,7 +73,7 @@ Vendor Adapter - 'Vendor' read 's' + 'Vendor'read's' @@ -86,7 +86,7 @@ Model Adapter - 'Model' read 's' + 'Model'read's' @@ -99,7 +99,7 @@ Driver Adapter - 'Driver' read 's' + 'Driver'read's' @@ -112,7 +112,7 @@ NumPorts Adapter - 'NumPorts' read 'u' + 'NumPorts'read'u' @@ -129,7 +129,7 @@ Fabric Adapter - 'Fabric' read 's' + 'Fabric'read's' diff -Nru udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Device.ref.xml udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Device.ref.xml --- udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Device.ref.xml 2011-08-25 21:16:13.000000000 +0000 +++ udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Device.ref.xml 2014-03-10 09:04:46.000000000 +0000 @@ -9,76 +9,76 @@ Methods - JobCancel () -PartitionTableCreate (in 's' scheme, - in 'as' options) -PartitionDelete (in 'as' options) -PartitionCreate (in 't' offset, - in 't' size, - in 's' type, - in 's' label, - in 'as' flags, - in 'as' options, - in 's' fstype, - in 'as' fsoptions, - out 'o' created_device) -PartitionModify (in 's' type, - in 's' label, - in 'as' flags) -FilesystemCreate (in 's' fstype, - in 'as' options) -FilesystemSetLabel (in 's' new_label) -FilesystemMount (in 's' filesystem_type, - in 'as' options, - out 's' mount_path) -FilesystemUnmount (in 'as' options) -FilesystemCheck (in 'as' options, - out 'b' is_clean) -FilesystemListOpenFiles (out 'a(uus)' processes) -LuksUnlock (in 's' passphrase, - in 'as' options, - out 'o' cleartext_device) -LuksLock (in 'as' options) -LuksChangePassphrase (in 's' current_passphrase, - in 's' new_passphrase) -LinuxMdAddSpare (in 'o' component, - in 'as' options) -LinuxMdExpand (in 'ao' components, - in 'as' options) -LinuxMdRemoveComponent (in 'o' component, - in 'as' options) -LinuxMdStop (in 'as' options) -LinuxLvm2LVStop (in 'as' options) -LinuxMdCheck (in 'as' options, - out 't' number_of_errors) -DriveInhibitPolling (in 'as' options, - out 's' cookie) -DriveUninhibitPolling (in 's' cookie) -DrivePollMedia () -DriveEject (in 'as' options) -DriveDetach (in 'as' options) -DriveSetSpindownTimeout (in 'i' timeout_seconds, - in 'as' options, - out 's' cookie) -DriveUnsetSpindownTimeout (in 's' cookie) -DriveAtaSmartRefreshData (in 'as' options) -DriveAtaSmartInitiateSelftest (in 's' test, - in 'as' options) -DriveBenchmark (in 'b' do_write_benchmark, - in 'as' options, - out 'a(td)' read_transfer_rate_results, - out 'a(td)' write_transfer_rate_results, - out 'a(td)' access_time_results) + JobCancel() +PartitionTableCreate(in's'scheme, +in'as'options) +PartitionDelete(in'as'options) +PartitionCreate(in't'offset, +in't'size, +in's'type, +in's'label, +in'as'flags, +in'as'options, +in's'fstype, +in'as'fsoptions, +out'o'created_device) +PartitionModify(in's'type, +in's'label, +in'as'flags) +FilesystemCreate(in's'fstype, +in'as'options) +FilesystemSetLabel(in's'new_label) +FilesystemMount(in's'filesystem_type, +in'as'options, +out's'mount_path) +FilesystemUnmount(in'as'options) +FilesystemCheck(in'as'options, +out'b'is_clean) +FilesystemListOpenFiles(out'a(uus)'processes) +LuksUnlock(in's'passphrase, +in'as'options, +out'o'cleartext_device) +LuksLock(in'as'options) +LuksChangePassphrase(in's'current_passphrase, +in's'new_passphrase) +LinuxMdAddSpare(in'o'component, +in'as'options) +LinuxMdExpand(in'ao'components, +in'as'options) +LinuxMdRemoveComponent(in'o'component, +in'as'options) +LinuxMdStop(in'as'options) +LinuxLvm2LVStop(in'as'options) +LinuxMdCheck(in'as'options, +out't'number_of_errors) +DriveInhibitPolling(in'as'options, +out's'cookie) +DriveUninhibitPolling(in's'cookie) +DrivePollMedia() +DriveEject(in'as'options) +DriveDetach(in'as'options) +DriveSetSpindownTimeout(in'i'timeout_seconds, +in'as'options, +out's'cookie) +DriveUnsetSpindownTimeout(in's'cookie) +DriveAtaSmartRefreshData(in'as'options) +DriveAtaSmartInitiateSelftest(in's'test, +in'as'options) +DriveBenchmark(in'b'do_write_benchmark, +in'as'options, +out'a(td)'read_transfer_rate_results, +out'a(td)'write_transfer_rate_results, +out'a(td)'access_time_results) Signals - Changed () -JobChanged ('b' job_in_progress, - 'b' job_is_cancellable, - 's' job_id, - 'u' job_initiated_by_uid, - 'd' job_percentage) + Changed() +JobChanged('b'job_in_progress, +'b'job_is_cancellable, +'s'job_id, +'u'job_initiated_by_uid, +'d'job_percentage) @@ -91,139 +91,139 @@ Properties - 'NativePath' read 's' -'DeviceDetectionTime' read 't' -'DeviceMediaDetectionTime' read 't' -'DeviceMajor' read 'x' -'DeviceMinor' read 'x' -'DeviceFile' read 's' -'DeviceFilePresentation' read 's' -'DeviceFileById' read 'as' -'DeviceFileByPath' read 'as' -'DeviceIsSystemInternal' read 'b' -'DeviceIsPartition' read 'b' -'DeviceIsPartitionTable' read 'b' -'DeviceIsRemovable' read 'b' -'DeviceIsMediaAvailable' read 'b' -'DeviceIsMediaChangeDetected' read 'b' -'DeviceIsMediaChangeDetectionPolling' read 'b' -'DeviceIsMediaChangeDetectionInhibitable' read 'b' -'DeviceIsMediaChangeDetectionInhibited' read 'b' -'DeviceIsReadOnly' read 'b' -'DeviceIsDrive' read 'b' -'DeviceIsOpticalDisc' read 'b' -'DeviceIsMounted' read 'b' -'DeviceMountPaths' read 'as' -'DeviceMountedByUid' read 'u' -'DeviceIsLuks' read 'b' -'DeviceIsLuksCleartext' read 'b' -'DeviceIsLinuxMdComponent' read 'b' -'DeviceIsLinuxMd' read 'b' -'DeviceIsLinuxLvm2LV' read 'b' -'DeviceIsLinuxLvm2PV' read 'b' -'DeviceIsLinuxDmmpComponent' read 'b' -'DeviceIsLinuxDmmp' read 'b' -'DeviceIsLinuxLoop' read 'b' -'DeviceSize' read 't' -'DeviceBlockSize' read 't' -'DevicePresentationHide' read 'b' -'DevicePresentationNopolicy' read 'b' -'DevicePresentationName' read 's' -'DevicePresentationIconName' read 's' -'DeviceAutomountHint' read 's' -'JobInProgress' read 'b' -'JobId' read 's' -'JobInitiatedByUid' read 'u' -'JobIsCancellable' read 'b' -'JobPercentage' read 'd' -'IdUsage' read 's' -'IdType' read 's' -'IdVersion' read 's' -'IdUuid' read 's' -'IdLabel' read 's' -'LuksHolder' read 'o' -'LuksCleartextSlave' read 'o' -'LuksCleartextUnlockedByUid' read 'u' -'PartitionSlave' read 'o' -'PartitionScheme' read 's' -'PartitionType' read 's' -'PartitionLabel' read 's' -'PartitionUuid' read 's' -'PartitionFlags' read 'as' -'PartitionNumber' read 'i' -'PartitionOffset' read 't' -'PartitionSize' read 't' -'PartitionAlignmentOffset' read 't' -'PartitionTableScheme' read 's' -'PartitionTableCount' read 'i' -'DriveVendor' read 's' -'DriveModel' read 's' -'DriveRevision' read 's' -'DriveSerial' read 's' -'DriveWwn' read 's' -'DriveRotationRate' read 'u' -'DriveWriteCache' read 's' -'DriveConnectionInterface' read 's' -'DriveConnectionSpeed' read 't' -'DriveMediaCompatibility' read 'as' -'DriveMedia' read 's' -'DriveIsMediaEjectable' read 'b' -'DriveCanDetach' read 'b' -'DriveCanSpindown' read 'b' -'DriveIsRotational' read 'b' -'DriveAdapter' read 'o' -'DrivePorts' read 'ao' -'DriveSimilarDevices' read 'ao' -'OpticalDiscIsBlank' read 'b' -'OpticalDiscIsAppendable' read 'b' -'OpticalDiscIsClosed' read 'b' -'OpticalDiscNumTracks' read 'u' -'OpticalDiscNumAudioTracks' read 'u' -'OpticalDiscNumSessions' read 'u' -'DriveAtaSmartIsAvailable' read 'b' -'DriveAtaSmartTimeCollected' read 't' -'DriveAtaSmartStatus' read 's' -'DriveAtaSmartBlob' read 'ay' -'LinuxMdComponentLevel' read 's' -'LinuxMdComponentPosition' read 'i' -'LinuxMdComponentNumRaidDevices' read 'i' -'LinuxMdComponentUuid' read 's' -'LinuxMdComponentName' read 's' -'LinuxMdComponentHomeHost' read 's' -'LinuxMdComponentVersion' read 's' -'LinuxMdComponentHolder' read 'o' -'LinuxMdComponentState' read 'as' -'LinuxMdState' read 's' -'LinuxMdLevel' read 's' -'LinuxMdUuid' read 's' -'LinuxMdHomeHost' read 's' -'LinuxMdName' read 's' -'LinuxMdNumRaidDevices' read 'i' -'LinuxMdVersion' read 's' -'LinuxMdSlaves' read 'ao' -'LinuxMdIsDegraded' read 'b' -'LinuxMdSyncAction' read 's' -'LinuxMdSyncPercentage' read 'd' -'LinuxMdSyncSpeed' read 't' -'LinuxLvm2PVUuid' read 's' -'LinuxLvm2PVNumMetadataAreas' read 'u' -'LinuxLvm2PVGroupName' read 's' -'LinuxLvm2PVGroupUuid' read 's' -'LinuxLvm2PVGroupSize' read 't' -'LinuxLvm2PVGroupUnallocatedSize' read 't' -'LinuxLvm2PVGroupSequenceNumber' read 't' -'LinuxLvm2PVGroupExtentSize' read 't' -'LinuxLvm2PVGroupPhysicalVolumes' read 'as' -'LinuxLvm2PVGroupLogicalVolumes' read 'as' -'LinuxLvm2LVName' read 's' -'LinuxLvm2LVUuid' read 's' -'LinuxLvm2LVGroupName' read 's' -'LinuxLvm2LVGroupUuid' read 's' -'LinuxDmmpComponentHolder' read 'o' -'LinuxDmmpName' read 's' -'LinuxDmmpSlaves' read 'ao' -'LinuxDmmpParameters' read 's' -'LinuxLoopFilename' read 's' + 'NativePath'read's' +'DeviceDetectionTime'read't' +'DeviceMediaDetectionTime'read't' +'DeviceMajor'read'x' +'DeviceMinor'read'x' +'DeviceFile'read's' +'DeviceFilePresentation'read's' +'DeviceFileById'read'as' +'DeviceFileByPath'read'as' +'DeviceIsSystemInternal'read'b' +'DeviceIsPartition'read'b' +'DeviceIsPartitionTable'read'b' +'DeviceIsRemovable'read'b' +'DeviceIsMediaAvailable'read'b' +'DeviceIsMediaChangeDetected'read'b' +'DeviceIsMediaChangeDetectionPolling'read'b' +'DeviceIsMediaChangeDetectionInhibitable'read'b' +'DeviceIsMediaChangeDetectionInhibited'read'b' +'DeviceIsReadOnly'read'b' +'DeviceIsDrive'read'b' +'DeviceIsOpticalDisc'read'b' +'DeviceIsMounted'read'b' +'DeviceMountPaths'read'as' +'DeviceMountedByUid'read'u' +'DeviceIsLuks'read'b' +'DeviceIsLuksCleartext'read'b' +'DeviceIsLinuxMdComponent'read'b' +'DeviceIsLinuxMd'read'b' +'DeviceIsLinuxLvm2LV'read'b' +'DeviceIsLinuxLvm2PV'read'b' +'DeviceIsLinuxDmmpComponent'read'b' +'DeviceIsLinuxDmmp'read'b' +'DeviceIsLinuxLoop'read'b' +'DeviceSize'read't' +'DeviceBlockSize'read't' +'DevicePresentationHide'read'b' +'DevicePresentationNopolicy'read'b' +'DevicePresentationName'read's' +'DevicePresentationIconName'read's' +'DeviceAutomountHint'read's' +'JobInProgress'read'b' +'JobId'read's' +'JobInitiatedByUid'read'u' +'JobIsCancellable'read'b' +'JobPercentage'read'd' +'IdUsage'read's' +'IdType'read's' +'IdVersion'read's' +'IdUuid'read's' +'IdLabel'read's' +'LuksHolder'read'o' +'LuksCleartextSlave'read'o' +'LuksCleartextUnlockedByUid'read'u' +'PartitionSlave'read'o' +'PartitionScheme'read's' +'PartitionType'read's' +'PartitionLabel'read's' +'PartitionUuid'read's' +'PartitionFlags'read'as' +'PartitionNumber'read'i' +'PartitionOffset'read't' +'PartitionSize'read't' +'PartitionAlignmentOffset'read't' +'PartitionTableScheme'read's' +'PartitionTableCount'read'i' +'DriveVendor'read's' +'DriveModel'read's' +'DriveRevision'read's' +'DriveSerial'read's' +'DriveWwn'read's' +'DriveRotationRate'read'u' +'DriveWriteCache'read's' +'DriveConnectionInterface'read's' +'DriveConnectionSpeed'read't' +'DriveMediaCompatibility'read'as' +'DriveMedia'read's' +'DriveIsMediaEjectable'read'b' +'DriveCanDetach'read'b' +'DriveCanSpindown'read'b' +'DriveIsRotational'read'b' +'DriveAdapter'read'o' +'DrivePorts'read'ao' +'DriveSimilarDevices'read'ao' +'OpticalDiscIsBlank'read'b' +'OpticalDiscIsAppendable'read'b' +'OpticalDiscIsClosed'read'b' +'OpticalDiscNumTracks'read'u' +'OpticalDiscNumAudioTracks'read'u' +'OpticalDiscNumSessions'read'u' +'DriveAtaSmartIsAvailable'read'b' +'DriveAtaSmartTimeCollected'read't' +'DriveAtaSmartStatus'read's' +'DriveAtaSmartBlob'read'ay' +'LinuxMdComponentLevel'read's' +'LinuxMdComponentPosition'read'i' +'LinuxMdComponentNumRaidDevices'read'i' +'LinuxMdComponentUuid'read's' +'LinuxMdComponentName'read's' +'LinuxMdComponentHomeHost'read's' +'LinuxMdComponentVersion'read's' +'LinuxMdComponentHolder'read'o' +'LinuxMdComponentState'read'as' +'LinuxMdState'read's' +'LinuxMdLevel'read's' +'LinuxMdUuid'read's' +'LinuxMdHomeHost'read's' +'LinuxMdName'read's' +'LinuxMdNumRaidDevices'read'i' +'LinuxMdVersion'read's' +'LinuxMdSlaves'read'ao' +'LinuxMdIsDegraded'read'b' +'LinuxMdSyncAction'read's' +'LinuxMdSyncPercentage'read'd' +'LinuxMdSyncSpeed'read't' +'LinuxLvm2PVUuid'read's' +'LinuxLvm2PVNumMetadataAreas'read'u' +'LinuxLvm2PVGroupName'read's' +'LinuxLvm2PVGroupUuid'read's' +'LinuxLvm2PVGroupSize'read't' +'LinuxLvm2PVGroupUnallocatedSize'read't' +'LinuxLvm2PVGroupSequenceNumber'read't' +'LinuxLvm2PVGroupExtentSize'read't' +'LinuxLvm2PVGroupPhysicalVolumes'read'as' +'LinuxLvm2PVGroupLogicalVolumes'read'as' +'LinuxLvm2LVName'read's' +'LinuxLvm2LVUuid'read's' +'LinuxLvm2LVGroupName'read's' +'LinuxLvm2LVGroupUuid'read's' +'LinuxDmmpComponentHolder'read'o' +'LinuxDmmpName'read's' +'LinuxDmmpSlaves'read'ao' +'LinuxDmmpParameters'read's' +'LinuxLoopFilename'read's' @@ -277,8 +277,8 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.cancel-job-others: To cancel a job initiated by another user - <anchor role="function" id="Device.PartitionTableCreate"/>PartitionTableCreate ()PartitionTableCreateDevicePartitionTableCreate (in 's' scheme, - in 'as' options) + <anchor role="function" id="Device.PartitionTableCreate"/>PartitionTableCreate ()PartitionTableCreateDevicePartitionTableCreate (in's'scheme, +in'as'options) Creates a new partition table. The following partition table schemes are supported: none: To zero out existing partition tables signatures.mbr: @@ -304,7 +304,7 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.PartitionDelete"/>PartitionDelete ()PartitionDeleteDevicePartitionDelete (in 'as' options) + <anchor role="function" id="Device.PartitionDelete"/>PartitionDelete ()PartitionDeleteDevicePartitionDelete (in'as'options) Deletes a partition, removing it from the enclosing partition table. @@ -315,15 +315,15 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.PartitionCreate"/>PartitionCreate ()PartitionCreateDevicePartitionCreate (in 't' offset, - in 't' size, - in 's' type, - in 's' label, - in 'as' flags, - in 'as' options, - in 's' fstype, - in 'as' fsoptions, - out 'o' created_device) + <anchor role="function" id="Device.PartitionCreate"/>PartitionCreate ()PartitionCreateDevicePartitionCreate (in't'offset, +in't'size, +in's'type, +in's'label, +in'as'flags, +in'as'options, +in's'fstype, +in'as'fsoptions, +out'o'created_device) Create a new partition and, optionally, create a file system on it. The partition won't necessarily be created @@ -383,9 +383,9 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.PartitionModify"/>PartitionModify ()PartitionModifyDevicePartitionModify (in 's' type, - in 's' label, - in 'as' flags) + <anchor role="function" id="Device.PartitionModify"/>PartitionModify ()PartitionModifyDevicePartitionModify (in's'type, +in's'label, +in'as'flags) Modifies meta data for a partition, such as type, label and flags. TODO: Consider allowing changing offset and @@ -410,8 +410,8 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.FilesystemCreate"/>FilesystemCreate ()FilesystemCreateDeviceFilesystemCreate (in 's' fstype, - in 'as' options) + <anchor role="function" id="Device.FilesystemCreate"/>FilesystemCreate ()FilesystemCreateDeviceFilesystemCreate (in's'fstype, +in'as'options) Create a file system on a device. If the luks_encrypt= option is passed then an @@ -444,7 +444,7 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.FilesystemSetLabel"/>FilesystemSetLabel ()FilesystemSetLabelDeviceFilesystemSetLabel (in 's' new_label) + <anchor role="function" id="Device.FilesystemSetLabel"/>FilesystemSetLabel ()FilesystemSetLabelDeviceFilesystemSetLabel (in's'new_label) Changes the file system label. See the options parameter of FilesystemCreate() @@ -459,9 +459,9 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.FilesystemMount"/>FilesystemMount ()FilesystemMountDeviceFilesystemMount (in 's' filesystem_type, - in 'as' options, - out 's' mount_path) + <anchor role="function" id="Device.FilesystemMount"/>FilesystemMount ()FilesystemMountDeviceFilesystemMount (in's'filesystem_type, +in'as'options, +out's'mount_path) Mount the device. If the device is referenced in the system-wide /etc/fstab file, the given @@ -477,7 +477,7 @@ deviceorg.freedesktop.udisks.filesystem-mount-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.FilesystemUnmount"/>FilesystemUnmount ()FilesystemUnmountDeviceFilesystemUnmount (in 'as' options) + <anchor role="function" id="Device.FilesystemUnmount"/>FilesystemUnmount ()FilesystemUnmountDeviceFilesystemUnmount (in'as'options) Unmount the device. If the device is referenced in the system-wide /etc/fstab file (both at @@ -487,8 +487,8 @@ options:Unmount options. Valid options currently include only 'force'.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Busy:if the device is busyorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledorg.freedesktop.PolicyKit.Error.InvalidOption:if an invalid or malformed unmount option was givenPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.filesystem-unmount-others: To unmount a device mounted by another user - <anchor role="function" id="Device.FilesystemCheck"/>FilesystemCheck ()FilesystemCheckDeviceFilesystemCheck (in 'as' options, - out 'b' is_clean) + <anchor role="function" id="Device.FilesystemCheck"/>FilesystemCheck ()FilesystemCheckDeviceFilesystemCheck (in'as'options, +out'b'is_clean) Perform a non-interactive file system check. @@ -501,7 +501,7 @@ device.org.freedesktop.udisks.filesystem-check-system-internal: To check a file system on a system-internal device. - <anchor role="function" id="Device.FilesystemListOpenFiles"/>FilesystemListOpenFiles ()FilesystemListOpenFilesDeviceFilesystemListOpenFiles (out 'a(uus)' processes) + <anchor role="function" id="Device.FilesystemListOpenFiles"/>FilesystemListOpenFiles ()FilesystemListOpenFilesDeviceFilesystemListOpenFiles (out'a(uus)'processes) List open files on a mounted file system. @@ -516,16 +516,16 @@ device.org.freedesktop.udisks.filesystem-lsof-system-internal: To check a file system on a system-internal device. - <anchor role="function" id="Device.LuksUnlock"/>LuksUnlock ()LuksUnlockDeviceLuksUnlock (in 's' passphrase, - in 'as' options, - out 'o' cleartext_device) + <anchor role="function" id="Device.LuksUnlock"/>LuksUnlock ()LuksUnlockDeviceLuksUnlock (in's'passphrase, +in'as'options, +out'o'cleartext_device) Sets up a cleartext device using the given device as backing store. passphrase:Passphrase for unlocking the cleartext data.options:Currently unused.cleartext_device:The cleartext device created.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Busy:if the device is busyorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.luks-unlock: To unlock LUKS encrypted devices - <anchor role="function" id="Device.LuksLock"/>LuksLock ()LuksLockDeviceLuksLock (in 'as' options) + <anchor role="function" id="Device.LuksLock"/>LuksLock ()LuksLockDeviceLuksLock (in'as'options) Tears down the cleartext device set up using e.g. the LuksUnlock() @@ -534,8 +534,8 @@ options:Currently unused.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Busy:if the device is busyorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.luks-lock-others: To lock an encrypted LUKS device unlocked by another user - <anchor role="function" id="Device.LuksChangePassphrase"/>LuksChangePassphrase ()LuksChangePassphraseDeviceLuksChangePassphrase (in 's' current_passphrase, - in 's' new_passphrase) + <anchor role="function" id="Device.LuksChangePassphrase"/>LuksChangePassphrase ()LuksChangePassphraseDeviceLuksChangePassphrase (in's'current_passphrase, +in's'new_passphrase) Change the passphrase used to unlock a LUKS encrypted device. @@ -546,8 +546,8 @@ deviceorg.freedesktop.udisks.change-system-internal: If the operation is on a system-internal device - <anchor role="function" id="Device.LinuxMdAddSpare"/>LinuxMdAddSpare ()LinuxMdAddSpareDeviceLinuxMdAddSpare (in 'o' component, - in 'as' options) + <anchor role="function" id="Device.LinuxMdAddSpare"/>LinuxMdAddSpare ()LinuxMdAddSpareDeviceLinuxMdAddSpare (in'o'component, +in'as'options) Adds a component to a Linux md RAID array. Existing data on the given component will be erased. @@ -557,8 +557,8 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="Device.LinuxMdExpand"/>LinuxMdExpand ()LinuxMdExpandDeviceLinuxMdExpand (in 'ao' components, - in 'as' options) + <anchor role="function" id="Device.LinuxMdExpand"/>LinuxMdExpand ()LinuxMdExpandDeviceLinuxMdExpand (in'ao'components, +in'as'options) Grows the Linux md RAID array with the given components. @@ -567,8 +567,8 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="Device.LinuxMdRemoveComponent"/>LinuxMdRemoveComponent ()LinuxMdRemoveComponentDeviceLinuxMdRemoveComponent (in 'o' component, - in 'as' options) + <anchor role="function" id="Device.LinuxMdRemoveComponent"/>LinuxMdRemoveComponent ()LinuxMdRemoveComponentDeviceLinuxMdRemoveComponent (in'o'component, +in'as'options) Removes a component from a Linux md RAID array. The component will be removed and then the signatures on the component will be @@ -579,7 +579,7 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="Device.LinuxMdStop"/>LinuxMdStop ()LinuxMdStopDeviceLinuxMdStop (in 'as' options) + <anchor role="function" id="Device.LinuxMdStop"/>LinuxMdStop ()LinuxMdStopDeviceLinuxMdStop (in'as'options) Stops a Linux md RAID array. @@ -588,7 +588,7 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="Device.LinuxLvm2LVStop"/>LinuxLvm2LVStop ()LinuxLvm2LVStopDeviceLinuxLvm2LVStop (in 'as' options) + <anchor role="function" id="Device.LinuxLvm2LVStop"/>LinuxLvm2LVStop ()LinuxLvm2LVStopDeviceLinuxLvm2LVStop (in'as'options) Stops a Linux LVM2 Logical Volume. @@ -597,8 +597,8 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2. - <anchor role="function" id="Device.LinuxMdCheck"/>LinuxMdCheck ()LinuxMdCheckDeviceLinuxMdCheck (in 'as' options, - out 't' number_of_errors) + <anchor role="function" id="Device.LinuxMdCheck"/>LinuxMdCheck ()LinuxMdCheckDeviceLinuxMdCheck (in'as'options, +out't'number_of_errors) Checks a Linux md RAID array and returns the number of sectors/page with errors found/fixed. This can only be done if the @@ -615,8 +615,8 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="Device.DriveInhibitPolling"/>DriveInhibitPolling ()DriveInhibitPollingDeviceDriveInhibitPolling (in 'as' options, - out 's' cookie) + <anchor role="function" id="Device.DriveInhibitPolling"/>DriveInhibitPolling ()DriveInhibitPollingDeviceDriveInhibitPolling (in'as'options, +out's'cookie) Inhibits the daemon from polling the device for media changes. @@ -627,7 +627,7 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.inhibit-polling: To inhibit polling - <anchor role="function" id="Device.DriveUninhibitPolling"/>DriveUninhibitPolling ()DriveUninhibitPollingDeviceDriveUninhibitPolling (in 's' cookie) + <anchor role="function" id="Device.DriveUninhibitPolling"/>DriveUninhibitPolling ()DriveUninhibitPollingDeviceDriveUninhibitPolling (in's'cookie) Uninhibits daemon from polling the device for media changes. @@ -643,14 +643,14 @@ Errorsorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.inhibit-polling: To inhibit polling - <anchor role="function" id="Device.DriveEject"/>DriveEject ()DriveEjectDeviceDriveEject (in 'as' options) + <anchor role="function" id="Device.DriveEject"/>DriveEject ()DriveEjectDeviceDriveEject (in'as'options) Ejects media from the device. If the unmount option is given, the device might have mounted file systems, which will be unmounted before ejection. options:Eject options. Valid options currently include only 'unmount'.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Busy:if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted)org.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledorg.freedesktop.PolicyKit.Error.InvalidOption:if an invalid or malformed option was givenPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-eject: To eject media from a device - <anchor role="function" id="Device.DriveDetach"/>DriveDetach ()DriveDetachDeviceDriveDetach (in 'as' options) + <anchor role="function" id="Device.DriveDetach"/>DriveDetach ()DriveDetachDeviceDriveDetach (in'as'options) Detachs the device by e.g. powering down the physical port it is connected to. Note that not all devices or ports are @@ -670,9 +670,9 @@ options:Detach options. Currently no options are recognized.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Busy:if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted)org.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledorg.freedesktop.PolicyKit.Error.InvalidOption:if an invalid or malformed option was givenPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-detach: To detach a device - <anchor role="function" id="Device.DriveSetSpindownTimeout"/>DriveSetSpindownTimeout ()DriveSetSpindownTimeoutDeviceDriveSetSpindownTimeout (in 'i' timeout_seconds, - in 'as' options, - out 's' cookie) + <anchor role="function" id="Device.DriveSetSpindownTimeout"/>DriveSetSpindownTimeout ()DriveSetSpindownTimeoutDeviceDriveSetSpindownTimeout (in'i'timeout_seconds, +in'as'options, +out's'cookie) Configures spindown timeout for the drive. Check the @@ -693,7 +693,7 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.InvalidOption:if an invalid or malformed option was givenPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts - <anchor role="function" id="Device.DriveUnsetSpindownTimeout"/>DriveUnsetSpindownTimeout ()DriveUnsetSpindownTimeoutDeviceDriveUnsetSpindownTimeout (in 's' cookie) + <anchor role="function" id="Device.DriveUnsetSpindownTimeout"/>DriveUnsetSpindownTimeout ()DriveUnsetSpindownTimeoutDeviceDriveUnsetSpindownTimeout (in's'cookie) Unsets spindown timeout for the drive. @@ -703,7 +703,7 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts - <anchor role="function" id="Device.DriveAtaSmartRefreshData"/>DriveAtaSmartRefreshData ()DriveAtaSmartRefreshDataDeviceDriveAtaSmartRefreshData (in 'as' options) + <anchor role="function" id="Device.DriveAtaSmartRefreshData"/>DriveAtaSmartRefreshData ()DriveAtaSmartRefreshDataDeviceDriveAtaSmartRefreshData (in'as'options) Refreshes the ATA SMART @@ -718,8 +718,8 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.AtaSmartWouldWakeup:If the disk is sleeping and the nowakeup option was passedorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-ata-smart-refresh: Needed to refresh ATA SMART data - <anchor role="function" id="Device.DriveAtaSmartInitiateSelftest"/>DriveAtaSmartInitiateSelftest ()DriveAtaSmartInitiateSelftestDeviceDriveAtaSmartInitiateSelftest (in 's' test, - in 'as' options) + <anchor role="function" id="Device.DriveAtaSmartInitiateSelftest"/>DriveAtaSmartInitiateSelftest ()DriveAtaSmartInitiateSelftestDeviceDriveAtaSmartInitiateSelftest (in's'test, +in'as'options) Runs a ATA SMART self test on the drive. @@ -730,11 +730,11 @@ options:Currently unused.Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.Cancelled:if the job was cancelledPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-ata-smart-selftest: Needed to run ATA SMART self tests - <anchor role="function" id="Device.DriveBenchmark"/>DriveBenchmark ()DriveBenchmarkDeviceDriveBenchmark (in 'b' do_write_benchmark, - in 'as' options, - out 'a(td)' read_transfer_rate_results, - out 'a(td)' write_transfer_rate_results, - out 'a(td)' access_time_results) + <anchor role="function" id="Device.DriveBenchmark"/>DriveBenchmark ()DriveBenchmarkDeviceDriveBenchmark (in'b'do_write_benchmark, +in'as'options, +out'a(td)'read_transfer_rate_results, +out'a(td)'write_transfer_rate_results, +out'a(td)'access_time_results) Benchmarks the drive. @@ -768,11 +768,11 @@ Something on the device changed. Changes in job state wont trigger this signal; see the JobChanged() signal. - <anchor role="function" id="Device::JobChanged"/>The JobChanged signalJobChangedDeviceJobChanged ('b' job_in_progress, - 'b' job_is_cancellable, - 's' job_id, - 'u' job_initiated_by_uid, - 'd' job_percentage) + <anchor role="function" id="Device::JobChanged"/>The JobChanged signalJobChangedDeviceJobChanged ('b'job_in_progress, +'b'job_is_cancellable, +'s'job_id, +'u'job_initiated_by_uid, +'d'job_percentage) Emitted when a job on a device changes. Clients should listen to this signal to avoid polling the daemon for job @@ -787,7 +787,7 @@ NativePath Device - 'NativePath' read 's' + 'NativePath'read's' @@ -800,7 +800,7 @@ DeviceDetectionTime Device - 'DeviceDetectionTime' read 't' + 'DeviceDetectionTime'read't' @@ -814,7 +814,7 @@ DeviceMediaDetectionTime Device - 'DeviceMediaDetectionTime' read 't' + 'DeviceMediaDetectionTime'read't' @@ -829,7 +829,7 @@ DeviceMajor Device - 'DeviceMajor' read 'x' + 'DeviceMajor'read'x' @@ -842,7 +842,7 @@ DeviceMinor Device - 'DeviceMinor' read 'x' + 'DeviceMinor'read'x' @@ -855,7 +855,7 @@ DeviceFile Device - 'DeviceFile' read 's' + 'DeviceFile'read's' @@ -868,7 +868,7 @@ DeviceFilePresentation Device - 'DeviceFilePresentation' read 's' + 'DeviceFilePresentation'read's' @@ -887,7 +887,7 @@ DeviceFileById Device - 'DeviceFileById' read 'as' + 'DeviceFileById'read'as' @@ -902,7 +902,7 @@ DeviceFileByPath Device - 'DeviceFileByPath' read 'as' + 'DeviceFileByPath'read'as' @@ -916,7 +916,7 @@ DeviceIsSystemInternal Device - 'DeviceIsSystemInternal' read 'b' + 'DeviceIsSystemInternal'read'b' @@ -932,7 +932,7 @@ DeviceIsPartition Device - 'DeviceIsPartition' read 'b' + 'DeviceIsPartition'read'b' @@ -945,7 +945,7 @@ DeviceIsPartitionTable Device - 'DeviceIsPartitionTable' read 'b' + 'DeviceIsPartitionTable'read'b' @@ -958,7 +958,7 @@ DeviceIsRemovable Device - 'DeviceIsRemovable' read 'b' + 'DeviceIsRemovable'read'b' @@ -971,7 +971,7 @@ DeviceIsMediaAvailable Device - 'DeviceIsMediaAvailable' read 'b' + 'DeviceIsMediaAvailable'read'b' @@ -984,7 +984,7 @@ DeviceIsMediaChangeDetected Device - 'DeviceIsMediaChangeDetected' read 'b' + 'DeviceIsMediaChangeDetected'read'b' @@ -997,7 +997,7 @@ DeviceIsMediaChangeDetectionPolling Device - 'DeviceIsMediaChangeDetectionPolling' read 'b' + 'DeviceIsMediaChangeDetectionPolling'read'b' @@ -1015,7 +1015,7 @@ DeviceIsMediaChangeDetectionInhibitable Device - 'DeviceIsMediaChangeDetectionInhibitable' read 'b' + 'DeviceIsMediaChangeDetectionInhibitable'read'b' @@ -1028,7 +1028,7 @@ DeviceIsMediaChangeDetectionInhibited Device - 'DeviceIsMediaChangeDetectionInhibited' read 'b' + 'DeviceIsMediaChangeDetectionInhibited'read'b' @@ -1041,7 +1041,7 @@ DeviceIsReadOnly Device - 'DeviceIsReadOnly' read 'b' + 'DeviceIsReadOnly'read'b' @@ -1054,7 +1054,7 @@ DeviceIsDrive Device - 'DeviceIsDrive' read 'b' + 'DeviceIsDrive'read'b' @@ -1068,7 +1068,7 @@ DeviceIsOpticalDisc Device - 'DeviceIsOpticalDisc' read 'b' + 'DeviceIsOpticalDisc'read'b' @@ -1082,7 +1082,7 @@ DeviceIsMounted Device - 'DeviceIsMounted' read 'b' + 'DeviceIsMounted'read'b' @@ -1095,7 +1095,7 @@ DeviceMountPaths Device - 'DeviceMountPaths' read 'as' + 'DeviceMountPaths'read'as' @@ -1111,7 +1111,7 @@ DeviceMountedByUid Device - 'DeviceMountedByUid' read 'u' + 'DeviceMountedByUid'read'u' @@ -1128,7 +1128,7 @@ DeviceIsLuks Device - 'DeviceIsLuks' read 'b' + 'DeviceIsLuks'read'b' @@ -1141,7 +1141,7 @@ DeviceIsLuksCleartext Device - 'DeviceIsLuksCleartext' read 'b' + 'DeviceIsLuksCleartext'read'b' @@ -1154,7 +1154,7 @@ DeviceIsLinuxMdComponent Device - 'DeviceIsLinuxMdComponent' read 'b' + 'DeviceIsLinuxMdComponent'read'b' @@ -1167,7 +1167,7 @@ DeviceIsLinuxMd Device - 'DeviceIsLinuxMd' read 'b' + 'DeviceIsLinuxMd'read'b' @@ -1180,7 +1180,7 @@ DeviceIsLinuxLvm2LV Device - 'DeviceIsLinuxLvm2LV' read 'b' + 'DeviceIsLinuxLvm2LV'read'b' @@ -1193,7 +1193,7 @@ DeviceIsLinuxLvm2PV Device - 'DeviceIsLinuxLvm2PV' read 'b' + 'DeviceIsLinuxLvm2PV'read'b' @@ -1206,7 +1206,7 @@ DeviceIsLinuxDmmpComponent Device - 'DeviceIsLinuxDmmpComponent' read 'b' + 'DeviceIsLinuxDmmpComponent'read'b' @@ -1219,7 +1219,7 @@ DeviceIsLinuxDmmp Device - 'DeviceIsLinuxDmmp' read 'b' + 'DeviceIsLinuxDmmp'read'b' @@ -1232,7 +1232,7 @@ DeviceIsLinuxLoop Device - 'DeviceIsLinuxLoop' read 'b' + 'DeviceIsLinuxLoop'read'b' @@ -1245,7 +1245,7 @@ DeviceSize Device - 'DeviceSize' read 't' + 'DeviceSize'read't' @@ -1258,7 +1258,7 @@ DeviceBlockSize Device - 'DeviceBlockSize' read 't' + 'DeviceBlockSize'read't' @@ -1271,7 +1271,7 @@ DevicePresentationHide Device - 'DevicePresentationHide' read 'b' + 'DevicePresentationHide'read'b' @@ -1284,7 +1284,7 @@ DevicePresentationNopolicy Device - 'DevicePresentationNopolicy' read 'b' + 'DevicePresentationNopolicy'read'b' @@ -1298,7 +1298,7 @@ DevicePresentationName Device - 'DevicePresentationName' read 's' + 'DevicePresentationName'read's' @@ -1311,7 +1311,7 @@ DevicePresentationIconName Device - 'DevicePresentationIconName' read 's' + 'DevicePresentationIconName'read's' @@ -1325,7 +1325,7 @@ DeviceAutomountHint Device - 'DeviceAutomountHint' read 's' + 'DeviceAutomountHint'read's' @@ -1343,7 +1343,7 @@ JobInProgress Device - 'JobInProgress' read 'b' + 'JobInProgress'read'b' @@ -1357,7 +1357,7 @@ JobId Device - 'JobId' read 's' + 'JobId'read's' @@ -1372,7 +1372,7 @@ JobInitiatedByUid Device - 'JobInitiatedByUid' read 'u' + 'JobInitiatedByUid'read'u' @@ -1385,7 +1385,7 @@ JobIsCancellable Device - 'JobIsCancellable' read 'b' + 'JobIsCancellable'read'b' @@ -1399,7 +1399,7 @@ JobPercentage Device - 'JobPercentage' read 'd' + 'JobPercentage'read'd' @@ -1412,7 +1412,7 @@ IdUsage Device - 'IdUsage' read 's' + 'IdUsage'read's' @@ -1431,7 +1431,7 @@ IdType Device - 'IdType' read 's' + 'IdType'read's' @@ -1469,7 +1469,7 @@ IdVersion Device - 'IdVersion' read 's' + 'IdVersion'read's' @@ -1487,7 +1487,7 @@ IdUuid Device - 'IdUuid' read 's' + 'IdUuid'read's' @@ -1505,7 +1505,7 @@ IdLabel Device - 'IdLabel' read 's' + 'IdLabel'read's' @@ -1523,7 +1523,7 @@ LuksHolder Device - 'LuksHolder' read 'o' + 'LuksHolder'read'o' @@ -1539,7 +1539,7 @@ LuksCleartextSlave Device - 'LuksCleartextSlave' read 'o' + 'LuksCleartextSlave'read'o' @@ -1555,7 +1555,7 @@ LuksCleartextUnlockedByUid Device - 'LuksCleartextUnlockedByUid' read 'u' + 'LuksCleartextUnlockedByUid'read'u' @@ -1572,7 +1572,7 @@ PartitionSlave Device - 'PartitionSlave' read 'o' + 'PartitionSlave'read'o' @@ -1588,7 +1588,7 @@ PartitionScheme Device - 'PartitionScheme' read 's' + 'PartitionScheme'read's' @@ -1607,7 +1607,7 @@ PartitionType Device - 'PartitionType' read 's' + 'PartitionType'read's' @@ -1626,7 +1626,7 @@ PartitionLabel Device - 'PartitionLabel' read 's' + 'PartitionLabel'read's' @@ -1645,7 +1645,7 @@ PartitionUuid Device - 'PartitionUuid' read 's' + 'PartitionUuid'read's' @@ -1664,7 +1664,7 @@ PartitionFlags Device - 'PartitionFlags' read 'as' + 'PartitionFlags'read'as' @@ -1683,7 +1683,7 @@ PartitionNumber Device - 'PartitionNumber' read 'i' + 'PartitionNumber'read'i' @@ -1701,7 +1701,7 @@ PartitionOffset Device - 'PartitionOffset' read 't' + 'PartitionOffset'read't' @@ -1718,7 +1718,7 @@ PartitionSize Device - 'PartitionSize' read 't' + 'PartitionSize'read't' @@ -1734,7 +1734,7 @@ PartitionAlignmentOffset Device - 'PartitionAlignmentOffset' read 't' + 'PartitionAlignmentOffset'read't' @@ -1752,7 +1752,7 @@ PartitionTableScheme Device - 'PartitionTableScheme' read 's' + 'PartitionTableScheme'read's' @@ -1771,7 +1771,7 @@ PartitionTableCount Device - 'PartitionTableCount' read 'i' + 'PartitionTableCount'read'i' @@ -1787,7 +1787,7 @@ DriveVendor Device - 'DriveVendor' read 's' + 'DriveVendor'read's' @@ -1803,7 +1803,7 @@ DriveModel Device - 'DriveModel' read 's' + 'DriveModel'read's' @@ -1819,7 +1819,7 @@ DriveRevision Device - 'DriveRevision' read 's' + 'DriveRevision'read's' @@ -1835,7 +1835,7 @@ DriveSerial Device - 'DriveSerial' read 's' + 'DriveSerial'read's' @@ -1852,7 +1852,7 @@ DriveWwn Device - 'DriveWwn' read 's' + 'DriveWwn'read's' @@ -1870,7 +1870,7 @@ DriveRotationRate Device - 'DriveRotationRate' read 'u' + 'DriveRotationRate'read'u' @@ -1889,7 +1889,7 @@ DriveWriteCache Device - 'DriveWriteCache' read 's' + 'DriveWriteCache'read's' @@ -1906,7 +1906,7 @@ DriveConnectionInterface Device - 'DriveConnectionInterface' read 's' + 'DriveConnectionInterface'read's' @@ -1924,7 +1924,7 @@ DriveConnectionSpeed Device - 'DriveConnectionSpeed' read 't' + 'DriveConnectionSpeed'read't' @@ -1941,7 +1941,7 @@ DriveMediaCompatibility Device - 'DriveMediaCompatibility' read 'as' + 'DriveMediaCompatibility'read'as' @@ -1963,7 +1963,7 @@ DriveMedia Device - 'DriveMedia' read 's' + 'DriveMedia'read's' @@ -1982,7 +1982,7 @@ DriveIsMediaEjectable Device - 'DriveIsMediaEjectable' read 'b' + 'DriveIsMediaEjectable'read'b' @@ -1999,7 +1999,7 @@ DriveCanDetach Device - 'DriveCanDetach' read 'b' + 'DriveCanDetach'read'b' @@ -2016,7 +2016,7 @@ DriveCanSpindown Device - 'DriveCanSpindown' read 'b' + 'DriveCanSpindown'read'b' @@ -2033,7 +2033,7 @@ DriveIsRotational Device - 'DriveIsRotational' read 'b' + 'DriveIsRotational'read'b' @@ -2049,7 +2049,7 @@ DriveAdapter Device - 'DriveAdapter' read 'o' + 'DriveAdapter'read'o' @@ -2065,7 +2065,7 @@ DrivePorts Device - 'DrivePorts' read 'ao' + 'DrivePorts'read'ao' @@ -2081,7 +2081,7 @@ DriveSimilarDevices Device - 'DriveSimilarDevices' read 'ao' + 'DriveSimilarDevices'read'ao' @@ -2109,7 +2109,7 @@ OpticalDiscIsBlank Device - 'OpticalDiscIsBlank' read 'b' + 'OpticalDiscIsBlank'read'b' @@ -2125,7 +2125,7 @@ OpticalDiscIsAppendable Device - 'OpticalDiscIsAppendable' read 'b' + 'OpticalDiscIsAppendable'read'b' @@ -2141,7 +2141,7 @@ OpticalDiscIsClosed Device - 'OpticalDiscIsClosed' read 'b' + 'OpticalDiscIsClosed'read'b' @@ -2157,7 +2157,7 @@ OpticalDiscNumTracks Device - 'OpticalDiscNumTracks' read 'u' + 'OpticalDiscNumTracks'read'u' @@ -2173,7 +2173,7 @@ OpticalDiscNumAudioTracks Device - 'OpticalDiscNumAudioTracks' read 'u' + 'OpticalDiscNumAudioTracks'read'u' @@ -2189,7 +2189,7 @@ OpticalDiscNumSessions Device - 'OpticalDiscNumSessions' read 'u' + 'OpticalDiscNumSessions'read'u' @@ -2205,7 +2205,7 @@ DriveAtaSmartIsAvailable Device - 'DriveAtaSmartIsAvailable' read 'b' + 'DriveAtaSmartIsAvailable'read'b' @@ -2218,7 +2218,7 @@ DriveAtaSmartTimeCollected Device - 'DriveAtaSmartTimeCollected' read 't' + 'DriveAtaSmartTimeCollected'read't' @@ -2235,7 +2235,7 @@ DriveAtaSmartStatus Device - 'DriveAtaSmartStatus' read 's' + 'DriveAtaSmartStatus'read's' @@ -2258,7 +2258,7 @@ DriveAtaSmartBlob Device - 'DriveAtaSmartBlob' read 'ay' + 'DriveAtaSmartBlob'read'ay' @@ -2275,7 +2275,7 @@ LinuxMdComponentLevel Device - 'LinuxMdComponentLevel' read 's' + 'LinuxMdComponentLevel'read's' @@ -2292,7 +2292,7 @@ LinuxMdComponentPosition Device - 'LinuxMdComponentPosition' read 'i' + 'LinuxMdComponentPosition'read'i' @@ -2308,7 +2308,7 @@ LinuxMdComponentNumRaidDevices Device - 'LinuxMdComponentNumRaidDevices' read 'i' + 'LinuxMdComponentNumRaidDevices'read'i' @@ -2324,7 +2324,7 @@ LinuxMdComponentUuid Device - 'LinuxMdComponentUuid' read 's' + 'LinuxMdComponentUuid'read's' @@ -2340,7 +2340,7 @@ LinuxMdComponentName Device - 'LinuxMdComponentName' read 's' + 'LinuxMdComponentName'read's' @@ -2357,7 +2357,7 @@ LinuxMdComponentHomeHost Device - 'LinuxMdComponentHomeHost' read 's' + 'LinuxMdComponentHomeHost'read's' @@ -2374,7 +2374,7 @@ LinuxMdComponentVersion Device - 'LinuxMdComponentVersion' read 's' + 'LinuxMdComponentVersion'read's' @@ -2390,7 +2390,7 @@ LinuxMdComponentHolder Device - 'LinuxMdComponentHolder' read 'o' + 'LinuxMdComponentHolder'read'o' @@ -2406,7 +2406,7 @@ LinuxMdComponentState Device - 'LinuxMdComponentState' read 'as' + 'LinuxMdComponentState'read'as' @@ -2424,7 +2424,7 @@ LinuxMdState Device - 'LinuxMdState' read 's' + 'LinuxMdState'read's' @@ -2440,7 +2440,7 @@ LinuxMdLevel Device - 'LinuxMdLevel' read 's' + 'LinuxMdLevel'read's' @@ -2458,7 +2458,7 @@ LinuxMdUuid Device - 'LinuxMdUuid' read 's' + 'LinuxMdUuid'read's' @@ -2474,7 +2474,7 @@ LinuxMdHomeHost Device - 'LinuxMdHomeHost' read 's' + 'LinuxMdHomeHost'read's' @@ -2490,7 +2490,7 @@ LinuxMdName Device - 'LinuxMdName' read 's' + 'LinuxMdName'read's' @@ -2506,7 +2506,7 @@ LinuxMdNumRaidDevices Device - 'LinuxMdNumRaidDevices' read 'i' + 'LinuxMdNumRaidDevices'read'i' @@ -2522,7 +2522,7 @@ LinuxMdVersion Device - 'LinuxMdVersion' read 's' + 'LinuxMdVersion'read's' @@ -2538,7 +2538,7 @@ LinuxMdSlaves Device - 'LinuxMdSlaves' read 'ao' + 'LinuxMdSlaves'read'ao' @@ -2554,7 +2554,7 @@ LinuxMdIsDegraded Device - 'LinuxMdIsDegraded' read 'b' + 'LinuxMdIsDegraded'read'b' @@ -2570,7 +2570,7 @@ LinuxMdSyncAction Device - 'LinuxMdSyncAction' read 's' + 'LinuxMdSyncAction'read's' @@ -2588,7 +2588,7 @@ LinuxMdSyncPercentage Device - 'LinuxMdSyncPercentage' read 'd' + 'LinuxMdSyncPercentage'read'd' @@ -2606,7 +2606,7 @@ LinuxMdSyncSpeed Device - 'LinuxMdSyncSpeed' read 't' + 'LinuxMdSyncSpeed'read't' @@ -2624,7 +2624,7 @@ LinuxLvm2PVUuid Device - 'LinuxLvm2PVUuid' read 's' + 'LinuxLvm2PVUuid'read's' @@ -2640,7 +2640,7 @@ LinuxLvm2PVNumMetadataAreas Device - 'LinuxLvm2PVNumMetadataAreas' read 'u' + 'LinuxLvm2PVNumMetadataAreas'read'u' @@ -2656,7 +2656,7 @@ LinuxLvm2PVGroupName Device - 'LinuxLvm2PVGroupName' read 's' + 'LinuxLvm2PVGroupName'read's' @@ -2672,7 +2672,7 @@ LinuxLvm2PVGroupUuid Device - 'LinuxLvm2PVGroupUuid' read 's' + 'LinuxLvm2PVGroupUuid'read's' @@ -2688,7 +2688,7 @@ LinuxLvm2PVGroupSize Device - 'LinuxLvm2PVGroupSize' read 't' + 'LinuxLvm2PVGroupSize'read't' @@ -2704,7 +2704,7 @@ LinuxLvm2PVGroupUnallocatedSize Device - 'LinuxLvm2PVGroupUnallocatedSize' read 't' + 'LinuxLvm2PVGroupUnallocatedSize'read't' @@ -2720,7 +2720,7 @@ LinuxLvm2PVGroupSequenceNumber Device - 'LinuxLvm2PVGroupSequenceNumber' read 't' + 'LinuxLvm2PVGroupSequenceNumber'read't' @@ -2736,7 +2736,7 @@ LinuxLvm2PVGroupExtentSize Device - 'LinuxLvm2PVGroupExtentSize' read 't' + 'LinuxLvm2PVGroupExtentSize'read't' @@ -2752,7 +2752,7 @@ LinuxLvm2PVGroupPhysicalVolumes Device - 'LinuxLvm2PVGroupPhysicalVolumes' read 'as' + 'LinuxLvm2PVGroupPhysicalVolumes'read'as' @@ -2770,7 +2770,7 @@ LinuxLvm2PVGroupLogicalVolumes Device - 'LinuxLvm2PVGroupLogicalVolumes' read 'as' + 'LinuxLvm2PVGroupLogicalVolumes'read'as' @@ -2792,7 +2792,7 @@ LinuxLvm2LVName Device - 'LinuxLvm2LVName' read 's' + 'LinuxLvm2LVName'read's' @@ -2808,7 +2808,7 @@ LinuxLvm2LVUuid Device - 'LinuxLvm2LVUuid' read 's' + 'LinuxLvm2LVUuid'read's' @@ -2824,7 +2824,7 @@ LinuxLvm2LVGroupName Device - 'LinuxLvm2LVGroupName' read 's' + 'LinuxLvm2LVGroupName'read's' @@ -2840,7 +2840,7 @@ LinuxLvm2LVGroupUuid Device - 'LinuxLvm2LVGroupUuid' read 's' + 'LinuxLvm2LVGroupUuid'read's' @@ -2856,7 +2856,7 @@ LinuxDmmpComponentHolder Device - 'LinuxDmmpComponentHolder' read 'o' + 'LinuxDmmpComponentHolder'read'o' @@ -2872,7 +2872,7 @@ LinuxDmmpName Device - 'LinuxDmmpName' read 's' + 'LinuxDmmpName'read's' @@ -2888,7 +2888,7 @@ LinuxDmmpSlaves Device - 'LinuxDmmpSlaves' read 'ao' + 'LinuxDmmpSlaves'read'ao' @@ -2904,7 +2904,7 @@ LinuxDmmpParameters Device - 'LinuxDmmpParameters' read 's' + 'LinuxDmmpParameters'read's' @@ -2920,7 +2920,7 @@ LinuxLoopFilename Device - 'LinuxLoopFilename' read 's' + 'LinuxLoopFilename'read's' diff -Nru udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Expander.ref.xml udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Expander.ref.xml --- udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Expander.ref.xml 2011-08-25 21:16:13.000000000 +0000 +++ udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Expander.ref.xml 2014-03-10 09:04:46.000000000 +0000 @@ -13,7 +13,7 @@ Signals - Changed () + Changed() @@ -26,13 +26,13 @@ Properties - 'NativePath' read 's' -'Vendor' read 's' -'Model' read 's' -'Revision' read 's' -'NumPorts' read 'u' -'UpstreamPorts' read 'ao' -'Adapter' read 'o' + 'NativePath'read's' +'Vendor'read's' +'Model'read's' +'Revision'read's' +'NumPorts'read'u' +'UpstreamPorts'read'ao' +'Adapter'read'o' @@ -61,7 +61,7 @@ NativePath Expander - 'NativePath' read 's' + 'NativePath'read's' @@ -74,7 +74,7 @@ Vendor Expander - 'Vendor' read 's' + 'Vendor'read's' @@ -87,7 +87,7 @@ Model Expander - 'Model' read 's' + 'Model'read's' @@ -100,7 +100,7 @@ Revision Expander - 'Revision' read 's' + 'Revision'read's' @@ -113,7 +113,7 @@ NumPorts Expander - 'NumPorts' read 'u' + 'NumPorts'read'u' @@ -130,7 +130,7 @@ UpstreamPorts Expander - 'UpstreamPorts' read 'ao' + 'UpstreamPorts'read'ao' @@ -143,7 +143,7 @@ Adapter Expander - 'Adapter' read 'o' + 'Adapter'read'o' diff -Nru udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Port.ref.xml udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Port.ref.xml --- udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.Port.ref.xml 2011-08-25 21:16:13.000000000 +0000 +++ udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.Port.ref.xml 2014-03-10 09:04:46.000000000 +0000 @@ -13,7 +13,7 @@ Signals - Changed () + Changed() @@ -26,11 +26,11 @@ Properties - 'NativePath' read 's' -'Adapter' read 'o' -'Parent' read 'o' -'Number' read 'i' -'ConnectorType' read 's' + 'NativePath'read's' +'Adapter'read'o' +'Parent'read'o' +'Number'read'i' +'ConnectorType'read's' @@ -61,7 +61,7 @@ NativePath Port - 'NativePath' read 's' + 'NativePath'read's' @@ -74,7 +74,7 @@ Adapter Port - 'Adapter' read 'o' + 'Adapter'read'o' @@ -87,7 +87,7 @@ Parent Port - 'Parent' read 'o' + 'Parent'read'o' @@ -100,7 +100,7 @@ Number Port - 'Number' read 'i' + 'Number'read'i' @@ -113,7 +113,7 @@ ConnectorType Port - 'ConnectorType' read 's' + 'ConnectorType'read's' diff -Nru udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.ref.xml udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.ref.xml --- udisks-1.0.4/doc/dbus/org.freedesktop.UDisks.ref.xml 2011-08-25 21:16:13.000000000 +0000 +++ udisks-1.0.5/doc/dbus/org.freedesktop.UDisks.ref.xml 2014-03-10 09:04:46.000000000 +0000 @@ -9,89 +9,89 @@ Methods - EnumerateAdapters (out 'ao' devices) -EnumerateExpanders (out 'ao' devices) -EnumeratePorts (out 'ao' devices) -EnumerateDevices (out 'ao' devices) -EnumerateDeviceFiles (out 'as' device_files) -FindDeviceByDeviceFile (in 's' device_file, - out 'o' device) -FindDeviceByMajorMinor (in 'x' device_major, - in 'x' device_minor, - out 'o' device) -DriveInhibitAllPolling (in 'as' options, - out 's' cookie) -DriveUninhibitAllPolling (in 's' cookie) -DriveSetAllSpindownTimeouts (in 'i' timeout_seconds, - in 'as' options, - out 's' cookie) -DriveUnsetAllSpindownTimeouts (in 's' cookie) -LinuxLvm2VGStart (in 's' uuid, - in 'as' options) -LinuxLvm2VGStop (in 's' uuid, - in 'as' options) -LinuxLvm2VGSetName (in 's' uuid, - in 's' name) -LinuxLvm2VGAddPV (in 's' uuid, - in 'o' physical_volume, - in 'as' options) -LinuxLvm2VGRemovePV (in 's' vg_uuid, - in 's' pv_uuid, - in 'as' options) -LinuxLvm2LVSetName (in 's' group_uuid, - in 's' uuid, - in 's' name) -LinuxLvm2LVStart (in 's' group_uuid, - in 's' uuid, - in 'as' options) -LinuxLvm2LVRemove (in 's' group_uuid, - in 's' uuid, - in 'as' options) -LinuxLvm2LVCreate (in 's' group_uuid, - in 's' name, - in 't' size, - in 'u' num_stripes, - in 't' stripe_size, - in 'u' num_mirrors, - in 'as' options, - in 's' fstype, - in 'as' fsoptions, - out 'o' created_device) -LinuxMdStart (in 'ao' components, - in 'as' options, - out 'o' device) -LinuxMdCreate (in 'ao' components, - in 's' level, - in 't' stripe_size, - in 's' name, - in 'as' options, - out 'o' device) -Inhibit (out 's' cookie) -Uninhibit (in 's' cookie) + EnumerateAdapters(out'ao'devices) +EnumerateExpanders(out'ao'devices) +EnumeratePorts(out'ao'devices) +EnumerateDevices(out'ao'devices) +EnumerateDeviceFiles(out'as'device_files) +FindDeviceByDeviceFile(in's'device_file, +out'o'device) +FindDeviceByMajorMinor(in'x'device_major, +in'x'device_minor, +out'o'device) +DriveInhibitAllPolling(in'as'options, +out's'cookie) +DriveUninhibitAllPolling(in's'cookie) +DriveSetAllSpindownTimeouts(in'i'timeout_seconds, +in'as'options, +out's'cookie) +DriveUnsetAllSpindownTimeouts(in's'cookie) +LinuxLvm2VGStart(in's'uuid, +in'as'options) +LinuxLvm2VGStop(in's'uuid, +in'as'options) +LinuxLvm2VGSetName(in's'uuid, +in's'name) +LinuxLvm2VGAddPV(in's'uuid, +in'o'physical_volume, +in'as'options) +LinuxLvm2VGRemovePV(in's'vg_uuid, +in's'pv_uuid, +in'as'options) +LinuxLvm2LVSetName(in's'group_uuid, +in's'uuid, +in's'name) +LinuxLvm2LVStart(in's'group_uuid, +in's'uuid, +in'as'options) +LinuxLvm2LVRemove(in's'group_uuid, +in's'uuid, +in'as'options) +LinuxLvm2LVCreate(in's'group_uuid, +in's'name, +in't'size, +in'u'num_stripes, +in't'stripe_size, +in'u'num_mirrors, +in'as'options, +in's'fstype, +in'as'fsoptions, +out'o'created_device) +LinuxMdStart(in'ao'components, +in'as'options, +out'o'device) +LinuxMdCreate(in'ao'components, +in's'level, +in't'stripe_size, +in's'name, +in'as'options, +out'o'device) +Inhibit(out's'cookie) +Uninhibit(in's'cookie) Signals - DeviceAdded ('o' device) -DeviceRemoved ('o' device) -DeviceChanged ('o' device) -DeviceJobChanged ('o' device, - 'b' job_in_progress, - 'b' job_is_cancellable, - 's' job_id, - 'i' job_num_tasks, - 'i' job_cur_task, - 's' job_cur_task_id, - 'd' job_cur_task_percentage) -AdapterAdded ('o' adapter) -AdapterRemoved ('o' adapter) -AdapterChanged ('o' adapter) -ExpanderAdded ('o' expander) -ExpanderRemoved ('o' expander) -ExpanderChanged ('o' expander) -PortAdded ('o' port) -PortRemoved ('o' port) -PortChanged ('o' port) + DeviceAdded('o'device) +DeviceRemoved('o'device) +DeviceChanged('o'device) +DeviceJobChanged('o'device, +'b'job_in_progress, +'b'job_is_cancellable, +'s'job_id, +'i'job_num_tasks, +'i'job_cur_task, +'s'job_cur_task_id, +'d'job_cur_task_percentage) +AdapterAdded('o'adapter) +AdapterRemoved('o'adapter) +AdapterChanged('o'adapter) +ExpanderAdded('o'expander) +ExpanderRemoved('o'expander) +ExpanderChanged('o'expander) +PortAdded('o'port) +PortRemoved('o'port) +PortChanged('o'port) @@ -104,49 +104,49 @@ Properties - 'DaemonVersion' read 's' -'DaemonIsInhibited' read 'b' -'SupportsLuksDevices' read 'b' -'KnownFilesystems' read 'a(ssbbbubbbbbbbb)' + 'DaemonVersion'read's' +'DaemonIsInhibited'read'b' +'SupportsLuksDevices'read'b' +'KnownFilesystems'read'a(ssbbbubbbbbbbb)' Description - Details<anchor role="function" id="UDisks.EnumerateAdapters"/>EnumerateAdapters ()EnumerateAdaptersUDisksEnumerateAdapters (out 'ao' devices) + Details<anchor role="function" id="UDisks.EnumerateAdapters"/>EnumerateAdapters ()EnumerateAdaptersUDisksEnumerateAdapters (out'ao'devices) Enumerate all storage adapters on the system. - devices:An array of object paths for storage adapters.<anchor role="function" id="UDisks.EnumerateExpanders"/>EnumerateExpanders ()EnumerateExpandersUDisksEnumerateExpanders (out 'ao' devices) + devices:An array of object paths for storage adapters.<anchor role="function" id="UDisks.EnumerateExpanders"/>EnumerateExpanders ()EnumerateExpandersUDisksEnumerateExpanders (out'ao'devices) Enumerate all storage expanders on the system. - devices:An array of object paths for storage expanders.<anchor role="function" id="UDisks.EnumeratePorts"/>EnumeratePorts ()EnumeratePortsUDisksEnumeratePorts (out 'ao' devices) + devices:An array of object paths for storage expanders.<anchor role="function" id="UDisks.EnumeratePorts"/>EnumeratePorts ()EnumeratePortsUDisksEnumeratePorts (out'ao'devices) Enumerate all storage ports on the system. - devices:An array of object paths for ports.<anchor role="function" id="UDisks.EnumerateDevices"/>EnumerateDevices ()EnumerateDevicesUDisksEnumerateDevices (out 'ao' devices) + devices:An array of object paths for ports.<anchor role="function" id="UDisks.EnumerateDevices"/>EnumerateDevices ()EnumerateDevicesUDisksEnumerateDevices (out'ao'devices) Enumerate all disk devices on the system. - devices:An array of object paths for devices.<anchor role="function" id="UDisks.EnumerateDeviceFiles"/>EnumerateDeviceFiles ()EnumerateDeviceFilesUDisksEnumerateDeviceFiles (out 'as' device_files) + devices:An array of object paths for devices.<anchor role="function" id="UDisks.EnumerateDeviceFiles"/>EnumerateDeviceFiles ()EnumerateDeviceFilesUDisksEnumerateDeviceFiles (out'as'device_files) Enumerate all device files (including symlinks) for disk devices on the system. - device_files:An array device file names.<anchor role="function" id="UDisks.FindDeviceByDeviceFile"/>FindDeviceByDeviceFile ()FindDeviceByDeviceFileUDisksFindDeviceByDeviceFile (in 's' device_file, - out 'o' device) + device_files:An array device file names.<anchor role="function" id="UDisks.FindDeviceByDeviceFile"/>FindDeviceByDeviceFile ()FindDeviceByDeviceFileUDisksFindDeviceByDeviceFile (in's'device_file, +out'o'device) Finds a device by device path. - device_file:UNIX special device filedevice:Object path of device<anchor role="function" id="UDisks.FindDeviceByMajorMinor"/>FindDeviceByMajorMinor ()FindDeviceByMajorMinorUDisksFindDeviceByMajorMinor (in 'x' device_major, - in 'x' device_minor, - out 'o' device) + device_file:UNIX special device filedevice:Object path of device<anchor role="function" id="UDisks.FindDeviceByMajorMinor"/>FindDeviceByMajorMinor ()FindDeviceByMajorMinorUDisksFindDeviceByMajorMinor (in'x'device_major, +in'x'device_minor, +out'o'device) Finds a device by major:minor. - device_major:Device majordevice_minor:Device minordevice:Object path of device<anchor role="function" id="UDisks.DriveInhibitAllPolling"/>DriveInhibitAllPolling ()DriveInhibitAllPollingUDisksDriveInhibitAllPolling (in 'as' options, - out 's' cookie) + device_major:Device majordevice_minor:Device minordevice:Object path of device<anchor role="function" id="UDisks.DriveInhibitAllPolling"/>DriveInhibitAllPolling ()DriveInhibitAllPollingUDisksDriveInhibitAllPolling (in'as'options, +out's'cookie) Inhibits the daemon from polling devices for media changes. @@ -157,16 +157,16 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.inhibit-polling: To inhibit polling - <anchor role="function" id="UDisks.DriveUninhibitAllPolling"/>DriveUninhibitAllPolling ()DriveUninhibitAllPollingUDisksDriveUninhibitAllPolling (in 's' cookie) + <anchor role="function" id="UDisks.DriveUninhibitAllPolling"/>DriveUninhibitAllPolling ()DriveUninhibitAllPollingUDisksDriveUninhibitAllPolling (in's'cookie) Uninhibits daemon from polling devices for media changes. cookie: A cookie obtained from the DriveInhibitAllPolling() method. - Errorsorg.freedesktop.PolicyKit.Error.Failed:if the given cookie is malformed<anchor role="function" id="UDisks.DriveSetAllSpindownTimeouts"/>DriveSetAllSpindownTimeouts ()DriveSetAllSpindownTimeoutsUDisksDriveSetAllSpindownTimeouts (in 'i' timeout_seconds, - in 'as' options, - out 's' cookie) + Errorsorg.freedesktop.PolicyKit.Error.Failed:if the given cookie is malformed<anchor role="function" id="UDisks.DriveSetAllSpindownTimeouts"/>DriveSetAllSpindownTimeouts ()DriveSetAllSpindownTimeoutsUDisksDriveSetAllSpindownTimeouts (in'i'timeout_seconds, +in'as'options, +out's'cookie) Configures spindown timeout for all drives capable of being spun down. Caution should be exercised when using this method, see @@ -184,7 +184,7 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedorg.freedesktop.PolicyKit.Error.InvalidOption:if an invalid or malformed option was givenPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts - <anchor role="function" id="UDisks.DriveUnsetAllSpindownTimeouts"/>DriveUnsetAllSpindownTimeouts ()DriveUnsetAllSpindownTimeoutsUDisksDriveUnsetAllSpindownTimeouts (in 's' cookie) + <anchor role="function" id="UDisks.DriveUnsetAllSpindownTimeouts"/>DriveUnsetAllSpindownTimeouts ()DriveUnsetAllSpindownTimeoutsUDisksDriveUnsetAllSpindownTimeouts (in's'cookie) Unsets spindown timeout for the drive. @@ -194,8 +194,8 @@ Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller lacks the appropriate PolicyKit authorizationorg.freedesktop.PolicyKit.Error.Failed:if the operation failedPermissions The caller will need one of the following PolicyKit authorizations: org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts - <anchor role="function" id="UDisks.LinuxLvm2VGStart"/>LinuxLvm2VGStart ()LinuxLvm2VGStartUDisksLinuxLvm2VGStart (in 's' uuid, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2VGStart"/>LinuxLvm2VGStart ()LinuxLvm2VGStartUDisksLinuxLvm2VGStart (in's'uuid, +in'as'options) Starts all logical volumes in Linux LVM2 Volume Group. @@ -204,8 +204,8 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2VGStop"/>LinuxLvm2VGStop ()LinuxLvm2VGStopUDisksLinuxLvm2VGStop (in 's' uuid, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2VGStop"/>LinuxLvm2VGStop ()LinuxLvm2VGStopUDisksLinuxLvm2VGStop (in's'uuid, +in'as'options) Stops all logical volumes in Linux LVM2 Volume Group. @@ -214,8 +214,8 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2VGSetName"/>LinuxLvm2VGSetName ()LinuxLvm2VGSetNameUDisksLinuxLvm2VGSetName (in 's' uuid, - in 's' name) + <anchor role="function" id="UDisks.LinuxLvm2VGSetName"/>LinuxLvm2VGSetName ()LinuxLvm2VGSetNameUDisksLinuxLvm2VGSetName (in's'uuid, +in's'name) Sets the name for a volume group. @@ -224,9 +224,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2VGAddPV"/>LinuxLvm2VGAddPV ()LinuxLvm2VGAddPVUDisksLinuxLvm2VGAddPV (in 's' uuid, - in 'o' physical_volume, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2VGAddPV"/>LinuxLvm2VGAddPV ()LinuxLvm2VGAddPVUDisksLinuxLvm2VGAddPV (in's'uuid, +in'o'physical_volume, +in'as'options) Adds a Physical volume to a Linux LVM2 Volume Group. Existing data on the given device to use for a physical volume will be erased. @@ -236,9 +236,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2VGRemovePV"/>LinuxLvm2VGRemovePV ()LinuxLvm2VGRemovePVUDisksLinuxLvm2VGRemovePV (in 's' vg_uuid, - in 's' pv_uuid, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2VGRemovePV"/>LinuxLvm2VGRemovePV ()LinuxLvm2VGRemovePVUDisksLinuxLvm2VGRemovePV (in's'vg_uuid, +in's'pv_uuid, +in'as'options) Removes a Physical volume from a Linux LVM2 Volume Group. @@ -247,9 +247,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2LVSetName"/>LinuxLvm2LVSetName ()LinuxLvm2LVSetNameUDisksLinuxLvm2LVSetName (in 's' group_uuid, - in 's' uuid, - in 's' name) + <anchor role="function" id="UDisks.LinuxLvm2LVSetName"/>LinuxLvm2LVSetName ()LinuxLvm2LVSetNameUDisksLinuxLvm2LVSetName (in's'group_uuid, +in's'uuid, +in's'name) Sets the name for a logical volume. @@ -258,9 +258,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2LVStart"/>LinuxLvm2LVStart ()LinuxLvm2LVStartUDisksLinuxLvm2LVStart (in 's' group_uuid, - in 's' uuid, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2LVStart"/>LinuxLvm2LVStart ()LinuxLvm2LVStartUDisksLinuxLvm2LVStart (in's'group_uuid, +in's'uuid, +in'as'options) Starts a LVM2 logical volume. @@ -269,9 +269,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2LVRemove"/>LinuxLvm2LVRemove ()LinuxLvm2LVRemoveUDisksLinuxLvm2LVRemove (in 's' group_uuid, - in 's' uuid, - in 'as' options) + <anchor role="function" id="UDisks.LinuxLvm2LVRemove"/>LinuxLvm2LVRemove ()LinuxLvm2LVRemoveUDisksLinuxLvm2LVRemove (in's'group_uuid, +in's'uuid, +in'as'options) Removes a LVM2 logical volume. @@ -280,16 +280,16 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxLvm2LVCreate"/>LinuxLvm2LVCreate ()LinuxLvm2LVCreateUDisksLinuxLvm2LVCreate (in 's' group_uuid, - in 's' name, - in 't' size, - in 'u' num_stripes, - in 't' stripe_size, - in 'u' num_mirrors, - in 'as' options, - in 's' fstype, - in 'as' fsoptions, - out 'o' created_device) + <anchor role="function" id="UDisks.LinuxLvm2LVCreate"/>LinuxLvm2LVCreate ()LinuxLvm2LVCreateUDisksLinuxLvm2LVCreate (in's'group_uuid, +in's'name, +in't'size, +in'u'num_stripes, +in't'stripe_size, +in'u'num_mirrors, +in'as'options, +in's'fstype, +in'as'fsoptions, +out'o'created_device) Creates a new LVM2 logical volume. @@ -307,9 +307,9 @@ org.freedesktop.udisks.linux-lvm2: Needed to configured Linux LVM2 devices. - <anchor role="function" id="UDisks.LinuxMdStart"/>LinuxMdStart ()LinuxMdStartUDisksLinuxMdStart (in 'ao' components, - in 'as' options, - out 'o' device) + <anchor role="function" id="UDisks.LinuxMdStart"/>LinuxMdStart ()LinuxMdStartUDisksLinuxMdStart (in'ao'components, +in'as'options, +out'o'device) Starts an Linux md RAID array. The array will be assembled and started in degraded mode if an insufficient number of @@ -320,12 +320,12 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="UDisks.LinuxMdCreate"/>LinuxMdCreate ()LinuxMdCreateUDisksLinuxMdCreate (in 'ao' components, - in 's' level, - in 't' stripe_size, - in 's' name, - in 'as' options, - out 'o' device) + <anchor role="function" id="UDisks.LinuxMdCreate"/>LinuxMdCreate ()LinuxMdCreateUDisksLinuxMdCreate (in'ao'components, +in's'level, +in't'stripe_size, +in's'name, +in'as'options, +out'o'device) Creates a Linux md RAID array. The array will be created and assembled. @@ -335,7 +335,7 @@ org.freedesktop.udisks.linux-md: Needed to configured Linux md Software RAID devices. - <anchor role="function" id="UDisks.Inhibit"/>Inhibit ()InhibitUDisksInhibit (out 's' cookie) + <anchor role="function" id="UDisks.Inhibit"/>Inhibit ()InhibitUDisksInhibit (out's'cookie) Inhibits clients from invoking methods on the daemon of the daemon that require authorization (all methods @@ -351,7 +351,7 @@ to stop inhibiting the daemon. Errorsorg.freedesktop.PolicyKit.Error.NotAuthorized:if the caller is not the super userPermissions Only the super user can invoke this method. - <anchor role="function" id="UDisks.Uninhibit"/>Uninhibit ()UninhibitUDisksUninhibit (in 's' cookie) + <anchor role="function" id="UDisks.Uninhibit"/>Uninhibit ()UninhibitUDisksUninhibit (in's'cookie) Uninhibits other clients from using the daemon. @@ -359,62 +359,62 @@ A cookie obtained from the Inhibit() method. Errorsorg.freedesktop.PolicyKit.Error.Failed:if the given cookie is malformed - Signal Details<anchor role="function" id="UDisks::DeviceAdded"/>The DeviceAdded signalDeviceAddedUDisksDeviceAdded ('o' device) + Signal Details<anchor role="function" id="UDisks::DeviceAdded"/>The DeviceAdded signalDeviceAddedUDisksDeviceAdded ('o'device) Emitted when a device is added. - device:Object path of device that was added.<anchor role="function" id="UDisks::DeviceRemoved"/>The DeviceRemoved signalDeviceRemovedUDisksDeviceRemoved ('o' device) + device:Object path of device that was added.<anchor role="function" id="UDisks::DeviceRemoved"/>The DeviceRemoved signalDeviceRemovedUDisksDeviceRemoved ('o'device) Emitted when a device is removed. - device:Object path of device that was removed.<anchor role="function" id="UDisks::DeviceChanged"/>The DeviceChanged signalDeviceChangedUDisksDeviceChanged ('o' device) + device:Object path of device that was removed.<anchor role="function" id="UDisks::DeviceChanged"/>The DeviceChanged signalDeviceChangedUDisksDeviceChanged ('o'device) Emitted when a device changed. - device:Object path of device that was changed.<anchor role="function" id="UDisks::DeviceJobChanged"/>The DeviceJobChanged signalDeviceJobChangedUDisksDeviceJobChanged ('o' device, - 'b' job_in_progress, - 'b' job_is_cancellable, - 's' job_id, - 'i' job_num_tasks, - 'i' job_cur_task, - 's' job_cur_task_id, - 'd' job_cur_task_percentage) + device:Object path of device that was changed.<anchor role="function" id="UDisks::DeviceJobChanged"/>The DeviceJobChanged signalDeviceJobChangedUDisksDeviceJobChanged ('o'device, +'b'job_in_progress, +'b'job_is_cancellable, +'s'job_id, +'i'job_num_tasks, +'i'job_cur_task, +'s'job_cur_task_id, +'d'job_cur_task_percentage) Emitted when a job on a device changes. - device:The object path of the device.job_in_progress:Whether a job is currently in progress.job_is_cancellable:Whether the job is cancellable.job_id:The identifier of the job.job_num_tasks:Number of tasks in the job.job_cur_task:Current task number (zero-based offset).job_cur_task_id:Task identifier for current task.job_cur_task_percentage:Percentage completed of current task (between 0 and 100, negative if unknown).<anchor role="function" id="UDisks::AdapterAdded"/>The AdapterAdded signalAdapterAddedUDisksAdapterAdded ('o' adapter) + device:The object path of the device.job_in_progress:Whether a job is currently in progress.job_is_cancellable:Whether the job is cancellable.job_id:The identifier of the job.job_num_tasks:Number of tasks in the job.job_cur_task:Current task number (zero-based offset).job_cur_task_id:Task identifier for current task.job_cur_task_percentage:Percentage completed of current task (between 0 and 100, negative if unknown).<anchor role="function" id="UDisks::AdapterAdded"/>The AdapterAdded signalAdapterAddedUDisksAdapterAdded ('o'adapter) Emitted when an adapter is added. - adapter:Object path of adapter that was added.<anchor role="function" id="UDisks::AdapterRemoved"/>The AdapterRemoved signalAdapterRemovedUDisksAdapterRemoved ('o' adapter) + adapter:Object path of adapter that was added.<anchor role="function" id="UDisks::AdapterRemoved"/>The AdapterRemoved signalAdapterRemovedUDisksAdapterRemoved ('o'adapter) Emitted when an adapter is removed. - adapter:Object path of adapter that was removed.<anchor role="function" id="UDisks::AdapterChanged"/>The AdapterChanged signalAdapterChangedUDisksAdapterChanged ('o' adapter) + adapter:Object path of adapter that was removed.<anchor role="function" id="UDisks::AdapterChanged"/>The AdapterChanged signalAdapterChangedUDisksAdapterChanged ('o'adapter) Emitted when an adapter changed. - adapter:Object path of adapter that was changed.<anchor role="function" id="UDisks::ExpanderAdded"/>The ExpanderAdded signalExpanderAddedUDisksExpanderAdded ('o' expander) + adapter:Object path of adapter that was changed.<anchor role="function" id="UDisks::ExpanderAdded"/>The ExpanderAdded signalExpanderAddedUDisksExpanderAdded ('o'expander) Emitted when an expander is added. - expander:Object path of expander that was added.<anchor role="function" id="UDisks::ExpanderRemoved"/>The ExpanderRemoved signalExpanderRemovedUDisksExpanderRemoved ('o' expander) + expander:Object path of expander that was added.<anchor role="function" id="UDisks::ExpanderRemoved"/>The ExpanderRemoved signalExpanderRemovedUDisksExpanderRemoved ('o'expander) Emitted when an expander is removed. - expander:Object path of expander that was removed.<anchor role="function" id="UDisks::ExpanderChanged"/>The ExpanderChanged signalExpanderChangedUDisksExpanderChanged ('o' expander) + expander:Object path of expander that was removed.<anchor role="function" id="UDisks::ExpanderChanged"/>The ExpanderChanged signalExpanderChangedUDisksExpanderChanged ('o'expander) Emitted when an expander changed. - expander:Object path of expander that was changed.<anchor role="function" id="UDisks::PortAdded"/>The PortAdded signalPortAddedUDisksPortAdded ('o' port) + expander:Object path of expander that was changed.<anchor role="function" id="UDisks::PortAdded"/>The PortAdded signalPortAddedUDisksPortAdded ('o'port) Emitted when a port is added. - port:Object path of port that was added.<anchor role="function" id="UDisks::PortRemoved"/>The PortRemoved signalPortRemovedUDisksPortRemoved ('o' port) + port:Object path of port that was added.<anchor role="function" id="UDisks::PortRemoved"/>The PortRemoved signalPortRemovedUDisksPortRemoved ('o'port) Emitted when a port is removed. - port:Object path of port that was removed.<anchor role="function" id="UDisks::PortChanged"/>The PortChanged signalPortChangedUDisksPortChanged ('o' port) + port:Object path of port that was removed.<anchor role="function" id="UDisks::PortChanged"/>The PortChanged signalPortChangedUDisksPortChanged ('o'port) Emitted when a port changed. @@ -427,7 +427,7 @@ DaemonVersion UDisks - 'DaemonVersion' read 's' + 'DaemonVersion'read's' @@ -440,7 +440,7 @@ DaemonIsInhibited UDisks - 'DaemonIsInhibited' read 'b' + 'DaemonIsInhibited'read'b' @@ -453,7 +453,7 @@ SupportsLuksDevices UDisks - 'SupportsLuksDevices' read 'b' + 'SupportsLuksDevices'read'b' @@ -469,7 +469,7 @@ KnownFilesystems UDisks - 'KnownFilesystems' read 'a(ssbbbubbbbbbbb)' + 'KnownFilesystems'read'a(ssbbbubbbbbbbb)' diff -Nru udisks-1.0.4/doc/html/Adapter.html udisks-1.0.5/doc/html/Adapter.html --- udisks-1.0.4/doc/html/Adapter.html 2011-08-26 15:44:42.000000000 +0000 +++ udisks-1.0.5/doc/html/Adapter.html 2014-03-10 09:11:32.000000000 +0000 @@ -2,36 +2,29 @@ -org.freedesktop.UDisks.Adapter - +udisks Reference Manual: org.freedesktop.UDisks.Adapter + - + - - - - - - - - - - + + + + + + +
@@ -39,19 +32,19 @@

org.freedesktop.UDisks.Adapter

org.freedesktop.UDisks.Adapter — Adapter interface

- +

Methods


 

 

-
Signals

-
Changed ()
+
Signals

+
Changed()
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

     Objects implementing org.freedesktop.UDisks.Adapter also implements
     org.freedesktop.DBus.Introspectable,
@@ -59,17 +52,17 @@
     

 

 

-
Properties

-
'NativePath' read      's'
-'Vendor'     read      's'
-'Model'      read      's'
-'Driver'     read      's'
-'NumPorts'   read      'u'
-'Fabric'     read      's'
+
Properties

+
'NativePath'read's'
+'Vendor'read's'
+'Model'read's'
+'Driver'read's'
+'NumPorts'read'u'
+'Fabric'read's'
 

 

 

-
Description

+
Description

 

       
         

@@ -81,85 +74,100 @@
     

 

 

-
Details

+
Details

 

 

-
Signal Details

+
Signal Details

 

-

+

 The Changed signal

 
Changed ()

 

 

             Something on the adapter changed.
           

-

+

+++

 


 
 

 

 

-
Property Details

+
Property Details

 

-

+

 The "NativePath" property

-
'NativePath'  read      's'
+
'NativePath'read's'
 

 

 

             OS specific native path of the adapter. On Linux this is the sysfs path, for example /sys/devices/pci0000:00/0000:00:1f.2.
       

-

+

+++

 


 
 

 

 

-

+

 The "Vendor" property

-
'Vendor'  read      's'
+
'Vendor'read's'
 

 

 

             The name of the vendor of the storage adapter.
       

-

+

+++

 


 
 

 

 

-

+

 The "Model" property

-
'Model'  read      's'
+
'Model'read's'
 

 

 

             The name of the model of the storage adapter.
       

-

+

+++

 


 
 

 

 

-

+

 The "Driver" property

-
'Driver'  read      's'
+
'Driver'read's'
 

 

 

             The name of the driver used for the storage adapter.
       

-

+

+++

 


 
 

 

 

-

+

 The "NumPorts" property

-
'NumPorts'  read      'u'
+
'NumPorts'read'u'
 

 

 

@@ -167,7 +175,7 @@
             this may not correspond to the number _physical_ connectors as several PHYs may
             be ganged together in a separate physical connector using e.g.
             

-
    
+
      
 
    • 
 SFF-8484: Internal connector, two or four SAS/SATA lanes
      • 
 
    • 
@@ -180,15 +188,18 @@
 
      
             See each port object for more details.
       
      
-
      
+
      
+++
      
 


 
 
      
 
      
 
      
-
      
+
      
 The "Fabric" property
      
-
      'Fabric'  read      's'
+
      'Fabric'read's'
 
      
 
      
 
      
@@ -196,7 +207,7 @@
             targets and initiators or blank if unknown. See each port object for
             more details. Known fabric values include
             
      
-
        
+
          
 
        • 
 ata: ATA
          • 
 
        • 
@@ -211,14 +222,17 @@
 
          
             TODO: include other fabrics (FC, Parallel SCSI, etc.).
       
          
-
          
+
          
+++
          
 


 
 
          
 
        
 
      
 
      
 
      
-          Generated by GTK-Doc V1.17
      
+          Generated by GTK-Doc V1.20
    
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/Device.html udisks-1.0.5/doc/html/Device.html
--- udisks-1.0.4/doc/html/Device.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/Device.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,36 +2,29 @@
 
 
 
-org.freedesktop.UDisks.Device
-
+udisks Reference Manual: org.freedesktop.UDisks.Device
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
    
 
    
 
    
@@ -39,84 +32,84 @@
 
    org.freedesktop.UDisks.Device
    org.freedesktop.UDisks.Device — Device interface
    
-
+
    
 
 
 
    
 
    
 
    Methods
    
-
    JobCancel                     ()
-PartitionTableCreate          (in  's'      scheme,
-                               in  'as'     options)
-PartitionDelete               (in  'as'     options)
-PartitionCreate               (in  't'      offset,
-                               in  't'      size,
-                               in  's'      type,
-                               in  's'      label,
-                               in  'as'     flags,
-                               in  'as'     options,
-                               in  's'      fstype,
-                               in  'as'     fsoptions,
-                               out 'o'      created_device)
-PartitionModify               (in  's'      type,
-                               in  's'      label,
-                               in  'as'     flags)
-FilesystemCreate              (in  's'      fstype,
-                               in  'as'     options)
-FilesystemSetLabel            (in  's'      new_label)
-FilesystemMount               (in  's'      filesystem_type,
-                               in  'as'     options,
-                               out 's'      mount_path)
-FilesystemUnmount             (in  'as'     options)
-FilesystemCheck               (in  'as'     options,
-                               out 'b'      is_clean)
-FilesystemListOpenFiles       (out 'a(uus)' processes)
-LuksUnlock                    (in  's'      passphrase,
-                               in  'as'     options,
-                               out 'o'      cleartext_device)
-LuksLock                      (in  'as'     options)
-LuksChangePassphrase          (in  's'      current_passphrase,
-                               in  's'      new_passphrase)
-LinuxMdAddSpare               (in  'o'      component,
-                               in  'as'     options)
-LinuxMdExpand                 (in  'ao'     components,
-                               in  'as'     options)
-LinuxMdRemoveComponent        (in  'o'      component,
-                               in  'as'     options)
-LinuxMdStop                   (in  'as'     options)
-LinuxLvm2LVStop               (in  'as'     options)
-LinuxMdCheck                  (in  'as'     options,
-                               out 't'      number_of_errors)
-DriveInhibitPolling           (in  'as'     options,
-                               out 's'      cookie)
-DriveUninhibitPolling         (in  's'      cookie)
-DrivePollMedia                ()
-DriveEject                    (in  'as'     options)
-DriveDetach                   (in  'as'     options)
-DriveSetSpindownTimeout       (in  'i'      timeout_seconds,
-                               in  'as'     options,
-                               out 's'      cookie)
-DriveUnsetSpindownTimeout     (in  's'      cookie)
-DriveAtaSmartRefreshData      (in  'as'     options)
-DriveAtaSmartInitiateSelftest (in  's'      test,
-                               in  'as'     options)
-DriveBenchmark                (in  'b'      do_write_benchmark,
-                               in  'as'     options,
-                               out 'a(td)'  read_transfer_rate_results,
-                               out 'a(td)'  write_transfer_rate_results,
-                               out 'a(td)'  access_time_results)
+
    JobCancel()
+PartitionTableCreate(in's'scheme,
+in'as'options)
+PartitionDelete(in'as'options)
+PartitionCreate(in't'offset,
+in't'size,
+in's'type,
+in's'label,
+in'as'flags,
+in'as'options,
+in's'fstype,
+in'as'fsoptions,
+out'o'created_device)
+PartitionModify(in's'type,
+in's'label,
+in'as'flags)
+FilesystemCreate(in's'fstype,
+in'as'options)
+FilesystemSetLabel(in's'new_label)
+FilesystemMount(in's'filesystem_type,
+in'as'options,
+out's'mount_path)
+FilesystemUnmount(in'as'options)
+FilesystemCheck(in'as'options,
+out'b'is_clean)
+FilesystemListOpenFiles(out'a(uus)'processes)
+LuksUnlock(in's'passphrase,
+in'as'options,
+out'o'cleartext_device)
+LuksLock(in'as'options)
+LuksChangePassphrase(in's'current_passphrase,
+in's'new_passphrase)
+LinuxMdAddSpare(in'o'component,
+in'as'options)
+LinuxMdExpand(in'ao'components,
+in'as'options)
+LinuxMdRemoveComponent(in'o'component,
+in'as'options)
+LinuxMdStop(in'as'options)
+LinuxLvm2LVStop(in'as'options)
+LinuxMdCheck(in'as'options,
+out't'number_of_errors)
+DriveInhibitPolling(in'as'options,
+out's'cookie)
+DriveUninhibitPolling(in's'cookie)
+DrivePollMedia()
+DriveEject(in'as'options)
+DriveDetach(in'as'options)
+DriveSetSpindownTimeout(in'i'timeout_seconds,
+in'as'options,
+out's'cookie)
+DriveUnsetSpindownTimeout(in's'cookie)
+DriveAtaSmartRefreshData(in'as'options)
+DriveAtaSmartInitiateSelftest(in's'test,
+in'as'options)
+DriveBenchmark(in'b'do_write_benchmark,
+in'as'options,
+out'a(td)'read_transfer_rate_results,
+out'a(td)'write_transfer_rate_results,
+out'a(td)'access_time_results)
 
    
 
    
 
    
-
    Signals
    
-
    Changed    ()
-JobChanged ('b' job_in_progress,
-            'b' job_is_cancellable,
-            's' job_id,
-            'u' job_initiated_by_uid,
-            'd' job_percentage)
+
    Signals
    
+
    Changed()
+JobChanged('b'job_in_progress,
+'b'job_is_cancellable,
+'s'job_id,
+'u'job_initiated_by_uid,
+'d'job_percentage)
 
    
 
    
 
    
-
    Implemented Interfaces
    
+
    Implemented Interfaces
    
 
    
     Objects implementing org.freedesktop.UDisks.Device also implements
     org.freedesktop.DBus.Introspectable,
@@ -124,144 +117,144 @@
     
    
 
    
 
    
-
    Properties
    
-
    'NativePath'                              read      's'
-'DeviceDetectionTime'                     read      't'
-'DeviceMediaDetectionTime'                read      't'
-'DeviceMajor'                             read      'x'
-'DeviceMinor'                             read      'x'
-'DeviceFile'                              read      's'
-'DeviceFilePresentation'                  read      's'
-'DeviceFileById'                          read      'as'
-'DeviceFileByPath'                        read      'as'
-'DeviceIsSystemInternal'                  read      'b'
-'DeviceIsPartition'                       read      'b'
-'DeviceIsPartitionTable'                  read      'b'
-'DeviceIsRemovable'                       read      'b'
-'DeviceIsMediaAvailable'                  read      'b'
-'DeviceIsMediaChangeDetected'             read      'b'
-'DeviceIsMediaChangeDetectionPolling'     read      'b'
-'DeviceIsMediaChangeDetectionInhibitable' read      'b'
-'DeviceIsMediaChangeDetectionInhibited'   read      'b'
-'DeviceIsReadOnly'                        read      'b'
-'DeviceIsDrive'                           read      'b'
-'DeviceIsOpticalDisc'                     read      'b'
-'DeviceIsMounted'                         read      'b'
-'DeviceMountPaths'                        read      'as'
-'DeviceMountedByUid'                      read      'u'
-'DeviceIsLuks'                            read      'b'
-'DeviceIsLuksCleartext'                   read      'b'
-'DeviceIsLinuxMdComponent'                read      'b'
-'DeviceIsLinuxMd'                         read      'b'
-'DeviceIsLinuxLvm2LV'                     read      'b'
-'DeviceIsLinuxLvm2PV'                     read      'b'
-'DeviceIsLinuxDmmpComponent'              read      'b'
-'DeviceIsLinuxDmmp'                       read      'b'
-'DeviceIsLinuxLoop'                       read      'b'
-'DeviceSize'                              read      't'
-'DeviceBlockSize'                         read      't'
-'DevicePresentationHide'                  read      'b'
-'DevicePresentationNopolicy'              read      'b'
-'DevicePresentationName'                  read      's'
-'DevicePresentationIconName'              read      's'
-'DeviceAutomountHint'                     read      's'
-'JobInProgress'                           read      'b'
-'JobId'                                   read      's'
-'JobInitiatedByUid'                       read      'u'
-'JobIsCancellable'                        read      'b'
-'JobPercentage'                           read      'd'
-'IdUsage'                                 read      's'
-'IdType'                                  read      's'
-'IdVersion'                               read      's'
-'IdUuid'                                  read      's'
-'IdLabel'                                 read      's'
-'LuksHolder'                              read      'o'
-'LuksCleartextSlave'                      read      'o'
-'LuksCleartextUnlockedByUid'              read      'u'
-'PartitionSlave'                          read      'o'
-'PartitionScheme'                         read      's'
-'PartitionType'                           read      's'
-'PartitionLabel'                          read      's'
-'PartitionUuid'                           read      's'
-'PartitionFlags'                          read      'as'
-'PartitionNumber'                         read      'i'
-'PartitionOffset'                         read      't'
-'PartitionSize'                           read      't'
-'PartitionAlignmentOffset'                read      't'
-'PartitionTableScheme'                    read      's'
-'PartitionTableCount'                     read      'i'
-'DriveVendor'                             read      's'
-'DriveModel'                              read      's'
-'DriveRevision'                           read      's'
-'DriveSerial'                             read      's'
-'DriveWwn'                                read      's'
-'DriveRotationRate'                       read      'u'
-'DriveWriteCache'                         read      's'
-'DriveConnectionInterface'                read      's'
-'DriveConnectionSpeed'                    read      't'
-'DriveMediaCompatibility'                 read      'as'
-'DriveMedia'                              read      's'
-'DriveIsMediaEjectable'                   read      'b'
-'DriveCanDetach'                          read      'b'
-'DriveCanSpindown'                        read      'b'
-'DriveIsRotational'                       read      'b'
-'DriveAdapter'                            read      'o'
-'DrivePorts'                              read      'ao'
-'DriveSimilarDevices'                     read      'ao'
-'OpticalDiscIsBlank'                      read      'b'
-'OpticalDiscIsAppendable'                 read      'b'
-'OpticalDiscIsClosed'                     read      'b'
-'OpticalDiscNumTracks'                    read      'u'
-'OpticalDiscNumAudioTracks'               read      'u'
-'OpticalDiscNumSessions'                  read      'u'
-'DriveAtaSmartIsAvailable'                read      'b'
-'DriveAtaSmartTimeCollected'              read      't'
-'DriveAtaSmartStatus'                     read      's'
-'DriveAtaSmartBlob'                       read      'ay'
-'LinuxMdComponentLevel'                   read      's'
-'LinuxMdComponentPosition'                read      'i'
-'LinuxMdComponentNumRaidDevices'          read      'i'
-'LinuxMdComponentUuid'                    read      's'
-'LinuxMdComponentName'                    read      's'
-'LinuxMdComponentHomeHost'                read      's'
-'LinuxMdComponentVersion'                 read      's'
-'LinuxMdComponentHolder'                  read      'o'
-'LinuxMdComponentState'                   read      'as'
-'LinuxMdState'                            read      's'
-'LinuxMdLevel'                            read      's'
-'LinuxMdUuid'                             read      's'
-'LinuxMdHomeHost'                         read      's'
-'LinuxMdName'                             read      's'
-'LinuxMdNumRaidDevices'                   read      'i'
-'LinuxMdVersion'                          read      's'
-'LinuxMdSlaves'                           read      'ao'
-'LinuxMdIsDegraded'                       read      'b'
-'LinuxMdSyncAction'                       read      's'
-'LinuxMdSyncPercentage'                   read      'd'
-'LinuxMdSyncSpeed'                        read      't'
-'LinuxLvm2PVUuid'                         read      's'
-'LinuxLvm2PVNumMetadataAreas'             read      'u'
-'LinuxLvm2PVGroupName'                    read      's'
-'LinuxLvm2PVGroupUuid'                    read      's'
-'LinuxLvm2PVGroupSize'                    read      't'
-'LinuxLvm2PVGroupUnallocatedSize'         read      't'
-'LinuxLvm2PVGroupSequenceNumber'          read      't'
-'LinuxLvm2PVGroupExtentSize'              read      't'
-'LinuxLvm2PVGroupPhysicalVolumes'         read      'as'
-'LinuxLvm2PVGroupLogicalVolumes'          read      'as'
-'LinuxLvm2LVName'                         read      's'
-'LinuxLvm2LVUuid'                         read      's'
-'LinuxLvm2LVGroupName'                    read      's'
-'LinuxLvm2LVGroupUuid'                    read      's'
-'LinuxDmmpComponentHolder'                read      'o'
-'LinuxDmmpName'                           read      's'
-'LinuxDmmpSlaves'                         read      'ao'
-'LinuxDmmpParameters'                     read      's'
-'LinuxLoopFilename'                       read      's'
+
    Properties
    
+
    'NativePath'read's'
+'DeviceDetectionTime'read't'
+'DeviceMediaDetectionTime'read't'
+'DeviceMajor'read'x'
+'DeviceMinor'read'x'
+'DeviceFile'read's'
+'DeviceFilePresentation'read's'
+'DeviceFileById'read'as'
+'DeviceFileByPath'read'as'
+'DeviceIsSystemInternal'read'b'
+'DeviceIsPartition'read'b'
+'DeviceIsPartitionTable'read'b'
+'DeviceIsRemovable'read'b'
+'DeviceIsMediaAvailable'read'b'
+'DeviceIsMediaChangeDetected'read'b'
+'DeviceIsMediaChangeDetectionPolling'read'b'
+'DeviceIsMediaChangeDetectionInhibitable'read'b'
+'DeviceIsMediaChangeDetectionInhibited'read'b'
+'DeviceIsReadOnly'read'b'
+'DeviceIsDrive'read'b'
+'DeviceIsOpticalDisc'read'b'
+'DeviceIsMounted'read'b'
+'DeviceMountPaths'read'as'
+'DeviceMountedByUid'read'u'
+'DeviceIsLuks'read'b'
+'DeviceIsLuksCleartext'read'b'
+'DeviceIsLinuxMdComponent'read'b'
+'DeviceIsLinuxMd'read'b'
+'DeviceIsLinuxLvm2LV'read'b'
+'DeviceIsLinuxLvm2PV'read'b'
+'DeviceIsLinuxDmmpComponent'read'b'
+'DeviceIsLinuxDmmp'read'b'
+'DeviceIsLinuxLoop'read'b'
+'DeviceSize'read't'
+'DeviceBlockSize'read't'
+'DevicePresentationHide'read'b'
+'DevicePresentationNopolicy'read'b'
+'DevicePresentationName'read's'
+'DevicePresentationIconName'read's'
+'DeviceAutomountHint'read's'
+'JobInProgress'read'b'
+'JobId'read's'
+'JobInitiatedByUid'read'u'
+'JobIsCancellable'read'b'
+'JobPercentage'read'd'
+'IdUsage'read's'
+'IdType'read's'
+'IdVersion'read's'
+'IdUuid'read's'
+'IdLabel'read's'
+'LuksHolder'read'o'
+'LuksCleartextSlave'read'o'
+'LuksCleartextUnlockedByUid'read'u'
+'PartitionSlave'read'o'
+'PartitionScheme'read's'
+'PartitionType'read's'
+'PartitionLabel'read's'
+'PartitionUuid'read's'
+'PartitionFlags'read'as'
+'PartitionNumber'read'i'
+'PartitionOffset'read't'
+'PartitionSize'read't'
+'PartitionAlignmentOffset'read't'
+'PartitionTableScheme'read's'
+'PartitionTableCount'read'i'
+'DriveVendor'read's'
+'DriveModel'read's'
+'DriveRevision'read's'
+'DriveSerial'read's'
+'DriveWwn'read's'
+'DriveRotationRate'read'u'
+'DriveWriteCache'read's'
+'DriveConnectionInterface'read's'
+'DriveConnectionSpeed'read't'
+'DriveMediaCompatibility'read'as'
+'DriveMedia'read's'
+'DriveIsMediaEjectable'read'b'
+'DriveCanDetach'read'b'
+'DriveCanSpindown'read'b'
+'DriveIsRotational'read'b'
+'DriveAdapter'read'o'
+'DrivePorts'read'ao'
+'DriveSimilarDevices'read'ao'
+'OpticalDiscIsBlank'read'b'
+'OpticalDiscIsAppendable'read'b'
+'OpticalDiscIsClosed'read'b'
+'OpticalDiscNumTracks'read'u'
+'OpticalDiscNumAudioTracks'read'u'
+'OpticalDiscNumSessions'read'u'
+'DriveAtaSmartIsAvailable'read'b'
+'DriveAtaSmartTimeCollected'read't'
+'DriveAtaSmartStatus'read's'
+'DriveAtaSmartBlob'read'ay'
+'LinuxMdComponentLevel'read's'
+'LinuxMdComponentPosition'read'i'
+'LinuxMdComponentNumRaidDevices'read'i'
+'LinuxMdComponentUuid'read's'
+'LinuxMdComponentName'read's'
+'LinuxMdComponentHomeHost'read's'
+'LinuxMdComponentVersion'read's'
+'LinuxMdComponentHolder'read'o'
+'LinuxMdComponentState'read'as'
+'LinuxMdState'read's'
+'LinuxMdLevel'read's'
+'LinuxMdUuid'read's'
+'LinuxMdHomeHost'read's'
+'LinuxMdName'read's'
+'LinuxMdNumRaidDevices'read'i'
+'LinuxMdVersion'read's'
+'LinuxMdSlaves'read'ao'
+'LinuxMdIsDegraded'read'b'
+'LinuxMdSyncAction'read's'
+'LinuxMdSyncPercentage'read'd'
+'LinuxMdSyncSpeed'read't'
+'LinuxLvm2PVUuid'read's'
+'LinuxLvm2PVNumMetadataAreas'read'u'
+'LinuxLvm2PVGroupName'read's'
+'LinuxLvm2PVGroupUuid'read's'
+'LinuxLvm2PVGroupSize'read't'
+'LinuxLvm2PVGroupUnallocatedSize'read't'
+'LinuxLvm2PVGroupSequenceNumber'read't'
+'LinuxLvm2PVGroupExtentSize'read't'
+'LinuxLvm2PVGroupPhysicalVolumes'read'as'
+'LinuxLvm2PVGroupLogicalVolumes'read'as'
+'LinuxLvm2LVName'read's'
+'LinuxLvm2LVUuid'read's'
+'LinuxLvm2LVGroupName'read's'
+'LinuxLvm2LVGroupUuid'read's'
+'LinuxDmmpComponentHolder'read'o'
+'LinuxDmmpName'read's'
+'LinuxDmmpSlaves'read'ao'
+'LinuxDmmpParameters'read's'
+'LinuxLoopFilename'read's'
 
    
 
    
 
    
-
    Description
    
+
    Description
    
 
    
       
         
    
@@ -311,23 +304,29 @@
     
    
 
    
 
    
-
    Details
    
+
    Details
    
 
    
-
    
+
    
 JobCancel ()
    
 
    JobCancel ()
    
 
    
 
    
             Cancels a job in progress.
           
    
-
    
+
    
+++
    
 


 
 
    
 
    
-
    Errors
    
-
    
+
    Errors
    
+
    
+++
@@ -341,26 +340,26 @@
 
    
 


 
 
    
 
    org.freedesktop.PolicyKit.Error.NotAuthorized:
    
 
    
 
    
-
    Permissions
    
+
    Permissions
    
 
    
           The caller will need one of the following PolicyKit authorizations:
           
    
-
    • 
+
      • 
 org.freedesktop.udisks.cancel-job-others: To cancel a job initiated by another user
      
 
      
         
      
 
    
 
    
 
    
-
    
+
    
 PartitionTableCreate ()
    
-
    PartitionTableCreate (in  's'  scheme,
-                      in  'as' options)
    
+
    PartitionTableCreate (in's'scheme,
+in'as'options)
    
 
    
 
    
             Creates a new partition table. The following partition table schemes are supported:
             
    
-
      
+
        
 
      • 
 none: To zero out existing partition tables signatures.
        • 
 
      • 
@@ -384,8 +383,11 @@
 
      
 
      
           
      
-
      
+
      
+++
@@ -400,9 +402,12 @@
 
      
 


 
 
      
 
      scheme:
      
 
      
 
      
-
      Errors
      
-
      
+
      Errors
      
+
      
+++
@@ -424,11 +429,11 @@
 
      
 


 
 
      
 
      org.freedesktop.PolicyKit.Error.NotAuthorized:
      
 
      
 
      
-
      Permissions
      
+
      Permissions
      
 
      
           The caller will need one of the following PolicyKit authorizations:
           
      
-
        
+
          
 
        • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -443,24 +448,30 @@
 
        
 
        
 
        
-
        
+
        
 PartitionDelete ()
        
-
        PartitionDelete (in  'as' options)
        
+
        PartitionDelete (in'as'options)
        
 
        
 
        
             Deletes a partition, removing it from the enclosing partition table.
           
        
-
        
+
        
+++
        
 


 
        
 
        options:
        		
 No options are currently supported.
 
        
 
        
 
        
-
        Errors
        
-
        
+
        Errors
        
+
        
+++
@@ -482,11 +493,11 @@
 
        
 


 
 
        
 
        org.freedesktop.PolicyKit.Error.NotAuthorized:
        
 
        
 
        
-
        Permissions
        
+
        Permissions
        
 
        
           The caller will need one of the following PolicyKit authorizations:
           
        
-
          
+
            
 
          • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -501,17 +512,17 @@
 
          
 
          
 
          
-
          
+
          
 PartitionCreate ()
          
-
          PartitionCreate (in  't'  offset,
-                 in  't'  size,
-                 in  's'  type,
-                 in  's'  label,
-                 in  'as' flags,
-                 in  'as' options,
-                 in  's'  fstype,
-                 in  'as' fsoptions,
-                 out 'o'  created_device)
          
+
          PartitionCreate (in't'offset,
+in't'size,
+in's'type,
+in's'label,
+in'as'flags,
+in'as'options,
+in's'fstype,
+in'as'fsoptions,
+out'o'created_device)
          
 
          
 
          
             Create a new partition and, optionally, create a file
@@ -519,8 +530,11 @@
             at the exact location requested due to disk geometry
             constraints.
           
          
-
          
+
          
+++
@@ -535,7 +549,7 @@
 
          
 


 
 
          
 
          offset:
          		
             The type of the partition to create. Valid types depends
             on the partitioning scheme used:
-            
            
+            
              
 
            • 
 mbr: 
                   For the
@@ -570,7 +584,7 @@
 
          		
             Flags to use for the partition. Valid flags depends on the
             partitioning scheme used:
-            
            
+            
              
 
            • 
 mbr: 
                   Only the flag boot is valid.
@@ -621,9 +635,12 @@
 
          
 
          
 
          
-
          Errors
          
-
          
+
          Errors
          
+
          
+++
@@ -645,11 +662,11 @@
 
          
 


 
 
          
 
          org.freedesktop.PolicyKit.Error.NotAuthorized:
          
 
          
 
          
-
          Permissions
          
+
          Permissions
          
 
          
           The caller will need one of the following PolicyKit authorizations:
           
          
-
            
+
              
 
            • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -664,19 +681,22 @@
 
            
 
            
 
            
-
            
+
            
 PartitionModify ()
            
-
            PartitionModify (in  's'  type,
-                 in  's'  label,
-                 in  'as' flags)
            
+
            PartitionModify (in's'type,
+in's'label,
+in'as'flags)
            
 
            
 
            
             Modifies meta data for a partition, such as type, label and flags.
             TODO: Consider allowing changing offset and
             size. Or maybe that should be a separate method.
           
            
-
            
+
            
+++
@@ -705,9 +725,12 @@
 
            
 


 
 
            
 
            type:
            
 
            
 
            
-
            Errors
            
-
            
+
            Errors
            
+
            
+++
@@ -729,11 +752,11 @@
 
            
 


 
 
            
 
            org.freedesktop.PolicyKit.Error.NotAuthorized:
            
 
            
 
            
-
            Permissions
            
+
            Permissions
            
 
            
           The caller will need one of the following PolicyKit authorizations:
           
            
-
              
+
                
 
              • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -748,10 +771,10 @@
 
              
 
              
 
              
-
              
+
              
 FilesystemCreate ()
              
-
              FilesystemCreate (in  's'  fstype,
-                  in  'as' options)
              
+
              FilesystemCreate (in's'fstype,
+in'as'options)
              
 
              
 
              
             Create a file system on a device. If
@@ -760,8 +783,11 @@
             the file system will be created on the corresponding
             cleartext device.
           
              
-
              
+
              
+++
@@ -792,9 +818,12 @@
 
              
 


 
 
              
 
              fstype:
              
 
              
 
              
-
              Errors
              
-
              
+
              Errors
              
+
              
+++
@@ -820,11 +849,11 @@
 
              
 


 
 
              
 
              org.freedesktop.PolicyKit.Error.NotAuthorized:
              
 
              
 
              
-
              Permissions
              
+
              Permissions
              
 
              
           The caller will need one of the following PolicyKit authorizations:
           
              
-
                
+
                  
 
                • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -839,17 +868,20 @@
 
                
 
                
 
                
-
                
+
                
 FilesystemSetLabel ()
                
-
                FilesystemSetLabel (in  's' new_label)
                
+
                FilesystemSetLabel (in's'new_label)
                
 
                
 
                
             Changes the file system label. See the options parameter of
             FilesystemCreate()
             method for details of what valid labels are valid.
           
                
-
                
+
                
+++
                
 


 
                
 
                new_label:
                		
 
@@ -858,9 +890,12 @@
 
                
 
                
 
                
-
                Errors
                
-
                
+
                Errors
                
+
                
+++
@@ -886,11 +921,11 @@
 
                
 


 
 
                
 
                org.freedesktop.PolicyKit.Error.NotAuthorized:
                
 
                
 
                
-
                Permissions
                
+
                Permissions
                
 
                
           The caller will need one of the following PolicyKit authorizations:
           
                
-
                  
+
                    
 
                  • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -905,11 +940,11 @@
 
                  
 
                  
 
                  
-
                  
+
                  
 FilesystemMount ()
                  
-
                  FilesystemMount (in  's'  filesystem_type,
-                 in  'as' options,
-                 out 's'  mount_path)
                  
+
                  FilesystemMount (in's'filesystem_type,
+in'as'options,
+out's'mount_path)
                  
 
                  
 
                  
             Mount the device. If the device is referenced in the
@@ -917,8 +952,11 @@
             parameters are all ignored and the device will be
             attempted to be mounted as the calling user.
           
                  
-
                  
+
                  
+++
@@ -937,9 +975,12 @@
 
                  
 


 
 
                  
 
                  filesystem_type:
                  
 
                  
 
                  
-
                  Errors
                  
-
                  
+
                  Errors
                  
+
                  
+++
@@ -969,11 +1010,11 @@
 
                  
 


 
 
                  
 
                  org.freedesktop.PolicyKit.Error.NotAuthorized:
                  
 
                  
 
                  
-
                  Permissions
                  
+
                  Permissions
                  
 
                  
           The caller will need one of the following PolicyKit authorizations:
           
                  
-
                    
+
                      
 
                    • 
 org.freedesktop.udisks.filesystem-mount: If the operation is on a
                 non-system-internal
@@ -988,9 +1029,9 @@
 
                    
 
                    
 
                    
-
                    
+
                    
 FilesystemUnmount ()
                    
-
                    FilesystemUnmount (in  'as' options)
                    
+
                    FilesystemUnmount (in'as'options)
                    
 
                    
 
                    
             Unmount the device. If the device is referenced in the
@@ -998,17 +1039,23 @@
             mount time and when this method is invoked), the device
             will be attempted to be unmounted as the calling user.
           
                    
-
                    
+
                    
+++
                    
 


 
                    
 
                    options:
                    		
 Unmount options. Valid options currently include only 'force'.
 
                    
 
                    
 
                    
-
                    Errors
                    
-
                    
+
                    Errors
                    
+
                    
+++
@@ -1034,27 +1081,30 @@
 
                    
 


 
 
                    
 
                    org.freedesktop.PolicyKit.Error.NotAuthorized:
                    
 
                    
 
                    
-
                    Permissions
                    
+
                    Permissions
                    
 
                    
           The caller will need one of the following PolicyKit authorizations:
           
                    
-
                    • 
+
                      • 
 org.freedesktop.udisks.filesystem-unmount-others: To unmount a device mounted by another user
                      
 
                      
         
                      
 
                    
 
                    
 
                    
-
                    
+
                    
 FilesystemCheck ()
                    
-
                    FilesystemCheck (in  'as' options,
-                 out 'b'  is_clean)
                    
+
                    FilesystemCheck (in'as'options,
+out'b'is_clean)
                    
 
                    
 
                    
             Perform a non-interactive file system check.
           
                    
-
                    
+
                    
+++
@@ -1069,9 +1119,12 @@
 
                    
 


 
 
                    
 
                    options:
                    
 
                    
 
                    
-
                    Errors
                    
-
                    
+
                    Errors
                    
+
                    
+++
@@ -1093,11 +1146,11 @@
 
                    
 


 
 
                    
 
                    org.freedesktop.PolicyKit.Error.NotAuthorized:
                    
 
                    
 
                    
-
                    Permissions
                    
+
                    Permissions
                    
 
                    
           The caller will need one of the following PolicyKit authorizations:
           
                    
-
                      
+
                        
 
                      • 
 org.freedesktop.udisks.filesystem-check: To check a file system on a
                 non-system-internal
@@ -1112,15 +1165,18 @@
 
                      
 
                      
 
                      
-
                      
+
                      
 FilesystemListOpenFiles ()
                      
-
                      FilesystemListOpenFiles (out 'a(uus)' processes)
                      
+
                      FilesystemListOpenFiles (out'a(uus)'processes)
                      
 
                      
 
                      
             List open files on a mounted file system.
           
                      
-
                      
+
                      
+++
                      
 


 
                      
 
                      processes:
                      		
 
@@ -1131,9 +1187,12 @@
 
                      
 
                      
 
                      
-
                      Errors
                      
-
                      
+
                      Errors
                      
+
                      
+++
@@ -1151,11 +1210,11 @@
 
                      
 


 
 
                      
 
                      org.freedesktop.PolicyKit.Error.NotAuthorized:
                      
 
                      
 
                      
-
                      Permissions
                      
+
                      Permissions
                      
 
                      
           The caller will need one of the following PolicyKit authorizations:
           
                      
-
                        
+
                          
 
                        • 
 org.freedesktop.udisks.filesystem-lsof: To check a file system on a
                 non-system-internal
@@ -1170,17 +1229,20 @@
 
                        
 
                        
 
                        
-
                        
+
                        
 LuksUnlock ()
                        
-
                        LuksUnlock (in  's'  passphrase,
-            in  'as' options,
-            out 'o'  cleartext_device)
                        
+
                        LuksUnlock (in's'passphrase,
+in'as'options,
+out'o'cleartext_device)
                        
 
                        
 
                        
             Sets up a cleartext device using the given device as backing store.
           
                        
-
                        
+
                        
+++
@@ -1197,9 +1259,12 @@
 
                        
 


 
 
                        
 
                        passphrase:
                        
 
                        
 
                        
-
                        Errors
                        
-
                        
+
                        Errors
                        
+
                        
+++
@@ -1221,37 +1286,43 @@
 
                        
 


 
 
                        
 
                        org.freedesktop.PolicyKit.Error.NotAuthorized:
                        
 
                        
 
                        
-
                        Permissions
                        
+
                        Permissions
                        
 
                        
           The caller will need one of the following PolicyKit authorizations:
           
                        
-
                        • 
+
                          • 
 org.freedesktop.udisks.luks-unlock: To unlock LUKS encrypted devices
                          
 
                          
         
                          
 
                        
 
                        
 
                        
-
                        
+
                        
 LuksLock ()
                        
-
                        LuksLock (in  'as' options)
                        
+
                        LuksLock (in'as'options)
                        
 
                        
 
                        
             Tears down the cleartext device set up using
             e.g. the LuksUnlock()
             method.
           
                        
-
                        
+
                        
+++
                        
 


 
                        
 
                        options:
                        		
 Currently unused.
 
                        
 
                        
 
                        
-
                        Errors
                        
-
                        
+
                        Errors
                        
+
                        
+++
@@ -1273,27 +1344,30 @@
 
                        
 


 
 
                        
 
                        org.freedesktop.PolicyKit.Error.NotAuthorized:
                        
 
                        
 
                        
-
                        Permissions
                        
+
                        Permissions
                        
 
                        
           The caller will need one of the following PolicyKit authorizations:
           
                        
-
                        • 
+
                          • 
 org.freedesktop.udisks.luks-lock-others: To lock an encrypted LUKS device unlocked by another user
                          
 
                          
         
                          
 
                        
 
                        
 
                        
-
                        
+
                        
 LuksChangePassphrase ()
                        
-
                        LuksChangePassphrase (in  's' current_passphrase,
-                      in  's' new_passphrase)
                        
+
                        LuksChangePassphrase (in's'current_passphrase,
+in's'new_passphrase)
                        
 
                        
 
                        
             Change the passphrase used to unlock a LUKS encrypted device.
           
                        
-
                        
+
                        
+++
@@ -1306,9 +1380,12 @@
 
                        
 


 
 
                        
 
                        current_passphrase:
                        
 
                        
 
                        
-
                        Errors
                        
-
                        
+
                        Errors
                        
+
                        
+++
@@ -1330,11 +1407,11 @@
 
                        
 


 
 
                        
 
                        org.freedesktop.PolicyKit.Error.NotAuthorized:
                        
 
                        
 
                        
-
                        Permissions
                        
+
                        Permissions
                        
 
                        
           The caller will need one of the following PolicyKit authorizations:
           
                        
-
                          
+
                            
 
                          • 
 org.freedesktop.udisks.change: If the operation is on a
                 non-system-internal
@@ -1349,17 +1426,20 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdAddSpare ()
                          
-
                          LinuxMdAddSpare (in  'o'  component,
-                 in  'as' options)
                          
+
                          LinuxMdAddSpare (in'o'component,
+in'as'options)
                          
 
                          
 
                          
             Adds a component to a Linux md RAID array. Existing data
             on the given component will be erased.
           
                          
-
                          
+
                          
+++
@@ -1372,9 +1452,12 @@
 
                          
 


 
 
                          
 
                          component:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1396,11 +1479,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1409,16 +1492,19 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdExpand ()
                          
-
                          LinuxMdExpand (in  'ao' components,
-               in  'as' options)
                          
+
                          LinuxMdExpand (in'ao'components,
+in'as'options)
                          
 
                          
 
                          
             Grows the Linux md RAID array with the given components.
           
                          
-
                          
+
                          
+++
@@ -1431,9 +1517,12 @@
 
                          
 


 
 
                          
 
                          components:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1455,11 +1544,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1468,18 +1557,21 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdRemoveComponent ()
                          
-
                          LinuxMdRemoveComponent (in  'o'  component,
-                        in  'as' options)
                          
+
                          LinuxMdRemoveComponent (in'o'component,
+in'as'options)
                          
 
                          
 
                          
             Removes a component from a Linux md RAID array. The component
             will be removed and then the signatures on the component will be
             scrubbed.
           
                          
-
                          
+
                          
+++
@@ -1492,9 +1584,12 @@
 
                          
 


 
 
                          
 
                          component:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1516,11 +1611,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1529,24 +1624,30 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdStop ()
                          
-
                          LinuxMdStop (in  'as' options)
                          
+
                          LinuxMdStop (in'as'options)
                          
 
                          
 
                          
             Stops a Linux md RAID array.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          options:
                          		
 Currently unused.
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1564,11 +1665,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1577,24 +1678,30 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2LVStop ()
                          
-
                          LinuxLvm2LVStop (in  'as' options)
                          
+
                          LinuxLvm2LVStop (in'as'options)
                          
 
                          
 
                          
             Stops a Linux LVM2 Logical Volume.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          options:
                          		
 Currently unused.
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1612,11 +1719,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2.
               
                            
@@ -1625,10 +1732,10 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdCheck ()
                          
-
                          LinuxMdCheck (in  'as' options,
-              out 't'  number_of_errors)
                          
+
                          LinuxMdCheck (in'as'options,
+out't'number_of_errors)
                          
 
                          
 
                          
             Checks a Linux md RAID array and returns the number of
@@ -1637,8 +1744,11 @@
             LinuxMdSyncAction
             is idle.
           
                          
-
                          
+
                          
+++
@@ -1655,9 +1765,12 @@
 
                          
 


 
 
                          
 
                          options:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1675,11 +1788,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1688,16 +1801,19 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveInhibitPolling ()
                          
-
                          DriveInhibitPolling (in  'as' options,
-                     out 's'  cookie)
                          
+
                          DriveInhibitPolling (in'as'options,
+out's'cookie)
                          
 
                          
 
                          
             Inhibits the daemon from polling the device for media changes.
           
                          
-
                          
+
                          
+++
@@ -1714,9 +1830,12 @@
 
                          
 


 
 
                          
 
                          options:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1730,26 +1849,29 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.inhibit-polling: To inhibit polling
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveUninhibitPolling ()
                          
-
                          DriveUninhibitPolling (in  's' cookie)
                          
+
                          DriveUninhibitPolling (in's'cookie)
                          
 
                          
 
                          
             Uninhibits daemon from polling the device for media changes.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -1759,9 +1881,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1770,7 +1895,7 @@
 
                          
-
                          
+
                          
 DrivePollMedia ()
                          
 
                          DrivePollMedia ()
                          
 
                          
@@ -1779,14 +1904,20 @@
             DeviceIsMediaChangeDetected property
             is FALSE.
           
                          
-
                          
 


 
                          
 
                          org.freedesktop.PolicyKit.Error.Failed:
                          		
 if the given cookie is malformed
 
 
                          
+
                          
+++
                          
 


 
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1794,35 +1925,41 @@
 
                          
 


 
                          
 
                          org.freedesktop.PolicyKit.Error.Failed:
                          		
 if the operation failed
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.inhibit-polling: To inhibit polling
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveEject ()
                          
-
                          DriveEject (in  'as' options)
                          
+
                          DriveEject (in'as'options)
                          
 
                          
 
                          
             Ejects media from the device. If the unmount option is given, the device might have mounted file systems, which will be unmounted before ejection.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          options:
                          		
 Eject options. Valid options currently include only 'unmount'.
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1848,20 +1985,20 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-eject: To eject media from a device
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveDetach ()
                          
-
                          DriveDetach (in  'as' options)
                          
+
                          DriveDetach (in'as'options)
                          
 
                          
 
                          
             Detachs the device by e.g. powering down the physical port
@@ -1879,17 +2016,23 @@
             e.g. an Eject button in the UI. Instead, provide e.g. a
             "Safely Remove Drive" option.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          options:
                          		
 Detach options. Currently no options are recognized.
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1915,22 +2058,22 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-detach: To detach a device
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveSetSpindownTimeout ()
                          
-
                          DriveSetSpindownTimeout (in  'i'  timeout_seconds,
-                         in  'as' options,
-                         out 's'  cookie)
                          
+
                          DriveSetSpindownTimeout (in'i'timeout_seconds,
+in'as'options,
+out's'cookie)
                          
 
                          
 
                          
             Configures spindown timeout for the drive.
@@ -1941,8 +2084,11 @@
             the SPINNING DOWN DISKS section in the
             udisks(1) man page before using it.
           
                          
-
                          
+
                          
+++
@@ -1967,9 +2113,12 @@
 
                          
 


 
 
                          
 
                          timeout_seconds:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1987,26 +2136,29 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveUnsetSpindownTimeout ()
                          
-
                          DriveUnsetSpindownTimeout (in  's' cookie)
                          
+
                          DriveUnsetSpindownTimeout (in's'cookie)
                          
 
                          
 
                          
             Unsets spindown timeout for the drive.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -2016,9 +2168,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -2032,28 +2187,31 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveAtaSmartRefreshData ()
                          
-
                          DriveAtaSmartRefreshData (in  'as' options)
                          
+
                          DriveAtaSmartRefreshData (in'as'options)
                          
 
                          
 
                          
             Refreshes the
             ATA SMART
             data for the given drive. Note that this operation is not run as a job.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          options:
                          		
 
@@ -2066,9 +2224,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -2086,27 +2247,30 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-ata-smart-refresh: Needed to refresh ATA SMART data
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveAtaSmartInitiateSelftest ()
                          
-
                          DriveAtaSmartInitiateSelftest (in  's'  test,
-                               in  'as' options)
                          
+
                          DriveAtaSmartInitiateSelftest (in's'test,
+in'as'options)
                          
 
                          
 
                          
             Runs a ATA SMART self test on the drive.
           
                          
-
                          
+
                          
+++
@@ -2123,9 +2287,12 @@
 
                          
 


 
 
                          
 
                          test:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -2143,30 +2310,33 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-ata-smart-selftest: Needed to run ATA SMART self tests
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveBenchmark ()
                          
-
                          DriveBenchmark (in  'b'     do_write_benchmark,
-                in  'as'    options,
-                out 'a(td)' read_transfer_rate_results,
-                out 'a(td)' write_transfer_rate_results,
-                out 'a(td)' access_time_results)
                          
+
                          DriveBenchmark (in'b'do_write_benchmark,
+in'as'options,
+out'a(td)'read_transfer_rate_results,
+out'a(td)'write_transfer_rate_results,
+out'a(td)'access_time_results)
                          
 
                          
 
                          
             Benchmarks the drive.
           
                          
-
                          
+
                          
+++
@@ -2212,9 +2382,12 @@
 
                          
 


 
 
                          
 
                          do_write_benchmark:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -2232,20 +2405,20 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.change: Needed to run benchmarks
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          Signal Details
                          
+
                          Signal Details
                          
 
                          
-
                          
+
                          
 The Changed signal
                          
 
                          Changed ()
                          
 
                          
@@ -2253,27 +2426,33 @@
             Something on the device changed. Changes in job state wont
             trigger this signal; see the JobChanged() signal.
           
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The JobChanged signal
                          
-
                          JobChanged ('b' job_in_progress,
-            'b' job_is_cancellable,
-            's' job_id,
-            'u' job_initiated_by_uid,
-            'd' job_percentage)
                          
+
                          JobChanged ('b'job_in_progress,
+'b'job_is_cancellable,
+'s'job_id,
+'u'job_initiated_by_uid,
+'d'job_percentage)
                          
 
                          
 
                          
             Emitted when a job on a device changes. Clients should
             listen to this signal to avoid polling the daemon for job
             state.
           
                          
-
                          
+
                          
+++
@@ -2299,40 +2478,46 @@
 
                          
 


 
 
                          
 
                          job_in_progress:
                          
 
                          
 
                          
-
                          Property Details
                          
+
                          Property Details
                          
 
                          
-
                          
+
                          
 The "NativePath" property
                          
-
                          'NativePath'  read      's'
+
                          'NativePath'read's'
 
                          
 
                          
 
                          
             OS specific native path of the device. On Linux this is the sysfs path, for example /sys/devices/pci0000:00/0000:00:1f.2/host2/target2:0:1/2:0:1:0/block/sda.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceDetectionTime" property
                          
-
                          'DeviceDetectionTime'  read      't'
+
                          'DeviceDetectionTime'read't'
 
                          
 
                          
 
                          
             The point in time (seconds since the Epoch Jan 1, 1970 0:00 UTC) when the device
             was detected by the daemon.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceMediaDetectionTime" property
                          
-
                          'DeviceMediaDetectionTime'  read      't'
+
                          'DeviceMediaDetectionTime'read't'
 
                          
 
                          
 
                          
@@ -2340,57 +2525,69 @@
             media currently in the device was detected by the daemon or 0 if the
             device has no media.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceMajor" property
                          
-
                          'DeviceMajor'  read      'x'
+
                          'DeviceMajor'read'x'
 
                          
 
                          
 
                          
             Major for the device or -1 if not set.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceMinor" property
                          
-
                          'DeviceMinor'  read      'x'
+
                          'DeviceMinor'read'x'
 
                          
 
                          
 
                          
             Major for the device or -1 if not set.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceFile" property
                          
-
                          'DeviceFile'  read      's'
+
                          'DeviceFile'read's'
 
                          
 
                          
 
                          
             UNIX special device file for device. Example: /dev/sda.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceFilePresentation" property
                          
-
                          'DeviceFilePresentation'  read      's'
+
                          'DeviceFilePresentation'read's'
 
                          
 
                          
 
                          
@@ -2402,15 +2599,18 @@
             Example: /dev/mapper/mpathb or
             /dev/vg_phobos/lv_root.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceFileById" property
                          
-
                          'DeviceFileById'  read      'as'
+
                          'DeviceFileById'read'as'
 
                          
 
                          
 
                          
@@ -2418,30 +2618,36 @@
             Example: /dev/disk/by-id/scsi-SATA_ST910021AS_3MH05AVA,
             /dev/disk/by-id/ata-ST910021AS_3MH05AVA.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceFileByPath" property
                          
-
                          'DeviceFileByPath'  read      'as'
+
                          'DeviceFileByPath'read'as'
 
                          
 
                          
 
                          
             Symlinks to UNIX special device file that uniquely identifies the port/partition the device
             is plugged into. Example: /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:1:0
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsSystemInternal" property
                          
-
                          'DeviceIsSystemInternal'  read      'b'
+
                          'DeviceIsSystemInternal'read'b'
 
                          
 
                          
 
                          
@@ -2450,85 +2656,103 @@
             by a local console user. The heuristic typically used is that only devices on removable media
             and devices connected via Firewire, USB, eSATA and SDIO are considered external.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsPartition" property
                          
-
                          'DeviceIsPartition'  read      'b'
+
                          'DeviceIsPartition'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a partition. See the properties starting with partition- for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsPartitionTable" property
                          
-
                          'DeviceIsPartitionTable'  read      'b'
+
                          'DeviceIsPartitionTable'read'b'
 
                          
 
                          
 
                          
             TRUE if the device contains a partition table. See partition- properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsRemovable" property
                          
-
                          'DeviceIsRemovable'  read      'b'
+
                          'DeviceIsRemovable'read'b'
 
                          
 
                          
 
                          
             TRUE if the device contains removable media.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMediaAvailable" property
                          
-
                          'DeviceIsMediaAvailable'  read      'b'
+
                          'DeviceIsMediaAvailable'read'b'
 
                          
 
                          
 
                          
             TRUE if media is available in the device.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMediaChangeDetected" property
                          
-
                          'DeviceIsMediaChangeDetected'  read      'b'
+
                          'DeviceIsMediaChangeDetected'read'b'
 
                          
 
                          
 
                          
             TRUE if media changes are detected.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMediaChangeDetectionPolling" property
                          
-
                          'DeviceIsMediaChangeDetectionPolling'  read      'b'
+
                          'DeviceIsMediaChangeDetectionPolling'read'b'
 
                          
 
                          
 
                          
@@ -2539,101 +2763,122 @@
             example, SATA AN capable optical drives does not need
             polling.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMediaChangeDetectionInhibitable" property
                          
-
                          'DeviceIsMediaChangeDetectionInhibitable'  read      'b'
+
                          'DeviceIsMediaChangeDetectionInhibitable'read'b'
 
                          
 
                          
 
                          
             TRUE if it is possible to inhibit media detection on the device (to avoid keeping the device in a high power state and waking up the host).
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMediaChangeDetectionInhibited" property
                          
-
                          'DeviceIsMediaChangeDetectionInhibited'  read      'b'
+
                          'DeviceIsMediaChangeDetectionInhibited'read'b'
 
                          
 
                          
 
                          
             TRUE if media detection is inhibited (to avoid keeping the device in a high power state and waking up the host).
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsReadOnly" property
                          
-
                          'DeviceIsReadOnly'  read      'b'
+
                          'DeviceIsReadOnly'read'b'
 
                          
 
                          
 
                          
             TRUE if the device read-only.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsDrive" property
                          
-
                          'DeviceIsDrive'  read      'b'
+
                          'DeviceIsDrive'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a drive.
             See the drive- properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsOpticalDisc" property
                          
-
                          'DeviceIsOpticalDisc'  read      'b'
+
                          'DeviceIsOpticalDisc'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is an optical drive and an optical disc is inserted.
             See the optical-disc- properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsMounted" property
                          
-
                          'DeviceIsMounted'  read      'b'
+
                          'DeviceIsMounted'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is mounted.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceMountPaths" property
                          
-
                          'DeviceMountPaths'  read      'as'
+
                          'DeviceMountPaths'read'as'
 
                          
 
                          
 
                          
@@ -2642,15 +2887,18 @@
             DeviceIsMounted
             is TRUE.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceMountedByUid" property
                          
-
                          'DeviceMountedByUid'  read      'u'
+
                          'DeviceMountedByUid'read'u'
 
                          
 
                          
 
                          
@@ -2660,234 +2908,282 @@
             DeviceIsMounted
             is TRUE.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLuks" property
                          
-
                          'DeviceIsLuks'  read      'b'
+
                          'DeviceIsLuks'read'b'
 
                          
 
                          
 
                          
             TRUE if device is an LUKS encrypted device. See Lucks properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLuksCleartext" property
                          
-
                          'DeviceIsLuksCleartext'  read      'b'
+
                          'DeviceIsLuksCleartext'read'b'
 
                          
 
                          
 
                          
             TRUE if device is a cleartext device backed by a LUKS encrypted device. See LucksCleartext properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxMdComponent" property
                          
-
                          'DeviceIsLinuxMdComponent'  read      'b'
+
                          'DeviceIsLinuxMdComponent'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux md RAID component. See LinuxMdComponent properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxMd" property
                          
-
                          'DeviceIsLinuxMd'  read      'b'
+
                          'DeviceIsLinuxMd'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux md RAID array. See LinuxMd properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxLvm2LV" property
                          
-
                          'DeviceIsLinuxLvm2LV'  read      'b'
+
                          'DeviceIsLinuxLvm2LV'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux LVM2 logical volume. See LinuxLvm2LV properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxLvm2PV" property
                          
-
                          'DeviceIsLinuxLvm2PV'  read      'b'
+
                          'DeviceIsLinuxLvm2PV'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux LVM2 physical. See LinuxLvm2PV properties for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxDmmpComponent" property
                          
-
                          'DeviceIsLinuxDmmpComponent'  read      'b'
+
                          'DeviceIsLinuxDmmpComponent'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a component (e.g. active path) of a Linux dm-multipath device.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxDmmp" property
                          
-
                          'DeviceIsLinuxDmmp'  read      'b'
+
                          'DeviceIsLinuxDmmp'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux dm-multipath device.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceIsLinuxLoop" property
                          
-
                          'DeviceIsLinuxLoop'  read      'b'
+
                          'DeviceIsLinuxLoop'read'b'
 
                          
 
                          
 
                          
             TRUE if the device is a Linux loop device.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceSize" property
                          
-
                          'DeviceSize'  read      't'
+
                          'DeviceSize'read't'
 
                          
 
                          
 
                          
             The size of the device in bytes.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceBlockSize" property
                          
-
                          'DeviceBlockSize'  read      't'
+
                          'DeviceBlockSize'read't'
 
                          
 
                          
 
                          
             The block size of the device in bytes.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DevicePresentationHide" property
                          
-
                          'DevicePresentationHide'  read      'b'
+
                          'DevicePresentationHide'read'b'
 
                          
 
                          
 
                          
             A hint if the device should be hidden from the user interface.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DevicePresentationNopolicy" property
                          
-
                          'DevicePresentationNopolicy'  read      'b'
+
                          'DevicePresentationNopolicy'read'b'
 
                          
 
                          
 
                          
             A hint if the device (or e.g. the multi-disk device that the device is
             part of) shouldn't be automatically mounted / assembled.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DevicePresentationName" property
                          
-
                          'DevicePresentationName'  read      's'
+
                          'DevicePresentationName'read's'
 
                          
 
                          
 
                          
             The name to use when presenting the device to an end user.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DevicePresentationIconName" property
                          
-
                          'DevicePresentationIconName'  read      's'
+
                          'DevicePresentationIconName'read's'
 
                          
 
                          
 
                          
             The icon to use when presenting the device to an end user. If set, must be a name
             following the freedesktop.org icon theme specification.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DeviceAutomountHint" property
                          
-
                          'DeviceAutomountHint'  read      's'
+
                          'DeviceAutomountHint'read's'
 
                          
 
                          
 
                          
             A hint to the desktop that indicates if a device should be automounted.
             Possible values are:
             
                          
-
                          
@@ -436,193 +436,193 @@
 
                          L
                          
 
                          
 
                          LinuxDmmpComponentHolder
                          
-
                          Device, The "LinuxDmmpComponentHolder" property
+
                          Device, The "LinuxDmmpComponentHolder" property
 
                          
 
                          LinuxDmmpName
                          
-
                          Device, The "LinuxDmmpName" property
+
                          Device, The "LinuxDmmpName" property
 
                          
 
                          LinuxDmmpParameters
                          
-
                          Device, The "LinuxDmmpParameters" property
+
                          Device, The "LinuxDmmpParameters" property
 
                          
 
                          LinuxDmmpSlaves
                          
-
                          Device, The "LinuxDmmpSlaves" property
+
                          Device, The "LinuxDmmpSlaves" property
 
                          
 
                          LinuxLoopFilename
                          
-
                          Device, The "LinuxLoopFilename" property
+
                          Device, The "LinuxLoopFilename" property
 
                          
 
                          LinuxLvm2LVCreate
                          
-
                          UDisks, LinuxLvm2LVCreate ()
+
                          UDisks, LinuxLvm2LVCreate ()
 
                          
 
                          LinuxLvm2LVGroupName
                          
-
                          Device, The "LinuxLvm2LVGroupName" property
+
                          Device, The "LinuxLvm2LVGroupName" property
 
                          
 
                          LinuxLvm2LVGroupUuid
                          
-
                          Device, The "LinuxLvm2LVGroupUuid" property
+
                          Device, The "LinuxLvm2LVGroupUuid" property
 
                          
 
                          LinuxLvm2LVName
                          
-
                          Device, The "LinuxLvm2LVName" property
+
                          Device, The "LinuxLvm2LVName" property
 
                          
 
                          LinuxLvm2LVRemove
                          
-
                          UDisks, LinuxLvm2LVRemove ()
+
                          UDisks, LinuxLvm2LVRemove ()
 
                          
 
                          LinuxLvm2LVSetName
                          
-
                          UDisks, LinuxLvm2LVSetName ()
+
                          UDisks, LinuxLvm2LVSetName ()
 
                          
 
                          LinuxLvm2LVStart
                          
-
                          UDisks, LinuxLvm2LVStart ()
+
                          UDisks, LinuxLvm2LVStart ()
 
                          
 
                          LinuxLvm2LVStop
                          
-
                          Device, LinuxLvm2LVStop ()
+
                          Device, LinuxLvm2LVStop ()
 
                          
 
                          LinuxLvm2LVUuid
                          
-
                          Device, The "LinuxLvm2LVUuid" property
+
                          Device, The "LinuxLvm2LVUuid" property
 
                          
 
                          LinuxLvm2PVGroupExtentSize
                          
-
                          Device, The "LinuxLvm2PVGroupExtentSize" property
+
                          Device, The "LinuxLvm2PVGroupExtentSize" property
 
                          
 
                          LinuxLvm2PVGroupLogicalVolumes
                          
-
                          Device, The "LinuxLvm2PVGroupLogicalVolumes" property
+
                          Device, The "LinuxLvm2PVGroupLogicalVolumes" property
 
                          
 
                          LinuxLvm2PVGroupName
                          
-
                          Device, The "LinuxLvm2PVGroupName" property
+
                          Device, The "LinuxLvm2PVGroupName" property
 
                          
 
                          LinuxLvm2PVGroupPhysicalVolumes
                          
-
                          Device, The "LinuxLvm2PVGroupPhysicalVolumes" property
+
                          Device, The "LinuxLvm2PVGroupPhysicalVolumes" property
 
                          
 
                          LinuxLvm2PVGroupSequenceNumber
                          
-
                          Device, The "LinuxLvm2PVGroupSequenceNumber" property
+
                          Device, The "LinuxLvm2PVGroupSequenceNumber" property
 
                          
 
                          LinuxLvm2PVGroupSize
                          
-
                          Device, The "LinuxLvm2PVGroupSize" property
+
                          Device, The "LinuxLvm2PVGroupSize" property
 
                          
 
                          LinuxLvm2PVGroupUnallocatedSize
                          
-
                          Device, The "LinuxLvm2PVGroupUnallocatedSize" property
+
                          Device, The "LinuxLvm2PVGroupUnallocatedSize" property
 
                          
 
                          LinuxLvm2PVGroupUuid
                          
-
                          Device, The "LinuxLvm2PVGroupUuid" property
+
                          Device, The "LinuxLvm2PVGroupUuid" property
 
                          
 
                          LinuxLvm2PVNumMetadataAreas
                          
-
                          Device, The "LinuxLvm2PVNumMetadataAreas" property
+
                          Device, The "LinuxLvm2PVNumMetadataAreas" property
 
                          
 
                          LinuxLvm2PVUuid
                          
-
                          Device, The "LinuxLvm2PVUuid" property
+
                          Device, The "LinuxLvm2PVUuid" property
 
                          
 
                          LinuxLvm2VGAddPV
                          
-
                          UDisks, LinuxLvm2VGAddPV ()
+
                          UDisks, LinuxLvm2VGAddPV ()
 
                          
 
                          LinuxLvm2VGRemovePV
                          
-
                          UDisks, LinuxLvm2VGRemovePV ()
+
                          UDisks, LinuxLvm2VGRemovePV ()
 
                          
 
                          LinuxLvm2VGSetName
                          
-
                          UDisks, LinuxLvm2VGSetName ()
+
                          UDisks, LinuxLvm2VGSetName ()
 
                          
 
                          LinuxLvm2VGStart
                          
-
                          UDisks, LinuxLvm2VGStart ()
+
                          UDisks, LinuxLvm2VGStart ()
 
                          
 
                          LinuxLvm2VGStop
                          
-
                          UDisks, LinuxLvm2VGStop ()
+
                          UDisks, LinuxLvm2VGStop ()
 
                          
 
                          LinuxMdAddSpare
                          
-
                          Device, LinuxMdAddSpare ()
+
                          Device, LinuxMdAddSpare ()
 
                          
 
                          LinuxMdCheck
                          
-
                          Device, LinuxMdCheck ()
+
                          Device, LinuxMdCheck ()
 
                          
 
                          LinuxMdComponentHolder
                          
-
                          Device, The "LinuxMdComponentHolder" property
+
                          Device, The "LinuxMdComponentHolder" property
 
                          
 
                          LinuxMdComponentHomeHost
                          
-
                          Device, The "LinuxMdComponentHomeHost" property
+
                          Device, The "LinuxMdComponentHomeHost" property
 
                          
 
                          LinuxMdComponentLevel
                          
-
                          Device, The "LinuxMdComponentLevel" property
+
                          Device, The "LinuxMdComponentLevel" property
 
                          
 
                          LinuxMdComponentName
                          
-
                          Device, The "LinuxMdComponentName" property
+
                          Device, The "LinuxMdComponentName" property
 
                          
 
                          LinuxMdComponentNumRaidDevices
                          
-
                          Device, The "LinuxMdComponentNumRaidDevices" property
+
                          Device, The "LinuxMdComponentNumRaidDevices" property
 
                          
 
                          LinuxMdComponentPosition
                          
-
                          Device, The "LinuxMdComponentPosition" property
+
                          Device, The "LinuxMdComponentPosition" property
 
                          
 
                          LinuxMdComponentState
                          
-
                          Device, The "LinuxMdComponentState" property
+
                          Device, The "LinuxMdComponentState" property
 
                          
 
                          LinuxMdComponentUuid
                          
-
                          Device, The "LinuxMdComponentUuid" property
+
                          Device, The "LinuxMdComponentUuid" property
 
                          
 
                          LinuxMdComponentVersion
                          
-
                          Device, The "LinuxMdComponentVersion" property
+
                          Device, The "LinuxMdComponentVersion" property
 
                          
 
                          LinuxMdCreate
                          
-
                          UDisks, LinuxMdCreate ()
+
                          UDisks, LinuxMdCreate ()
 
                          
 
                          LinuxMdExpand
                          
-
                          Device, LinuxMdExpand ()
+
                          Device, LinuxMdExpand ()
 
                          
 
                          LinuxMdHomeHost
                          
-
                          Device, The "LinuxMdHomeHost" property
+
                          Device, The "LinuxMdHomeHost" property
 
                          
 
                          LinuxMdIsDegraded
                          
-
                          Device, The "LinuxMdIsDegraded" property
+
                          Device, The "LinuxMdIsDegraded" property
 
                          
 
                          LinuxMdLevel
                          
-
                          Device, The "LinuxMdLevel" property
+
                          Device, The "LinuxMdLevel" property
 
                          
 
                          LinuxMdName
                          
-
                          Device, The "LinuxMdName" property
+
                          Device, The "LinuxMdName" property
 
                          
 
                          LinuxMdNumRaidDevices
                          
-
                          Device, The "LinuxMdNumRaidDevices" property
+
                          Device, The "LinuxMdNumRaidDevices" property
 
                          
 
                          LinuxMdRemoveComponent
                          
-
                          Device, LinuxMdRemoveComponent ()
+
                          Device, LinuxMdRemoveComponent ()
 
                          
 
                          LinuxMdSlaves
                          
-
                          Device, The "LinuxMdSlaves" property
+
                          Device, The "LinuxMdSlaves" property
 
                          
 
                          LinuxMdStart
                          
-
                          UDisks, LinuxMdStart ()
+
                          UDisks, LinuxMdStart ()
 
                          
 
                          LinuxMdState
                          
-
                          Device, The "LinuxMdState" property
+
                          Device, The "LinuxMdState" property
 
                          
 
                          LinuxMdStop
                          
-
                          Device, LinuxMdStop ()
+
                          Device, LinuxMdStop ()
 
                          
 
                          LinuxMdSyncAction
                          
-
                          Device, The "LinuxMdSyncAction" property
+
                          Device, The "LinuxMdSyncAction" property
 
                          
 
                          LinuxMdSyncPercentage
                          
-
                          Device, The "LinuxMdSyncPercentage" property
+
                          Device, The "LinuxMdSyncPercentage" property
 
                          
 
                          LinuxMdSyncSpeed
                          
-
                          Device, The "LinuxMdSyncSpeed" property
+
                          Device, The "LinuxMdSyncSpeed" property
 
                          
 
                          LinuxMdUuid
                          
-
                          Device, The "LinuxMdUuid" property
+
                          Device, The "LinuxMdUuid" property
 
                          
 
                          LinuxMdVersion
                          
-
                          Device, The "LinuxMdVersion" property
+
                          Device, The "LinuxMdVersion" property
 
                          
 
                          LuksChangePassphrase
                          
-
                          Device, LuksChangePassphrase ()
+
                          Device, LuksChangePassphrase ()
 
                          
 
                          LuksCleartextSlave
                          
-
                          Device, The "LuksCleartextSlave" property
+
                          Device, The "LuksCleartextSlave" property
 
                          
 
                          LuksCleartextUnlockedByUid
                          
-
                          Device, The "LuksCleartextUnlockedByUid" property
+
                          Device, The "LuksCleartextUnlockedByUid" property
 
                          
 
                          LuksHolder
                          
-
                          Device, The "LuksHolder" property
+
                          Device, The "LuksHolder" property
 
                          
 
                          LuksLock
                          
-
                          Device, LuksLock ()
+
                          Device, LuksLock ()
 
                          
 
                          LuksUnlock
                          
-
                          Device, LuksUnlock ()
+
                          Device, LuksUnlock ()
 
                          
 
                          
 
                          
@@ -631,9 +631,9 @@
 
                          
 
                          Model
                          
 
                          
-
                          Adapter, The "Model" property
+
                          Adapter, The "Model" property
 
                          
-
                          Expander, The "Model" property
+
                          Expander, The "Model" property
 
                          
 
                          
 
                          
@@ -643,23 +643,23 @@
 
                          
 
                          NativePath
                          
 
                          
-
                          Adapter, The "NativePath" property
+
                          Adapter, The "NativePath" property
 
                          
-
                          Device, The "NativePath" property
+
                          Device, The "NativePath" property
 
                          
-
                          Expander, The "NativePath" property
+
                          Expander, The "NativePath" property
 
                          
-
                          Port, The "NativePath" property
+
                          Port, The "NativePath" property
 
                          
 
                          
 
                          Number
                          
-
                          Port, The "Number" property
+
                          Port, The "Number" property
 
                          
 
                          NumPorts
                          
 
                          
-
                          Adapter, The "NumPorts" property
+
                          Adapter, The "NumPorts" property
 
                          
-
                          Expander, The "NumPorts" property
+
                          Expander, The "NumPorts" property
 
                          
 
                          
 
                          
@@ -668,22 +668,22 @@
 
                          O
                          
 
                          
 
                          OpticalDiscIsAppendable
                          
-
                          Device, The "OpticalDiscIsAppendable" property
+
                          Device, The "OpticalDiscIsAppendable" property
 
                          
 
                          OpticalDiscIsBlank
                          
-
                          Device, The "OpticalDiscIsBlank" property
+
                          Device, The "OpticalDiscIsBlank" property
 
                          
 
                          OpticalDiscIsClosed
                          
-
                          Device, The "OpticalDiscIsClosed" property
+
                          Device, The "OpticalDiscIsClosed" property
 
                          
 
                          OpticalDiscNumAudioTracks
                          
-
                          Device, The "OpticalDiscNumAudioTracks" property
+
                          Device, The "OpticalDiscNumAudioTracks" property
 
                          
 
                          OpticalDiscNumSessions
                          
-
                          Device, The "OpticalDiscNumSessions" property
+
                          Device, The "OpticalDiscNumSessions" property
 
                          
 
                          OpticalDiscNumTracks
                          
-
                          Device, The "OpticalDiscNumTracks" property
+
                          Device, The "OpticalDiscNumTracks" property
 
                          
 
                          
 
                          
@@ -691,64 +691,64 @@
 
                          P
                          
 
                          
 
                          Parent
                          
-
                          Port, The "Parent" property
+
                          Port, The "Parent" property
 
                          
 
                          PartitionAlignmentOffset
                          
-
                          Device, The "PartitionAlignmentOffset" property
+
                          Device, The "PartitionAlignmentOffset" property
 
                          
 
                          PartitionCreate
                          
-
                          Device, PartitionCreate ()
+
                          Device, PartitionCreate ()
 
                          
 
                          PartitionDelete
                          
-
                          Device, PartitionDelete ()
+
                          Device, PartitionDelete ()
 
                          
 
                          PartitionFlags
                          
-
                          Device, The "PartitionFlags" property
+
                          Device, The "PartitionFlags" property
 
                          
 
                          PartitionLabel
                          
-
                          Device, The "PartitionLabel" property
+
                          Device, The "PartitionLabel" property
 
                          
 
                          PartitionModify
                          
-
                          Device, PartitionModify ()
+
                          Device, PartitionModify ()
 
                          
 
                          PartitionNumber
                          
-
                          Device, The "PartitionNumber" property
+
                          Device, The "PartitionNumber" property
 
                          
 
                          PartitionOffset
                          
-
                          Device, The "PartitionOffset" property
+
                          Device, The "PartitionOffset" property
 
                          
 
                          PartitionScheme
                          
-
                          Device, The "PartitionScheme" property
+
                          Device, The "PartitionScheme" property
 
                          
 
                          PartitionSize
                          
-
                          Device, The "PartitionSize" property
+
                          Device, The "PartitionSize" property
 
                          
 
                          PartitionSlave
                          
-
                          Device, The "PartitionSlave" property
+
                          Device, The "PartitionSlave" property
 
                          
 
                          PartitionTableCount
                          
-
                          Device, The "PartitionTableCount" property
+
                          Device, The "PartitionTableCount" property
 
                          
 
                          PartitionTableCreate
                          
-
                          Device, PartitionTableCreate ()
+
                          Device, PartitionTableCreate ()
 
                          
 
                          PartitionTableScheme
                          
-
                          Device, The "PartitionTableScheme" property
+
                          Device, The "PartitionTableScheme" property
 
                          
 
                          PartitionType
                          
-
                          Device, The "PartitionType" property
+
                          Device, The "PartitionType" property
 
                          
 
                          PartitionUuid
                          
-
                          Device, The "PartitionUuid" property
+
                          Device, The "PartitionUuid" property
 
                          
 
                          PortAdded
                          
-
                          UDisks, The PortAdded signal
+
                          UDisks, The PortAdded signal
 
                          
 
                          PortChanged
                          
-
                          UDisks, The PortChanged signal
+
                          UDisks, The PortChanged signal
 
                          
 
                          PortRemoved
                          
-
                          UDisks, The PortRemoved signal
+
                          UDisks, The PortRemoved signal
 
                          
 
                          
 
                          
@@ -756,7 +756,7 @@
 
                          R
                          
 
                          
 
                          Revision
                          
-
                          Expander, The "Revision" property
+
                          Expander, The "Revision" property
 
                          
 
                          
 
                          
@@ -764,7 +764,7 @@
 
                          S
                          
 
                          
 
                          SupportsLuksDevices
                          
-
                          UDisks, The "SupportsLuksDevices" property
+
                          UDisks, The "SupportsLuksDevices" property
 
                          
 
                          
 
                          
@@ -772,10 +772,10 @@
 
                          U
                          
 
                          
 
                          Uninhibit
                          
-
                          UDisks, Uninhibit ()
+
                          UDisks, Uninhibit ()
 
                          
 
                          UpstreamPorts
                          
-
                          Expander, The "UpstreamPorts" property
+
                          Expander, The "UpstreamPorts" property
 
                          
 
                          
 
                          
@@ -784,9 +784,9 @@
 
                          
 
                          Vendor
                          
 
                          
-
                          Adapter, The "Vendor" property
+
                          Adapter, The "Vendor" property
 
                          
-
                          Expander, The "Vendor" property
+
                          Expander, The "Vendor" property
 
                          
 
                          
 
                          
@@ -795,6 +795,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/left-insensitive.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/left-insensitive.png differ
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/left.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/left.png differ
diff -Nru udisks-1.0.4/doc/html/license.html udisks-1.0.5/doc/html/license.html
--- udisks-1.0.4/doc/html/license.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/license.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,25 +2,25 @@
 
 
 
-Appendix A. License
-
+udisks Reference Manual: Appendix A. License
+
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
-
                          
-Appendix A. License
                          
+
                          
+Appendix A. License
                          
 
                          
 
                          
 
                          Copyright (C) 2007-2009 David Zeuthen <david@fubar.dk>
@@ -386,6 +386,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/Port.html udisks-1.0.5/doc/html/Port.html
--- udisks-1.0.4/doc/html/Port.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/Port.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,36 +2,29 @@
 
 
 
-org.freedesktop.UDisks.Port
-
+udisks Reference Manual: org.freedesktop.UDisks.Port
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
                          
 
                          
 
                          
@@ -39,19 +32,19 @@
 
                          org.freedesktop.UDisks.Port
                          org.freedesktop.UDisks.Port — Port interface
                          
-
+
                          
 
 
 
                          
 
                          
 
                          Methods
                          
 
                          
 
                          
 
                          
-
                          Signals
                          
-
                          Changed ()
+
                          Signals
                          
+
                          Changed()
 
                          
 
                          
 
                          
-
                          Implemented Interfaces
                          
+
                          Implemented Interfaces
                          
 
                          
     Objects implementing org.freedesktop.UDisks.Port also implements
     org.freedesktop.DBus.Introspectable,
@@ -59,16 +52,16 @@
     
                          
 
                          
 
                          
-
                          Properties
                          
-
                          'NativePath'    read      's'
-'Adapter'       read      'o'
-'Parent'        read      'o'
-'Number'        read      'i'
-'ConnectorType' read      's'
+
                          Properties
                          
+
                          'NativePath'read's'
+'Adapter'read'o'
+'Parent'read'o'
+'Number'read'i'
+'ConnectorType'read's'
 
                          
 
                          
 
                          
-
                          Description
                          
+
                          Description
                          
 
                          
       
         
                          
@@ -82,91 +75,106 @@
     
                          
 
                          
 
                          
-
                          Details
                          
+
                          Details
                          
 
                          
 
                          
-
                          Signal Details
                          
+
                          Signal Details
                          
 
                          
-
                          
+
                          
 The Changed signal
                          
 
                          Changed ()
                          
 
                          
 
                          
             Something on the port changed.
           
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          Property Details
                          
+
                          Property Details
                          
 
                          
-
                          
+
                          
 The "NativePath" property
                          
-
                          'NativePath'  read      's'
+
                          'NativePath'read's'
 
                          
 
                          
 
                          
             OS specific native path of the port. On Linux this is the sysfs path, for example /sys/devices/pci0000:00/0000:00:1f.1/host3/scsi_host/host3 or TODO:SAS example.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "Adapter" property
                          
-
                          'Adapter'  read      'o'
+
                          'Adapter'read'o'
 
                          
 
                          
 
                          
             The object path of the adapter the port is attached to.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "Parent" property
                          
-
                          'Parent'  read      'o'
+
                          'Parent'read'o'
 
                          
 
                          
 
                          
             The object path of the adapter or expansion device the port is attached to.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "Number" property
                          
-
                          'Number'  read      'i'
+
                          'Number'read'i'
 
                          
 
                          
 
                          
             The number of the port (starting from zero) or -1 if unknown.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "ConnectorType" property
                          
-
                          'ConnectorType'  read      's'
+
                          'ConnectorType'read's'
 
                          
 
                          
 
                          
             The connector type for the port (or for wide connectors, that the port is part of) or blank if unknown.
             
                          
-
                            
+
                              
 
                            • 
 ata: Some kind of ATA connector
                              • 
 
                            • 
@@ -201,14 +209,17 @@
 
                              
             TODO: include other connector types
       
                              
-
                              
+
                              
+++
                              
 


 
 
                              
 
                            
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/ref-dbus.html udisks-1.0.5/doc/html/ref-dbus.html
--- udisks-1.0.4/doc/html/ref-dbus.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/ref-dbus.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-D-Bus API Reference
-
+udisks Reference Manual: D-Bus API Reference
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -33,7 +33,7 @@
       
                          
 
                          
 
                          Table of Contents
                          
-
                          
+
                          
 
                          
 org.freedesktop.UDisks — UDisks interface
 
                          
@@ -55,6 +55,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/right-insensitive.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/right-insensitive.png differ
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/right.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/right.png differ
diff -Nru udisks-1.0.4/doc/html/style.css udisks-1.0.5/doc/html/style.css
--- udisks-1.0.4/doc/html/style.css	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/style.css	2014-03-10 09:11:32.000000000 +0000
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -27,7 +35,6 @@
   {
     position: relative;
     top: 0em ! important;
-    
   }
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
@@ -46,16 +53,20 @@
    */
   body
   {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
+    padding-top: 5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
   }
   /* style and size the navigation bar */
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -65,21 +76,57 @@
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
 }
 @media print {
   table.navigation {
@@ -89,9 +136,8 @@
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -102,7 +148,7 @@
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -132,6 +178,67 @@
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 20px 3px;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +261,43 @@
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +309,70 @@
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
+}
+div.blockquote
+{
+  border-color: #eeeeec;
 }
-.note, .warning
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
 {
-  margin-bottom: 0.0em
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,11 +385,22 @@
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
   font-weight: normal;
 }
 
@@ -237,6 +423,7 @@
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -246,19 +433,27 @@
   padding: 0.5em;
 }
 .listing_lines {
+  /* this just adds visual clutter and
+     takes precious room from small screens */
+  display: none;
+}
+.listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
diff -Nru udisks-1.0.4/doc/html/tools-fileformats.html udisks-1.0.5/doc/html/tools-fileformats.html
--- udisks-1.0.4/doc/html/tools-fileformats.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/tools-fileformats.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Manual Pages
-
+udisks Reference Manual: Manual Pages
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -32,7 +32,7 @@
       
                          
 
                          
 
                          Table of Contents
                          
-
                          
+
                          
 
                          
 udisks — Storage Management
 
                          
@@ -51,6 +51,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/udisks.1.html udisks-1.0.5/doc/html/udisks.1.html
--- udisks-1.0.4/doc/html/udisks.1.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/udisks.1.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-udisks
-
+udisks Reference Manual: udisks
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -26,14 +26,14 @@
 
                          udisks
                          
 
                          udisks — udisks command line tool
                          
 
-
+
 
                          
 
                          
 
                          Synopsis
                          
 
                          udisks  [OPTIONS]
                          
 
                          
 
                          
-
                          DESCRIPTION
                          
+
                          DESCRIPTION
                          
 
                          
       udisks is a
       simple command line client for the
@@ -42,9 +42,12 @@
     
                          
 
                          
 
                          
-
                          OPTIONS
                          
-
                          
+
                          OPTIONS
                          
+
                          
+++
@@ -288,14 +291,14 @@
     
                          
-
                          AUTHOR
                          
+
                          AUTHOR
                          
 
                          
       Written by David Zeuthen  with
       a lot of help from many others.
     
                          
 
                          
-
                          BUGS
                          
+
                          BUGS
                          
 
                          
       Please send bug reports to either the distribution bug tracker
       or the upstream bug tracker at
@@ -303,7 +306,7 @@
     
                          
 
                          
-
                          SEE ALSO
                          
+
                          SEE ALSO
                          
 
                          
       udisks-daemon(8),
       udisks(7),
@@ -312,6 +315,6 @@
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/udisks.7.html udisks-1.0.5/doc/html/udisks.7.html
--- udisks-1.0.4/doc/html/udisks.7.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/udisks.7.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
-udisks
-
+udisks Reference Manual: udisks
+
-
+
-
                          
 


 
 
                          
 
                          --dump
                          		
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
                          
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -26,10 +26,10 @@
 
                          udisks
                          
 
                          udisks — Storage Management
                          
 
-
+
 
                          
 
                          
-
                          DESCRIPTION
                          
+
                          DESCRIPTION
                          
 
                          
       udisks provides an interface to enumerate storage
       devices and perform operations on them. Any application
@@ -39,15 +39,18 @@
     
                          
 
                          
 
                          
-
                          DEVICE INFORMATION
                          
+
                          DEVICE INFORMATION
                          
 
                          
       On Linux, udisks relies on recent versions of
       udev(7)
       and the kernel. Influential device properties in the udev
       database include:
     
                          
-
                          
+
                          
+++
@@ -113,8 +116,11 @@
       more than one these properties can be set if the device supports
       multiple kinds of media.
     
                          
-
                          
 


 
 
                          
 
                          UDISKS_PRESENTATION_HIDE
                          
+
                          
+++
@@ -210,8 +216,11 @@
       (e.g. /dev/sdb). Typically only one of these
       properties are set.
     
                          
-
                          
 


 
 
                          
 
                          ID_DRIVE_EJECTABLE
                          
+
                          
+++
@@ -267,20 +276,20 @@
 
                          
 


 
 
                          
 
                          ID_DRIVE_MEDIA_FLASH
                          
 
                          
 
                          
-
                          REMOTE CLIENTS
                          
+
                          REMOTE CLIENTS
                          
 
                          
       TODO: write me.
     
                          
 
                          
 
                          
-
                          AUTHOR
                          
+
                          AUTHOR
                          
 
                          
       Written by David Zeuthen  with
       a lot of help from many others.
     
                          
 
                          
 
                          
-
                          BUGS
                          
+
                          BUGS
                          
 
                          
       Please send bug reports to either the distribution bug tracker
       or the upstream bug tracker at
@@ -288,7 +297,7 @@
     
                          
 
                          
 
                          
-
                          SEE ALSO
                          
+
                          SEE ALSO
                          
 
                          
       udev(7),
       polkit(8),
@@ -300,6 +309,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/udisks-daemon.8.html udisks-1.0.5/doc/html/udisks-daemon.8.html
--- udisks-1.0.4/doc/html/udisks-daemon.8.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/udisks-daemon.8.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-udisks-daemon
-
+udisks Reference Manual: udisks-daemon
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -26,14 +26,14 @@
 
                          udisks-daemon
                          
 
                          udisks-daemon — udisks Daemon
                          
 
-
+
 
                          
 
                          
 
                          Synopsis
                          
 
                          udisks-daemon  [--help]
                          
 
                          
 
                          
-
                          DESCRIPTION
                          
+
                          DESCRIPTION
                          
 
                          
       udisks-daemon provides
       the org.freedesktop.UDisks service on the
@@ -52,9 +52,12 @@
     
                          
 
                          
 
                          
-
                          OPTIONS
                          
-
                          
+
                          OPTIONS
                          
+
                          
+++
                          
 


 
                          
 
                          --help
                          		
 
                          
@@ -64,14 +67,14 @@
 
                          
 
                          
 
                          
-
                          AUTHOR
                          
+
                          AUTHOR
                          
 
                          
       Written by David Zeuthen  with
       a lot of help from many others.
     
                          
 
                          
 
                          
-
                          BUGS
                          
+
                          BUGS
                          
 
                          
       Please send bug reports to either the distribution bug tracker
       or the upstream bug tracker at
@@ -79,7 +82,7 @@
     
                          
 
                          
 
                          
-
                          SEE ALSO
                          
+
                          SEE ALSO
                          
 
                          
       udisks(7),
       udisks(1),
@@ -90,6 +93,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/udisks.devhelp udisks-1.0.5/doc/html/udisks.devhelp
--- udisks-1.0.4/doc/html/udisks.devhelp	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/udisks.devhelp	1970-01-01 00:00:00.000000000 +0000
@@ -1,250 +0,0 @@
-
-
-
-  
-    
-      
-      
-      
-      
-      
-    
-    
-      
-      
-      
-      
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
diff -Nru udisks-1.0.4/doc/html/UDisks.html udisks-1.0.5/doc/html/UDisks.html
--- udisks-1.0.4/doc/html/UDisks.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/UDisks.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,36 +2,29 @@
 
 
 
-org.freedesktop.UDisks
-
+udisks Reference Manual: org.freedesktop.UDisks
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
                          
 
                          
 
                          
@@ -39,97 +32,97 @@
 
                          org.freedesktop.UDisks
                          org.freedesktop.UDisks — UDisks interface
                          
-
+
                          
 
 
 
                          
 
                          
 
                          Methods
                          
-
                          EnumerateAdapters             (out 'ao' devices)
-EnumerateExpanders            (out 'ao' devices)
-EnumeratePorts                (out 'ao' devices)
-EnumerateDevices              (out 'ao' devices)
-EnumerateDeviceFiles          (out 'as' device_files)
-FindDeviceByDeviceFile        (in  's'  device_file,
-                               out 'o'  device)
-FindDeviceByMajorMinor        (in  'x'  device_major,
-                               in  'x'  device_minor,
-                               out 'o'  device)
-DriveInhibitAllPolling        (in  'as' options,
-                               out 's'  cookie)
-DriveUninhibitAllPolling      (in  's'  cookie)
-DriveSetAllSpindownTimeouts   (in  'i'  timeout_seconds,
-                               in  'as' options,
-                               out 's'  cookie)
-DriveUnsetAllSpindownTimeouts (in  's'  cookie)
-LinuxLvm2VGStart              (in  's'  uuid,
-                               in  'as' options)
-LinuxLvm2VGStop               (in  's'  uuid,
-                               in  'as' options)
-LinuxLvm2VGSetName            (in  's'  uuid,
-                               in  's'  name)
-LinuxLvm2VGAddPV              (in  's'  uuid,
-                               in  'o'  physical_volume,
-                               in  'as' options)
-LinuxLvm2VGRemovePV           (in  's'  vg_uuid,
-                               in  's'  pv_uuid,
-                               in  'as' options)
-LinuxLvm2LVSetName            (in  's'  group_uuid,
-                               in  's'  uuid,
-                               in  's'  name)
-LinuxLvm2LVStart              (in  's'  group_uuid,
-                               in  's'  uuid,
-                               in  'as' options)
-LinuxLvm2LVRemove             (in  's'  group_uuid,
-                               in  's'  uuid,
-                               in  'as' options)
-LinuxLvm2LVCreate             (in  's'  group_uuid,
-                               in  's'  name,
-                               in  't'  size,
-                               in  'u'  num_stripes,
-                               in  't'  stripe_size,
-                               in  'u'  num_mirrors,
-                               in  'as' options,
-                               in  's'  fstype,
-                               in  'as' fsoptions,
-                               out 'o'  created_device)
-LinuxMdStart                  (in  'ao' components,
-                               in  'as' options,
-                               out 'o'  device)
-LinuxMdCreate                 (in  'ao' components,
-                               in  's'  level,
-                               in  't'  stripe_size,
-                               in  's'  name,
-                               in  'as' options,
-                               out 'o'  device)
-Inhibit                       (out 's'  cookie)
-Uninhibit                     (in  's'  cookie)
+
                          EnumerateAdapters(out'ao'devices)
+EnumerateExpanders(out'ao'devices)
+EnumeratePorts(out'ao'devices)
+EnumerateDevices(out'ao'devices)
+EnumerateDeviceFiles(out'as'device_files)
+FindDeviceByDeviceFile(in's'device_file,
+out'o'device)
+FindDeviceByMajorMinor(in'x'device_major,
+in'x'device_minor,
+out'o'device)
+DriveInhibitAllPolling(in'as'options,
+out's'cookie)
+DriveUninhibitAllPolling(in's'cookie)
+DriveSetAllSpindownTimeouts(in'i'timeout_seconds,
+in'as'options,
+out's'cookie)
+DriveUnsetAllSpindownTimeouts(in's'cookie)
+LinuxLvm2VGStart(in's'uuid,
+in'as'options)
+LinuxLvm2VGStop(in's'uuid,
+in'as'options)
+LinuxLvm2VGSetName(in's'uuid,
+in's'name)
+LinuxLvm2VGAddPV(in's'uuid,
+in'o'physical_volume,
+in'as'options)
+LinuxLvm2VGRemovePV(in's'vg_uuid,
+in's'pv_uuid,
+in'as'options)
+LinuxLvm2LVSetName(in's'group_uuid,
+in's'uuid,
+in's'name)
+LinuxLvm2LVStart(in's'group_uuid,
+in's'uuid,
+in'as'options)
+LinuxLvm2LVRemove(in's'group_uuid,
+in's'uuid,
+in'as'options)
+LinuxLvm2LVCreate(in's'group_uuid,
+in's'name,
+in't'size,
+in'u'num_stripes,
+in't'stripe_size,
+in'u'num_mirrors,
+in'as'options,
+in's'fstype,
+in'as'fsoptions,
+out'o'created_device)
+LinuxMdStart(in'ao'components,
+in'as'options,
+out'o'device)
+LinuxMdCreate(in'ao'components,
+in's'level,
+in't'stripe_size,
+in's'name,
+in'as'options,
+out'o'device)
+Inhibit(out's'cookie)
+Uninhibit(in's'cookie)
 
                          
 
                          
 
                          
-
                          Signals
                          
-
                          DeviceAdded      ('o' device)
-DeviceRemoved    ('o' device)
-DeviceChanged    ('o' device)
-DeviceJobChanged ('o' device,
-                  'b' job_in_progress,
-                  'b' job_is_cancellable,
-                  's' job_id,
-                  'i' job_num_tasks,
-                  'i' job_cur_task,
-                  's' job_cur_task_id,
-                  'd' job_cur_task_percentage)
-AdapterAdded     ('o' adapter)
-AdapterRemoved   ('o' adapter)
-AdapterChanged   ('o' adapter)
-ExpanderAdded    ('o' expander)
-ExpanderRemoved  ('o' expander)
-ExpanderChanged  ('o' expander)
-PortAdded        ('o' port)
-PortRemoved      ('o' port)
-PortChanged      ('o' port)
+
                          Signals
                          
+
                          DeviceAdded('o'device)
+DeviceRemoved('o'device)
+DeviceChanged('o'device)
+DeviceJobChanged('o'device,
+'b'job_in_progress,
+'b'job_is_cancellable,
+'s'job_id,
+'i'job_num_tasks,
+'i'job_cur_task,
+'s'job_cur_task_id,
+'d'job_cur_task_percentage)
+AdapterAdded('o'adapter)
+AdapterRemoved('o'adapter)
+AdapterChanged('o'adapter)
+ExpanderAdded('o'expander)
+ExpanderRemoved('o'expander)
+ExpanderChanged('o'expander)
+PortAdded('o'port)
+PortRemoved('o'port)
+PortChanged('o'port)
 
                          
 
                          
 
                          
-
                          Implemented Interfaces
                          
+
                          Implemented Interfaces
                          
 
                          
     Objects implementing org.freedesktop.UDisks also implements
     org.freedesktop.DBus.Introspectable,
@@ -137,29 +130,32 @@
     
                          
 
                          
 
                          
-
                          Properties
                          
-
                          'DaemonVersion'       read      's'
-'DaemonIsInhibited'   read      'b'
-'SupportsLuksDevices' read      'b'
-'KnownFilesystems'    read      'a(ssbbbubbbbbbbb)'
+
                          Properties
                          
+
                          'DaemonVersion'read's'
+'DaemonIsInhibited'read'b'
+'SupportsLuksDevices'read'b'
+'KnownFilesystems'read'a(ssbbbubbbbbbbb)'
 
                          
 
                          
 
                          
-
                          Description
                          
+
                          Description
                          
 
                          
 
                          
 
                          
-
                          Details
                          
+
                          Details
                          
 
                          
-
                          
+
                          
 EnumerateAdapters ()
                          
-
                          EnumerateAdapters (out 'ao' devices)
                          
+
                          EnumerateAdapters (out'ao'devices)
                          
 
                          
 
                          
             Enumerate all storage adapters on the system.
           
                          
-
                          
+
                          
+++
@@ -167,15 +163,18 @@
 
                          
 


 
                          
 
                          devices:
                          		
 An array of object paths for storage adapters.
                          
 
                          
 
                          
-
                          
+
                          
 EnumerateExpanders ()
                          
-
                          EnumerateExpanders (out 'ao' devices)
                          
+
                          EnumerateExpanders (out'ao'devices)
                          
 
                          
 
                          
             Enumerate all storage expanders on the system.
           
                          
-
                          
+
                          
+++
@@ -183,15 +182,18 @@
 
                          
 


 
                          
 
                          devices:
                          		
 An array of object paths for storage expanders.
                          
 
                          
 
                          
-
                          
+
                          
 EnumeratePorts ()
                          
-
                          EnumeratePorts (out 'ao' devices)
                          
+
                          EnumeratePorts (out'ao'devices)
                          
 
                          
 
                          
             Enumerate all storage ports on the system.
           
                          
-
                          
+
                          
+++
@@ -199,15 +201,18 @@
 
                          
 


 
                          
 
                          devices:
                          		
 An array of object paths for ports.
                          
 
                          
 
                          
-
                          
+
                          
 EnumerateDevices ()
                          
-
                          EnumerateDevices (out 'ao' devices)
                          
+
                          EnumerateDevices (out'ao'devices)
                          
 
                          
 
                          
             Enumerate all disk devices on the system.
           
                          
-
                          
+
                          
+++
@@ -215,15 +220,18 @@
 
                          
 


 
                          
 
                          devices:
                          		
 An array of object paths for devices.
                          
 
                          
 
                          
-
                          
+
                          
 EnumerateDeviceFiles ()
                          
-
                          EnumerateDeviceFiles (out 'as' device_files)
                          
+
                          EnumerateDeviceFiles (out'as'device_files)
                          
 
                          
 
                          
             Enumerate all device files (including symlinks) for disk devices on the system.
           
                          
-
                          
+
                          
+++
@@ -231,16 +239,19 @@
 
                          
 


 
                          
 
                          device_files:
                          		
 An array device file names.
                          
 
                          
 
                          
-
                          
+
                          
 FindDeviceByDeviceFile ()
                          
-
                          FindDeviceByDeviceFile (in  's' device_file,
-                        out 'o' device)
                          
+
                          FindDeviceByDeviceFile (in's'device_file,
+out'o'device)
                          
 
                          
 
                          
             Finds a device by device path.
           
                          
-
                          
+
                          
+++
@@ -254,17 +265,20 @@
 
                          
 


 
 
                          
 
                          device_file:
                          
 
                          
 
                          
-
                          
+
                          
 FindDeviceByMajorMinor ()
                          
-
                          FindDeviceByMajorMinor (in  'x' device_major,
-                        in  'x' device_minor,
-                        out 'o' device)
                          
+
                          FindDeviceByMajorMinor (in'x'device_major,
+in'x'device_minor,
+out'o'device)
                          
 
                          
 
                          
             Finds a device by major:minor.
           
                          
-
                          
+
                          
+++
@@ -282,16 +296,19 @@
 
                          
 


 
 
                          
 
                          device_major:
                          
 
                          
 
                          
-
                          
+
                          
 DriveInhibitAllPolling ()
                          
-
                          DriveInhibitAllPolling (in  'as' options,
-                        out 's'  cookie)
                          
+
                          DriveInhibitAllPolling (in'as'options,
+out's'cookie)
                          
 
                          
 
                          
             Inhibits the daemon from polling devices for media changes.
           
                          
-
                          
+
                          
+++
@@ -308,9 +325,12 @@
 
                          
 


 
 
                          
 
                          options:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -324,26 +344,29 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.inhibit-polling: To inhibit polling
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveUninhibitAllPolling ()
                          
-
                          DriveUninhibitAllPolling (in  's' cookie)
                          
+
                          DriveUninhibitAllPolling (in's'cookie)
                          
 
                          
 
                          
             Uninhibits daemon from polling devices for media changes.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -353,9 +376,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -364,11 +390,11 @@
 
                          
-
                          
+
                          
 DriveSetAllSpindownTimeouts ()
                          
-
                          DriveSetAllSpindownTimeouts (in  'i'  timeout_seconds,
-                             in  'as' options,
-                             out 's'  cookie)
                          
+
                          DriveSetAllSpindownTimeouts (in'i'timeout_seconds,
+in'as'options,
+out's'cookie)
                          
 
                          
             Configures spindown timeout for all drives capable of being spun down.
@@ -376,8 +402,11 @@
             the SPINNING DOWN DISKS section in the
             udisks(1) man page before using it.
           
                          
-
                          
 


 
                          
 
                          org.freedesktop.PolicyKit.Error.Failed:
                          		
 if the given cookie is malformed
 
 
 
                          
+
                          
+++
@@ -402,9 +431,12 @@
 
                          
 


 
 
                          
 
                          timeout_seconds:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -422,26 +454,29 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 DriveUnsetAllSpindownTimeouts ()
                          
-
                          DriveUnsetAllSpindownTimeouts (in  's' cookie)
                          
+
                          DriveUnsetAllSpindownTimeouts (in's'cookie)
                          
 
                          
 
                          
             Unsets spindown timeout for the drive.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -451,9 +486,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -467,27 +505,30 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need one of the following PolicyKit authorizations:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.drive-set-spindown: To set spindown timeouts
                            
 
                            
         
                            
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2VGStart ()
                          
-
                          LinuxLvm2VGStart (in  's'  uuid,
-                  in  'as' options)
                          
+
                          LinuxLvm2VGStart (in's'uuid,
+in'as'options)
                          
 
                          
 
                          
             Starts all logical volumes in Linux LVM2 Volume Group.
           
                          
-
                          
+
                          
+++
@@ -500,9 +541,12 @@
 
                          
 


 
 
                          
 
                          uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -524,11 +568,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -537,16 +581,19 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2VGStop ()
                          
-
                          LinuxLvm2VGStop (in  's'  uuid,
-                 in  'as' options)
                          
+
                          LinuxLvm2VGStop (in's'uuid,
+in'as'options)
                          
 
                          
 
                          
             Stops all logical volumes in Linux LVM2 Volume Group.
           
                          
-
                          
+
                          
+++
@@ -559,9 +606,12 @@
 
                          
 


 
 
                          
 
                          uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -583,11 +633,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -596,16 +646,19 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2VGSetName ()
                          
-
                          LinuxLvm2VGSetName (in  's' uuid,
-                    in  's' name)
                          
+
                          LinuxLvm2VGSetName (in's'uuid,
+in's'name)
                          
 
                          
 
                          
             Sets the name for a volume group.
           
                          
-
                          
+
                          
+++
@@ -618,9 +671,12 @@
 
                          
 


 
 
                          
 
                          uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -642,11 +698,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -655,18 +711,21 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2VGAddPV ()
                          
-
                          LinuxLvm2VGAddPV (in  's'  uuid,
-                  in  'o'  physical_volume,
-                  in  'as' options)
                          
+
                          LinuxLvm2VGAddPV (in's'uuid,
+in'o'physical_volume,
+in'as'options)
                          
 
                          
 
                          
             Adds a Physical volume to a Linux LVM2 Volume Group. Existing data
             on the given device to use for a physical volume will be erased.
           
                          
-
                          
+
                          
+++
@@ -683,9 +742,12 @@
 
                          
 


 
 
                          
 
                          uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -707,11 +769,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -720,17 +782,20 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2VGRemovePV ()
                          
-
                          LinuxLvm2VGRemovePV (in  's'  vg_uuid,
-                     in  's'  pv_uuid,
-                     in  'as' options)
                          
+
                          LinuxLvm2VGRemovePV (in's'vg_uuid,
+in's'pv_uuid,
+in'as'options)
                          
 
                          
 
                          
             Removes a Physical volume from a Linux LVM2 Volume Group.
           
                          
-
                          
+
                          
+++
@@ -747,9 +812,12 @@
 
                          
 


 
 
                          
 
                          vg_uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -771,11 +839,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -784,17 +852,20 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2LVSetName ()
                          
-
                          LinuxLvm2LVSetName (in  's' group_uuid,
-                    in  's' uuid,
-                    in  's' name)
                          
+
                          LinuxLvm2LVSetName (in's'group_uuid,
+in's'uuid,
+in's'name)
                          
 
                          
 
                          
             Sets the name for a logical volume.
           
                          
-
                          
+
                          
+++
@@ -811,9 +882,12 @@
 
                          
 


 
 
                          
 
                          group_uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -835,11 +909,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -848,17 +922,20 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2LVStart ()
                          
-
                          LinuxLvm2LVStart (in  's'  group_uuid,
-                  in  's'  uuid,
-                  in  'as' options)
                          
+
                          LinuxLvm2LVStart (in's'group_uuid,
+in's'uuid,
+in'as'options)
                          
 
                          
 
                          
             Starts a LVM2 logical volume.
           
                          
-
                          
+
                          
+++
@@ -875,9 +952,12 @@
 
                          
 


 
 
                          
 
                          group_uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -899,11 +979,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -912,17 +992,20 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2LVRemove ()
                          
-
                          LinuxLvm2LVRemove (in  's'  group_uuid,
-                   in  's'  uuid,
-                   in  'as' options)
                          
+
                          LinuxLvm2LVRemove (in's'group_uuid,
+in's'uuid,
+in'as'options)
                          
 
                          
 
                          
             Removes a LVM2 logical volume.
           
                          
-
                          
+
                          
+++
@@ -939,9 +1022,12 @@
 
                          
 


 
 
                          
 
                          group_uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -963,11 +1049,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -976,24 +1062,27 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxLvm2LVCreate ()
                          
-
                          LinuxLvm2LVCreate (in  's'  group_uuid,
-                   in  's'  name,
-                   in  't'  size,
-                   in  'u'  num_stripes,
-                   in  't'  stripe_size,
-                   in  'u'  num_mirrors,
-                   in  'as' options,
-                   in  's'  fstype,
-                   in  'as' fsoptions,
-                   out 'o'  created_device)
                          
+
                          LinuxLvm2LVCreate (in's'group_uuid,
+in's'name,
+in't'size,
+in'u'num_stripes,
+in't'stripe_size,
+in'u'num_mirrors,
+in'as'options,
+in's'fstype,
+in'as'fsoptions,
+out'o'created_device)
                          
 
                          
 
                          
             Creates a new LVM2 logical volume.
           
                          
-
                          
+
                          
+++
@@ -1047,9 +1136,12 @@
 
                          
 


 
 
                          
 
                          group_uuid:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1071,11 +1163,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-lvm2: 
                 Needed to configured Linux LVM2 devices.
               
                            
@@ -1084,19 +1176,22 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdStart ()
                          
-
                          LinuxMdStart (in  'ao' components,
-              in  'as' options,
-              out 'o'  device)
                          
+
                          LinuxMdStart (in'ao'components,
+in'as'options,
+out'o'device)
                          
 
                          
 
                          
             Starts an Linux md RAID array. The array will be assembled
             and started in degraded mode if an insufficient number of
             components are given.
           
                          
-
                          
+
                          
+++
@@ -1113,9 +1208,12 @@
 
                          
 


 
 
                          
 
                          components:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1137,11 +1235,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1150,21 +1248,24 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 LinuxMdCreate ()
                          
-
                          LinuxMdCreate (in  'ao' components,
-               in  's'  level,
-               in  't'  stripe_size,
-               in  's'  name,
-               in  'as' options,
-               out 'o'  device)
                          
+
                          LinuxMdCreate (in'ao'components,
+in's'level,
+in't'stripe_size,
+in's'name,
+in'as'options,
+out'o'device)
                          
 
                          
 
                          
             Creates a Linux md RAID array. The array will be created and
             assembled.
           
                          
-
                          
+
                          
+++
@@ -1193,9 +1294,12 @@
 
                          
 


 
 
                          
 
                          components:
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1217,11 +1321,11 @@
 
                          
 


 
 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           The caller will need the following PolicyKit authorization:
           
                          
-
                          • 
+
                            • 
 org.freedesktop.udisks.linux-md: 
                 Needed to configured Linux md Software RAID devices.
               
                            
@@ -1230,9 +1334,9 @@
 
                          
 
                          
 
                          
-
                          
+
                          
 Inhibit ()
                          
-
                          Inhibit (out 's' cookie)
                          
+
                          Inhibit (out's'cookie)
                          
 
                          
 
                          
             Inhibits clients from invoking methods on the daemon
@@ -1243,8 +1347,11 @@
             programs that expects full control of the system, specifically
             to avoid automounting devices.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -1255,9 +1362,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1265,22 +1375,25 @@
 
                          
 


 
                          
 
                          org.freedesktop.PolicyKit.Error.NotAuthorized:
                          		
 if the caller is not the super user
                          
 
                          
 
                          
-
                          Permissions
                          
+
                          Permissions
                          
 
                          
           Only the super user can invoke this method.
         
                          
 
                          
 
                          
 
                          
-
                          
+
                          
 Uninhibit ()
                          
-
                          Uninhibit (in  's' cookie)
                          
+
                          Uninhibit (in's'cookie)
                          
 
                          
 
                          
             Uninhibits other clients from using the daemon.
           
                          
-
                          
+
                          
+++
                          
 


 
                          
 
                          cookie:
                          		
 
@@ -1290,9 +1403,12 @@
 
                          
 
                          
 
                          
-
                          Errors
                          
-
                          
+
                          Errors
                          
+
                          
+++
@@ -1301,17 +1417,20 @@
 
                          
-
                          Signal Details
                          
+
                          Signal Details
                          
 
                          
-
                          
+
                          
 The DeviceAdded signal
                          
-
                          DeviceAdded ('o' device)
                          
+
                          DeviceAdded ('o'device)
                          
 
                          
 
                          
             Emitted when a device is added.
           
                          
-
                          
 


 
                          
 
                          org.freedesktop.PolicyKit.Error.Failed:
                          		
 if the given cookie is malformed
 
 
                          
+
                          
+++
@@ -1319,15 +1438,18 @@
 
                          
 


 
                          
 
                          device:
                          		
 Object path of device that was added.
                          
 
                          
 
                          
-
                          
+
                          
 The DeviceRemoved signal
                          
-
                          DeviceRemoved ('o' device)
                          
+
                          DeviceRemoved ('o'device)
                          
 
                          
 
                          
             Emitted when a device is removed.
           
                          
-
                          
+
                          
+++
@@ -1335,15 +1457,18 @@
 
                          
 


 
                          
 
                          device:
                          		
 Object path of device that was removed.
                          
 
                          
 
                          
-
                          
+
                          
 The DeviceChanged signal
                          
-
                          DeviceChanged ('o' device)
                          
+
                          DeviceChanged ('o'device)
                          
 
                          
 
                          
             Emitted when a device changed.
           
                          
-
                          
+
                          
+++
@@ -1351,22 +1476,25 @@
 
                          
 


 
                          
 
                          device:
                          		
 Object path of device that was changed.
                          
 
                          
 
                          
-
                          
+
                          
 The DeviceJobChanged signal
                          
-
                          DeviceJobChanged ('o' device,
-                  'b' job_in_progress,
-                  'b' job_is_cancellable,
-                  's' job_id,
-                  'i' job_num_tasks,
-                  'i' job_cur_task,
-                  's' job_cur_task_id,
-                  'd' job_cur_task_percentage)
                          
+
                          DeviceJobChanged ('o'device,
+'b'job_in_progress,
+'b'job_is_cancellable,
+'s'job_id,
+'i'job_num_tasks,
+'i'job_cur_task,
+'s'job_cur_task_id,
+'d'job_cur_task_percentage)
                          
 
                          
 
                          
             Emitted when a job on a device changes.
           
                          
-
                          
+
                          
+++
@@ -1404,15 +1532,18 @@
 
                          
 


 
 
                          
 
                          device:
                          
 
                          
 
                          
-
                          
+
                          
 The AdapterAdded signal
                          
-
                          AdapterAdded ('o' adapter)
                          
+
                          AdapterAdded ('o'adapter)
                          
 
                          
 
                          
             Emitted when an adapter is added.
           
                          
-
                          
+
                          
+++
@@ -1420,15 +1551,18 @@
 
                          
 


 
                          
 
                          adapter:
                          		
 Object path of adapter that was added.
                          
 
                          
 
                          
-
                          
+
                          
 The AdapterRemoved signal
                          
-
                          AdapterRemoved ('o' adapter)
                          
+
                          AdapterRemoved ('o'adapter)
                          
 
                          
 
                          
             Emitted when an adapter is removed.
           
                          
-
                          
+
                          
+++
@@ -1436,15 +1570,18 @@
 
                          
 


 
                          
 
                          adapter:
                          		
 Object path of adapter that was removed.
                          
 
                          
 
                          
-
                          
+
                          
 The AdapterChanged signal
                          
-
                          AdapterChanged ('o' adapter)
                          
+
                          AdapterChanged ('o'adapter)
                          
 
                          
 
                          
             Emitted when an adapter changed.
           
                          
-
                          
+
                          
+++
@@ -1452,15 +1589,18 @@
 
                          
 


 
                          
 
                          adapter:
                          		
 Object path of adapter that was changed.
                          
 
                          
 
                          
-
                          
+
                          
 The ExpanderAdded signal
                          
-
                          ExpanderAdded ('o' expander)
                          
+
                          ExpanderAdded ('o'expander)
                          
 
                          
 
                          
             Emitted when an expander is added.
           
                          
-
                          
+
                          
+++
@@ -1468,15 +1608,18 @@
 
                          
 


 
                          
 
                          expander:
                          		
 Object path of expander that was added.
                          
 
                          
 
                          
-
                          
+
                          
 The ExpanderRemoved signal
                          
-
                          ExpanderRemoved ('o' expander)
                          
+
                          ExpanderRemoved ('o'expander)
                          
 
                          
 
                          
             Emitted when an expander is removed.
           
                          
-
                          
+
                          
+++
@@ -1484,15 +1627,18 @@
 
                          
 


 
                          
 
                          expander:
                          		
 Object path of expander that was removed.
                          
 
                          
 
                          
-
                          
+
                          
 The ExpanderChanged signal
                          
-
                          ExpanderChanged ('o' expander)
                          
+
                          ExpanderChanged ('o'expander)
                          
 
                          
 
                          
             Emitted when an expander changed.
           
                          
-
                          
+
                          
+++
@@ -1500,15 +1646,18 @@
 
                          
 


 
                          
 
                          expander:
                          		
 Object path of expander that was changed.
                          
 
                          
 
                          
-
                          
+
                          
 The PortAdded signal
                          
-
                          PortAdded ('o' port)
                          
+
                          PortAdded ('o'port)
                          
 
                          
 
                          
             Emitted when a port is added.
           
                          
-
                          
+
                          
+++
@@ -1516,15 +1665,18 @@
 
                          
 


 
                          
 
                          port:
                          		
 Object path of port that was added.
                          
 
                          
 
                          
-
                          
+
                          
 The PortRemoved signal
                          
-
                          PortRemoved ('o' port)
                          
+
                          PortRemoved ('o'port)
                          
 
                          
 
                          
             Emitted when a port is removed.
           
                          
-
                          
+
                          
+++
@@ -1532,15 +1684,18 @@
 
                          
 


 
                          
 
                          port:
                          		
 Object path of port that was removed.
                          
 
                          
 
                          
-
                          
+
                          
 The PortChanged signal
                          
-
                          PortChanged ('o' port)
                          
+
                          PortChanged ('o'port)
                          
 
                          
 
                          
             Emitted when a port changed.
           
                          
-
                          
+
                          
+++
@@ -1548,39 +1703,45 @@
 
                          
 


 
                          
 
                          port:
                          		
 Object path of port that was changed.
                          
 
                          
 
                          
-
                          Property Details
                          
+
                          Property Details
                          
 
                          
-
                          
+
                          
 The "DaemonVersion" property
                          
-
                          'DaemonVersion'  read      's'
+
                          'DaemonVersion'read's'
 
                          
 
                          
 
                          
             The version of the running daemon.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "DaemonIsInhibited" property
                          
-
                          'DaemonIsInhibited'  read      'b'
+
                          'DaemonIsInhibited'read'b'
 
                          
 
                          
 
                          
             TRUE only if the daemon is inhibited.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "SupportsLuksDevices" property
                          
-
                          'SupportsLuksDevices'  read      'b'
+
                          'SupportsLuksDevices'read'b'
 
                          
 
                          
 
                          
@@ -1589,22 +1750,25 @@
             LuksLock()
             methods for details.
       
                          
-
                          
+
                          
+++
                          
 


 
 
                          
 
                          
 
                          
-
                          
+
                          
 The "KnownFilesystems" property
                          
-
                          'KnownFilesystems'  read      'a(ssbbbubbbbbbbb)'
+
                          'KnownFilesystems'read'a(ssbbbubbbbbbbb)'
 
                          
 
                          
 
                          
             An array of file systems known to the daemon and what features are supported.
             Each element in the array contains the following members:
             
                          
-
                            
+
                              
 
                            • 
 id: 
                   The name / identifier of the file system (such as ext3 or vfat),
@@ -1669,14 +1833,17 @@
 
                              
 
       
                              
-
                              
+
                              
+++
                              
 


 
 
                              
 
                            
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
diff -Nru udisks-1.0.4/doc/html/udisks-tcp-bridge.1.html udisks-1.0.5/doc/html/udisks-tcp-bridge.1.html
--- udisks-1.0.4/doc/html/udisks-tcp-bridge.1.html	2011-08-26 15:44:42.000000000 +0000
+++ udisks-1.0.5/doc/html/udisks-tcp-bridge.1.html	2014-03-10 09:11:32.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-udisks-tcp-bridge
-
+udisks Reference Manual: udisks-tcp-bridge
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
                          
 
                          
@@ -26,7 +26,7 @@
 
                          udisks-tcp-bridge
                          
 
                          udisks-tcp-bridge — udisks TCP/IP bridge
                          
 
-
+
 
                          
 
                          
 
                          Synopsis
                          
@@ -38,7 +38,7 @@
       ]
                          
 
                          
 
                          
-
                          DESCRIPTION
                          
+
                          DESCRIPTION
                          
 
                          
       This program is used by remote clients to connect to
       the org.freedesktop.UDisks D-Bus service on
@@ -54,14 +54,14 @@
     
                          
 
                          
 
                          
-
                          AUTHOR
                          
+
                          AUTHOR
                          
 
                          
       Written by David Zeuthen  with
       a lot of help from many others.
     
                          
 
                          
 
                          
-
                          BUGS
                          
+
                          BUGS
                          
 
                          
       Please send bug reports to either the distribution bug tracker
       or the upstream bug tracker at
@@ -69,7 +69,7 @@
     
                          
 
                          
 
                          
-
                          SEE ALSO
                          
+
                          SEE ALSO
                          
 
                          
       udisks-daemon(8),
       udisks(7),
@@ -80,6 +80,6 @@
 
                          
 
                          
 
                          
-          Generated by GTK-Doc V1.17
                          
+          Generated by GTK-Doc V1.20
                          
 
 
\ No newline at end of file
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/up-insensitive.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/up-insensitive.png differ
Binary files /tmp/tZ4Adjx_UP/udisks-1.0.4/doc/html/up.png and /tmp/3eDxRIJSK2/udisks-1.0.5/doc/html/up.png differ
diff -Nru udisks-1.0.4/doc/Makefile.in udisks-1.0.5/doc/Makefile.in
--- udisks-1.0.4/doc/Makefile.in	2011-08-26 15:08:42.000000000 +0000
+++ udisks-1.0.5/doc/Makefile.in	2014-03-10 09:04:33.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,6 +20,51 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,8 +83,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make TODO
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(srcdir)/version.xml.in TODO
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50,26 +94,58 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -143,6 +219,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -159,6 +238,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -250,6 +333,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -267,6 +352,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -347,10 +433,10 @@
 	udisks-*.txt		\
 	$(NULL)
 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
 
@@ -372,10 +458,11 @@
 @ENABLE_GTK_DOC_FALSE@EXTRA_DIST = version.xml.in
 
 # Version information for marking the documentation
-@ENABLE_GTK_DOC_TRUE@EXTRA_DIST = $(SETUP_FILES) version.xml.in
+@ENABLE_GTK_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \
+@ENABLE_GTK_DOC_TRUE@	version.xml.in
 @ENABLE_GTK_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 @ENABLE_GTK_DOC_TRUE@	html-build.stamp pdf-build.stamp \
-@ENABLE_GTK_DOC_TRUE@	setup.stamp sgml.stamp html.stamp pdf.stamp
+@ENABLE_GTK_DOC_TRUE@	sgml.stamp html.stamp pdf.stamp
 
 @ENABLE_GTK_DOC_TRUE@SCANOBJ_FILES = \
 @ENABLE_GTK_DOC_TRUE@	$(DOC_MODULE).args 	 \
@@ -389,11 +476,42 @@
 @ENABLE_GTK_DOC_TRUE@	$(DOC_MODULE)-undeclared.txt \
 @ENABLE_GTK_DOC_TRUE@	$(DOC_MODULE)-unused.txt
 
-@ENABLE_GTK_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+@ENABLE_GTK_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### xml ####
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-recursive
 
 .SUFFIXES:
@@ -418,6 +536,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/gtk-doc.make:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -437,22 +556,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -467,57 +589,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -533,12 +610,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -550,15 +622,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -567,6 +635,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -604,13 +687,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -649,10 +729,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -668,8 +753,8 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 @ENABLE_GTK_DOC_FALSE@uninstall-local:
 @ENABLE_GTK_DOC_FALSE@distclean-local:
-@ENABLE_GTK_DOC_FALSE@install-data-local:
 @ENABLE_GTK_DOC_FALSE@maintainer-clean-local:
+@ENABLE_GTK_DOC_FALSE@install-data-local:
 @ENABLE_GTK_DOC_FALSE@clean-local:
 clean: clean-recursive
 
@@ -739,13 +824,12 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local ctags ctags-recursive dist-hook \
-	distclean distclean-generic distclean-libtool distclean-local \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool clean-local \
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
 	install-data-local install-dvi install-dvi-am install-exec \
@@ -755,79 +839,86 @@
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-local mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-local
+	tags tags-am uninstall uninstall-am uninstall-local
+
 
+@ENABLE_GTK_DOC_TRUE@gtkdoc-check.test: Makefile
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+@ENABLE_GTK_DOC_TRUE@		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+@ENABLE_GTK_DOC_TRUE@		chmod +x $@
 
-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-#all-local:
+@ENABLE_GTK_DOC_TRUE@all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+@ENABLE_GTK_DOC_TRUE@.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
 
 @ENABLE_GTK_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 @ENABLE_GTK_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 @ENABLE_GTK_DOC_TRUE@setup-build.stamp:
-@ENABLE_GTK_DOC_TRUE@	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-@ENABLE_GTK_DOC_TRUE@	   echo 'gtk-doc: Preparing build'; \
-@ENABLE_GTK_DOC_TRUE@	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-@ENABLE_GTK_DOC_TRUE@	   if test "x$$files" != "x" ; then \
-@ENABLE_GTK_DOC_TRUE@	       for file in $$files ; do \
-@ENABLE_GTK_DOC_TRUE@	           test -f $(abs_srcdir)/$$file && \
-@ENABLE_GTK_DOC_TRUE@	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-@ENABLE_GTK_DOC_TRUE@	       done \
-@ENABLE_GTK_DOC_TRUE@	   fi \
+@ENABLE_GTK_DOC_TRUE@	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+@ENABLE_GTK_DOC_TRUE@	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+@ENABLE_GTK_DOC_TRUE@	    if test "x$$files" != "x" ; then \
+@ENABLE_GTK_DOC_TRUE@	        for file in $$files ; do \
+@ENABLE_GTK_DOC_TRUE@	            destdir=`dirname $(abs_builddir)/$$file`; \
+@ENABLE_GTK_DOC_TRUE@	            test -d "$$destdir" || mkdir -p "$$destdir"; \
+@ENABLE_GTK_DOC_TRUE@	            test -f $(abs_srcdir)/$$file && \
+@ENABLE_GTK_DOC_TRUE@	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+@ENABLE_GTK_DOC_TRUE@	        done; \
+@ENABLE_GTK_DOC_TRUE@	    fi; \
 @ENABLE_GTK_DOC_TRUE@	fi
-@ENABLE_GTK_DOC_TRUE@	@touch setup-build.stamp
-
-@ENABLE_GTK_DOC_TRUE@setup.stamp: setup-build.stamp
-@ENABLE_GTK_DOC_TRUE@	@true
-
-#### scan ####
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_at)touch setup-build.stamp
 
-@ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-@ENABLE_GTK_DOC_TRUE@	@echo 'gtk-doc: Scanning header files'
-@ENABLE_GTK_DOC_TRUE@	@_source_dir='' ; \
+@ENABLE_GTK_DOC_TRUE@scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 @ENABLE_GTK_DOC_TRUE@	for i in $(DOC_SOURCE_DIR) ; do \
 @ENABLE_GTK_DOC_TRUE@	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 @ENABLE_GTK_DOC_TRUE@	done ; \
 @ENABLE_GTK_DOC_TRUE@	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-@ENABLE_GTK_DOC_TRUE@	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-@ENABLE_GTK_DOC_TRUE@	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+@ENABLE_GTK_DOC_TRUE@	    scanobj_options=""; \
+@ENABLE_GTK_DOC_TRUE@	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+@ENABLE_GTK_DOC_TRUE@	    if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@	        if test "x$(V)" = "x1"; then \
+@ENABLE_GTK_DOC_TRUE@	            scanobj_options="--verbose"; \
+@ENABLE_GTK_DOC_TRUE@	        fi; \
+@ENABLE_GTK_DOC_TRUE@	    fi; \
+@ENABLE_GTK_DOC_TRUE@	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+@ENABLE_GTK_DOC_TRUE@	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 @ENABLE_GTK_DOC_TRUE@	else \
 @ENABLE_GTK_DOC_TRUE@	    for i in $(SCANOBJ_FILES) ; do \
-@ENABLE_GTK_DOC_TRUE@                 test -f $$i || touch $$i ; \
+@ENABLE_GTK_DOC_TRUE@	        test -f $$i || touch $$i ; \
 @ENABLE_GTK_DOC_TRUE@	    done \
 @ENABLE_GTK_DOC_TRUE@	fi
-@ENABLE_GTK_DOC_TRUE@	@touch scan-build.stamp
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_at)touch scan-build.stamp
 
 @ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 @ENABLE_GTK_DOC_TRUE@	@true
 
-#### xml ####
-
-@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-@ENABLE_GTK_DOC_TRUE@	@echo 'gtk-doc: Building XML'
-@ENABLE_GTK_DOC_TRUE@	@_source_dir='' ; \
+@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_XML)_source_dir='' ; \
 @ENABLE_GTK_DOC_TRUE@	for i in $(DOC_SOURCE_DIR) ; do \
 @ENABLE_GTK_DOC_TRUE@	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 @ENABLE_GTK_DOC_TRUE@	done ; \
 @ENABLE_GTK_DOC_TRUE@	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	@touch sgml-build.stamp
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_at)touch sgml-build.stamp
 
 @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp
 @ENABLE_GTK_DOC_TRUE@	@true
 
-#### html ####
-
 @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-@ENABLE_GTK_DOC_TRUE@	@echo 'gtk-doc: Building HTML'
-@ENABLE_GTK_DOC_TRUE@	@rm -rf html
-@ENABLE_GTK_DOC_TRUE@	@mkdir html
-@ENABLE_GTK_DOC_TRUE@	@mkhtml_options=""; \
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+@ENABLE_GTK_DOC_TRUE@	mkhtml_options=""; \
+@ENABLE_GTK_DOC_TRUE@	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+@ENABLE_GTK_DOC_TRUE@	if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@	  if test "x$(V)" = "x1"; then \
+@ENABLE_GTK_DOC_TRUE@	    mkhtml_options="$$mkhtml_options --verbose"; \
+@ENABLE_GTK_DOC_TRUE@	  fi; \
+@ENABLE_GTK_DOC_TRUE@	fi; \
 @ENABLE_GTK_DOC_TRUE@	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 @ENABLE_GTK_DOC_TRUE@	if test "$(?)" = "0"; then \
-@ENABLE_GTK_DOC_TRUE@	  mkhtml_options=--path="$(abs_srcdir)"; \
+@ENABLE_GTK_DOC_TRUE@	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 @ENABLE_GTK_DOC_TRUE@	fi; \
 @ENABLE_GTK_DOC_TRUE@	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 @ENABLE_GTK_DOC_TRUE@	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -839,48 +930,53 @@
 @ENABLE_GTK_DOC_TRUE@	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 @ENABLE_GTK_DOC_TRUE@	  fi; \
 @ENABLE_GTK_DOC_TRUE@	done;
-@ENABLE_GTK_DOC_TRUE@	@echo 'gtk-doc: Fixing cross-references'
-@ENABLE_GTK_DOC_TRUE@	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	@touch html-build.stamp
-
-#### pdf ####
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_at)touch html-build.stamp
 
 @ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-@ENABLE_GTK_DOC_TRUE@	@echo 'gtk-doc: Building PDF'
-@ENABLE_GTK_DOC_TRUE@	@rm -rf $(DOC_MODULE).pdf
-@ENABLE_GTK_DOC_TRUE@	@mkpdf_imgdirs=""; \
+@ENABLE_GTK_DOC_TRUE@	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+@ENABLE_GTK_DOC_TRUE@	mkpdf_options=""; \
+@ENABLE_GTK_DOC_TRUE@	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+@ENABLE_GTK_DOC_TRUE@	if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@	  if test "x$(V)" = "x1"; then \
+@ENABLE_GTK_DOC_TRUE@	    mkpdf_options="$$mkpdf_options --verbose"; \
+@ENABLE_GTK_DOC_TRUE@	  fi; \
+@ENABLE_GTK_DOC_TRUE@	fi; \
 @ENABLE_GTK_DOC_TRUE@	if test "x$(HTML_IMAGES)" != "x"; then \
 @ENABLE_GTK_DOC_TRUE@	  for img in $(HTML_IMAGES); do \
 @ENABLE_GTK_DOC_TRUE@	    part=`dirname $$img`; \
-@ENABLE_GTK_DOC_TRUE@	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+@ENABLE_GTK_DOC_TRUE@	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 @ENABLE_GTK_DOC_TRUE@	    if test $$? != 0; then \
-@ENABLE_GTK_DOC_TRUE@	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+@ENABLE_GTK_DOC_TRUE@	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 @ENABLE_GTK_DOC_TRUE@	    fi; \
 @ENABLE_GTK_DOC_TRUE@	  done; \
 @ENABLE_GTK_DOC_TRUE@	fi; \
-@ENABLE_GTK_DOC_TRUE@	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	@touch pdf-build.stamp
+@ENABLE_GTK_DOC_TRUE@	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 @ENABLE_GTK_DOC_TRUE@clean-local:
-@ENABLE_GTK_DOC_TRUE@	rm -f *~ *.bak
-@ENABLE_GTK_DOC_TRUE@	rm -rf .libs
+@ENABLE_GTK_DOC_TRUE@	@rm -f *~ *.bak
+@ENABLE_GTK_DOC_TRUE@	@rm -rf .libs
+@ENABLE_GTK_DOC_TRUE@	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+@ENABLE_GTK_DOC_TRUE@	  rm -f $(DOC_MODULE).types; \
+@ENABLE_GTK_DOC_TRUE@	fi
 
 @ENABLE_GTK_DOC_TRUE@distclean-local:
-@ENABLE_GTK_DOC_TRUE@	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+@ENABLE_GTK_DOC_TRUE@	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 @ENABLE_GTK_DOC_TRUE@	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-@ENABLE_GTK_DOC_TRUE@	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+@ENABLE_GTK_DOC_TRUE@	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 @ENABLE_GTK_DOC_TRUE@	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 @ENABLE_GTK_DOC_TRUE@	fi
 
-@ENABLE_GTK_DOC_TRUE@maintainer-clean-local: clean
-@ENABLE_GTK_DOC_TRUE@	rm -rf xml html
+@ENABLE_GTK_DOC_TRUE@maintainer-clean-local:
+@ENABLE_GTK_DOC_TRUE@	@rm -rf xml html
 
 @ENABLE_GTK_DOC_TRUE@install-data-local:
 @ENABLE_GTK_DOC_TRUE@	@installfiles=`echo $(builddir)/html/*`; \
-@ENABLE_GTK_DOC_TRUE@	if test "$$installfiles" = '$(srcdir)/html/*'; \
-@ENABLE_GTK_DOC_TRUE@	then echo '-- Nothing to install' ; \
+@ENABLE_GTK_DOC_TRUE@	if test "$$installfiles" = '$(builddir)/html/*'; \
+@ENABLE_GTK_DOC_TRUE@	then echo 1>&2 'Nothing to install' ; \
 @ENABLE_GTK_DOC_TRUE@	else \
 @ENABLE_GTK_DOC_TRUE@	  if test -n "$(DOC_MODULE_VERSION)"; then \
 @ENABLE_GTK_DOC_TRUE@	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -889,14 +985,12 @@
 @ENABLE_GTK_DOC_TRUE@	  fi; \
 @ENABLE_GTK_DOC_TRUE@	  $(mkinstalldirs) $${installdir} ; \
 @ENABLE_GTK_DOC_TRUE@	  for i in $$installfiles; do \
-@ENABLE_GTK_DOC_TRUE@	    echo '-- Installing '$$i ; \
+@ENABLE_GTK_DOC_TRUE@	    echo ' $(INSTALL_DATA) '$$i ; \
 @ENABLE_GTK_DOC_TRUE@	    $(INSTALL_DATA) $$i $${installdir}; \
 @ENABLE_GTK_DOC_TRUE@	  done; \
 @ENABLE_GTK_DOC_TRUE@	  if test -n "$(DOC_MODULE_VERSION)"; then \
 @ENABLE_GTK_DOC_TRUE@	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 @ENABLE_GTK_DOC_TRUE@	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-@ENABLE_GTK_DOC_TRUE@	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-@ENABLE_GTK_DOC_TRUE@	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 @ENABLE_GTK_DOC_TRUE@	  fi; \
 @ENABLE_GTK_DOC_TRUE@	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 @ENABLE_GTK_DOC_TRUE@	fi
@@ -912,19 +1006,21 @@
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
-#dist-check-gtkdoc:
-#	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-#	@false
-
-@ENABLE_GTK_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local
-@ENABLE_GTK_DOC_TRUE@	mkdir $(distdir)/html
-@ENABLE_GTK_DOC_TRUE@	cp $(builddir)/html/* $(distdir)/html
-@ENABLE_GTK_DOC_TRUE@	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-@ENABLE_GTK_DOC_TRUE@	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
-@ENABLE_GTK_DOC_TRUE@	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
-@ENABLE_GTK_DOC_TRUE@	cd $(distdir) && rm -f $(DISTCLEANFILES)
-@ENABLE_GTK_DOC_TRUE@	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@	@echo "*** please install gtk-doc and rerun 'configure'. ***"
+@ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@	@false
+
+@ENABLE_GTK_DOC_TRUE@dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+@ENABLE_GTK_DOC_TRUE@	@mkdir $(distdir)/html
+@ENABLE_GTK_DOC_TRUE@	@cp ./html/* $(distdir)/html
+@ENABLE_GTK_DOC_TRUE@	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+@ENABLE_GTK_DOC_TRUE@	@-cp ./$(DOC_MODULE).types $(distdir)/
+@ENABLE_GTK_DOC_TRUE@	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+@ENABLE_GTK_DOC_TRUE@	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+@ENABLE_GTK_DOC_TRUE@	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 @ENABLE_GTK_DOC_TRUE@.PHONY : dist-hook-local docs
 
diff -Nru udisks-1.0.4/doc/man/Makefile.in udisks-1.0.5/doc/man/Makefile.in
--- udisks-1.0.4/doc/man/Makefile.in	2011-08-26 15:08:42.000000000 +0000
+++ udisks-1.0.5/doc/man/Makefile.in	2014-03-10 09:04:33.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +79,7 @@
 host_triplet = @host@
 @MAN_PAGES_ENABLED_TRUE@@REMOTE_ACCESS_ENABLED_TRUE@am__append_1 = udisks-tcp-bridge.1
 subdir = doc/man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -44,14 +88,25 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,6 +128,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
 	"$(DESTDIR)$(man8dir)"
@@ -80,6 +141,7 @@
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -125,6 +187,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -141,6 +206,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -232,6 +301,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -249,6 +320,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -304,11 +376,18 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -337,16 +416,21 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man7: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)"
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man7dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.7[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -375,16 +459,21 @@
 	  sed -n '/\.7[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man7dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -413,30 +502,15 @@
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -483,10 +557,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -569,17 +648,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-man1 install-man7 install-man8 install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-man uninstall-man1 uninstall-man7 uninstall-man8
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1 uninstall-man7 \
+	uninstall-man8
 
 
 @MAN_PAGES_ENABLED_TRUE@udisks.1 : udisks.xml
diff -Nru udisks-1.0.4/doc/version.xml udisks-1.0.5/doc/version.xml
--- udisks-1.0.4/doc/version.xml	2011-08-26 15:08:49.000000000 +0000
+++ udisks-1.0.5/doc/version.xml	2014-03-10 09:04:39.000000000 +0000
@@ -1 +1 @@
-1.0.4
+1.0.5
diff -Nru udisks-1.0.4/gtk-doc.make udisks-1.0.5/gtk-doc.make
--- udisks-1.0.4/gtk-doc.make	2011-02-02 22:11:09.000000000 +0000
+++ udisks-1.0.5/gtk-doc.make	2014-02-19 10:15:36.000000000 +0000
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -30,11 +30,12 @@
 	$(DOC_MODULE)-overrides.txt
 
 EXTRA_DIST = 				\
+	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
 DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	setup.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -48,9 +49,13 @@
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 
-if ENABLE_GTK_DOC
 if GTK_DOC_BUILD_HTML
 HTML_BUILD_STAMP=html-build.stamp
 else
@@ -62,9 +67,11 @@
 PDF_BUILD_STAMP=
 endif
 
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
 endif
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -73,69 +80,100 @@
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file`; \
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	        done; \
+	    fi; \
 	fi
-	@touch setup-build.stamp
-
-
-setup.stamp: setup-build.stamp
-	@true
+	$(AM_V_at)touch setup-build.stamp
 
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@_source_dir='' ; \
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
-                 test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
 #### xml ####
 
-sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@_source_dir='' ; \
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
 #### html ####
 
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -147,48 +185,59 @@
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo 'gtk-doc: Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+	  rm -f $(DOC_MODULE).types; \
+	fi
 
 distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
-	rm -rf xml html
+maintainer-clean-local:
+	@rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(builddir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -197,14 +246,12 @@
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -220,21 +267,23 @@
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+if HAVE_GTK_DOC
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+	@echo "*** please install gtk-doc and rerun 'configure'. ***"
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/html
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff -Nru udisks-1.0.4/INSTALL udisks-1.0.5/INSTALL
--- udisks-1.0.4/INSTALL	2010-03-29 11:21:24.000000000 +0000
+++ udisks-1.0.5/INSTALL	2014-01-02 19:14:59.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff -Nru udisks-1.0.4/install-sh udisks-1.0.5/install-sh
--- udisks-1.0.4/install-sh	2010-03-29 11:21:24.000000000 +0000
+++ udisks-1.0.5/install-sh	2014-01-02 19:14:59.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru udisks-1.0.4/ltmain.sh udisks-1.0.5/ltmain.sh
--- udisks-1.0.4/ltmain.sh	2011-08-26 15:08:38.000000000 +0000
+++ udisks-1.0.5/ltmain.sh	2014-03-10 09:04:32.000000000 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit , 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6111,7 +6124,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6147,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6430,19 +6447,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -6831,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7333,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7334,6 +7352,9 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -7432,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8041,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru udisks-1.0.4/Makefile.am udisks-1.0.5/Makefile.am
--- udisks-1.0.4/Makefile.am	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/Makefile.am	2014-03-10 08:57:48.000000000 +0000
@@ -24,7 +24,8 @@
 	ChangeLog
 
 # xsltproc barfs on 'make distcheck'; disable for now
-DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --disable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --disable-gtk-doc \
+			  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 clean-local :
 	rm -f *~
diff -Nru udisks-1.0.4/Makefile.in udisks-1.0.5/Makefile.in
--- udisks-1.0.4/Makefile.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/Makefile.in	2014-03-10 09:04:33.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,11 +78,11 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in test-driver COPYING compile config.guess \
+	config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -49,38 +93,276 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope check recheck distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+CSCOPE = cscope
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -108,7 +390,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -154,6 +439,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -170,6 +458,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -261,6 +553,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -278,6 +572,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -289,14 +584,17 @@
 
 
 # xsltproc barfs on 'make distcheck'; disable for now
-DISTCHECK_CONFIGURE_FLAGS = --disable-man-pages --disable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-man-pages --disable-gtk-doc \
+			  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 TESTS_ENVIRONMENT = sudo
 TESTS = tests/run
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+.SUFFIXES: .log .test .test$(EXEEXT) .trs
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -332,10 +630,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -358,22 +654,25 @@
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -388,57 +687,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -454,12 +708,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -471,15 +720,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -488,101 +733,194 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+tests/run.log: tests/run
+	@p='tests/run'; \
+	b='tests/run'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -618,13 +956,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -656,36 +991,42 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -696,8 +1037,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -707,17 +1048,19 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -740,13 +1083,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -778,11 +1129,19 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -863,15 +1222,14 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-TESTS check-am clean \
-	clean-generic clean-libtool clean-local ctags ctags-recursive \
-	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-TESTS check-am clean clean-cscope \
+	clean-generic clean-libtool clean-local cscope cscopelist-am \
+	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -881,7 +1239,7 @@
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
 
 # Creating ChangeLog from git log (taken from cairo/Makefile.am):
diff -Nru udisks-1.0.4/missing udisks-1.0.5/missing
--- udisks-1.0.4/missing	2010-03-29 11:21:24.000000000 +0000
+++ udisks-1.0.5/missing	2014-01-02 19:14:59.000000000 +0000
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard , 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to ."
     exit $?
@@ -100,272 +70,141 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
 
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
 
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Nru udisks-1.0.4/NEWS udisks-1.0.5/NEWS
--- udisks-1.0.4/NEWS	2011-08-26 15:44:02.000000000 +0000
+++ udisks-1.0.5/NEWS	2014-03-10 09:09:43.000000000 +0000
@@ -1,4 +1,55 @@
 ------------
+udisks 1.0.5
+------------
+
+udisks provides a daemon, D-Bus API and command line tools
+for managing disks and storage devices.
+
+All releases in the udisks 1.0 series will retain ABI compatibility at
+the D-Bus interface level. This means that any application built
+against udisks 1.0.x will work with udisks 1.0.y provided that y >=
+x. At this point we do not provide any ABI guarantees for the
+udisks(1) command-line tool (neither options nor the name). See the
+README file for more discussion of ABI guarantees.
+
+This version fixes a security vulnerability (CVE-2014-0004), so please update
+as soon as possible!
+
+Changes from udisks 1.0.4:
+
+Brice De Bruyne (1):
+      Fix segfault and detection for SATA-II RAID controller
+
+David Zeuthen (2):
+      udisks-daemon: Add --no-debug option and use this for D-Bus activation
+      Bug 51439 – udisks should hide lvm PVs
+
+Edward Sheldrake (1):
+      Fix power/level deprecation kernel warning
+
+Martin Pitt (9):
+      Fix buffer overflow in mount path parsing. If users have the possibility
+      to create very long mount points, such as with FUSE, they could cause
+      udisksd to crash, or even to run arbitrary code as root with specially
+      crafted mount paths. [CVE-2014-0004]
+
+      tests/run: Fix crash if first hard disk is not SMART capable
+      Add some safe and useful ntfs-3g allowed mount options
+      Drop deprecated g_io_channel_seek()
+      test suite: Fix test_swap to not expect successful fsck
+      test suite: Fix test_reiserfs for current reiserfsprogs
+      Bug 48173 — Ignore add/change events for a nonexisting native path
+      Mark rts_bpp devices as SD card readers
+
+Tom Gundersen (1):
+      add systemd service file and dbus activation to the udisks1 branch
+
+Thanks to all our contributors.
+
+Martin Pitt
+March 10, 2014
+
+------------
 udisks 1.0.4
 ------------
 
@@ -674,3 +725,4 @@
 
 David Zeuthen,
 March 2, 2009
+
diff -Nru udisks-1.0.4/po/Makefile.in.in udisks-1.0.5/po/Makefile.in.in
--- udisks-1.0.4/po/Makefile.in.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/po/Makefile.in.in	2014-03-10 09:04:34.000000000 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -73,15 +73,20 @@
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
diff -Nru udisks-1.0.4/policy/Makefile.in udisks-1.0.5/policy/Makefile.in
--- udisks-1.0.4/policy/Makefile.in	2011-08-26 15:08:42.000000000 +0000
+++ udisks-1.0.5/policy/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,8 +79,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = policy
-DIST_COMMON = $(dist_policy_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_policy_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -45,14 +89,25 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +129,15 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(policydir)"
 DATA = $(dist_policy_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -121,6 +183,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -137,6 +202,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -228,6 +297,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -245,6 +316,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -294,8 +366,11 @@
 	-rm -rf .libs _libs
 install-dist_policyDATA: $(dist_policy_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(policydir)" || $(MKDIR_P) "$(DESTDIR)$(policydir)"
 	@list='$(dist_policy_DATA)'; test -n "$(policydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(policydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(policydir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -309,14 +384,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_policy_DATA)'; test -n "$(policydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(policydir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(policydir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(policydir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -366,10 +439,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -451,17 +529,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am \
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
 	install-dist_policyDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_policyDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_policyDATA
 
 @INTLTOOL_POLICY_RULE@
 
diff -Nru udisks-1.0.4/src/adapter.c udisks-1.0.5/src/adapter.c
--- udisks-1.0.4/src/adapter.c	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/src/adapter.c	2014-03-10 08:57:48.000000000 +0000
@@ -506,6 +506,11 @@
         {
           fabric = "scsi";
         }
+      else if (subclass == 0x04)
+        {
+          /* PCI Mass storage subclass 0x04 is RAID - eg 3w-9xxx SATA-RAID*/
+          fabric = "raid";
+        }
       else if (subclass == 0x07)
         {
           fabric = "scsi_sas";
@@ -553,6 +558,13 @@
     }
 
   ret = TRUE;
+  
+  /*
+    set fabric to "unknown" string if it's NULL, or the udisks-daemon segfaults when calling
+      g_str_has_prefix (adapter_local_get_fabric (adapter), "ata")
+    in port.c (function update_info).
+  */
+  if (fabric == NULL) fabric = "unknown"; 
 
   adapter_set_fabric (adapter, fabric);
   adapter_set_num_ports (adapter, num_ports);
diff -Nru udisks-1.0.4/src/daemon.c udisks-1.0.5/src/daemon.c
--- udisks-1.0.4/src/daemon.c	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/src/daemon.c	2014-03-10 08:57:48.000000000 +0000
@@ -1705,12 +1705,13 @@
   Device *device;
   char *native_path;
   GPtrArray *a;
+  GError *error = NULL;
   int n;
 
   if (cond & ~G_IO_PRI)
     goto out;
 
-  if (g_io_channel_seek (channel, 0, G_SEEK_SET) != G_IO_ERROR_NONE)
+  if (g_io_channel_seek_position (channel, 0, G_SEEK_SET, &error) != G_IO_STATUS_NORMAL)
     {
       g_warning ("Cannot seek in /proc/mdstat");
       goto out;
@@ -1742,6 +1743,8 @@
   g_ptr_array_free (a, TRUE);
 
  out:
+  if (error != NULL)
+    g_error_free (error);
   return TRUE;
 }
 
diff -Nru udisks-1.0.4/src/device.c udisks-1.0.5/src/device.c
--- udisks-1.0.4/src/device.c	2011-08-25 21:31:20.000000000 +0000
+++ udisks-1.0.5/src/device.c	2014-03-10 08:57:48.000000000 +0000
@@ -5108,6 +5108,13 @@
   if (g_str_has_prefix (native_path, "/sys/devices/virtual/block/ram"))
     goto out;
 
+  /* ignore bogus events */
+  if (!g_file_test (native_path, G_FILE_TEST_EXISTS))
+    {
+      g_warning ("Ignoring device with nonexisting native path: %s", native_path);
+      goto out;
+    }
+
   PROFILE ("device_new(native_path=%s): start", native_path);
 
   device = DEVICE (g_object_new (TYPE_DEVICE, NULL));
@@ -5881,7 +5888,7 @@
 /* this is assuming that ntfs-3g is used */
 
 static const char *ntfs_defaults[] = { "uid=", "gid=", "dmask=0077", "fmask=0177", NULL };
-static const char *ntfs_allow[] = { "umask=", "dmask=", "fmask=", NULL };
+static const char *ntfs_allow[] = { "umask=", "dmask=", "fmask=", "locale=", "norecover", "ignore_case", "windows_names", "compression", "nocompression", NULL };
 static const char *ntfs_allow_uid_self[] = { "uid=", NULL };
 static const char *ntfs_allow_gid_self[] = { "gid=", NULL };
 
diff -Nru udisks-1.0.4/src/helpers/job-drive-detach.c udisks-1.0.5/src/helpers/job-drive-detach.c
--- udisks-1.0.4/src/helpers/job-drive-detach.c	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/src/helpers/job-drive-detach.c	2014-03-10 08:57:48.000000000 +0000
@@ -235,7 +235,12 @@
   if (endp != NULL && num_interfaces == 1)
     {
       g_printerr ("Suspending USB device: ");
-      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
+      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
+        power_level_path = "power/control";
+      else
+        power_level_path = "power/level";
+      
+      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
         goto out;
       g_printerr ("OK\n");
@@ -259,7 +264,6 @@
  out:
   g_free (usb_interface_name);
   g_free (unbind_path);
-  g_free (power_level_path);
   if (sg_fd > 0)
     sg_cmds_close_device (sg_fd);
   if (udevice != NULL)
diff -Nru udisks-1.0.4/src/helpers/Makefile.in udisks-1.0.5/src/helpers/Makefile.in
--- udisks-1.0.4/src/helpers/Makefile.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/src/helpers/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +95,8 @@
 	udisks-helper-linux-md-check$(EXEEXT) \
 	udisks-helper-drive-benchmark$(EXEEXT) $(am__EXEEXT_1)
 subdir = src/helpers
-DIST_COMMON = $(dist_libexec_SCRIPTS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_libexec_SCRIPTS) $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -66,9 +110,10 @@
 libpartutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libpartutil_la_OBJECTS = libpartutil_la-partutil.lo
 libpartutil_la_OBJECTS = $(am_libpartutil_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__EXEEXT_1 =
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(libexecdir)"
 PROGRAMS = $(libexec_PROGRAMS)
@@ -165,7 +210,25 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 SCRIPTS = $(dist_libexec_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -176,22 +239,18 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libpartutil_la_SOURCES) \
 	$(udisks_helper_ata_smart_collect_SOURCES) \
 	$(udisks_helper_ata_smart_selftest_SOURCES) \
@@ -222,6 +281,28 @@
 	$(udisks_helper_linux_md_remove_component_SOURCES) \
 	$(udisks_helper_mkfs_SOURCES) \
 	$(udisks_helper_modify_partition_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -269,6 +350,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -285,6 +369,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -376,6 +464,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -393,6 +483,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -502,24 +593,32 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libpartutil.la: $(libpartutil_la_OBJECTS) $(libpartutil_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libpartutil.la: $(libpartutil_la_OBJECTS) $(libpartutil_la_DEPENDENCIES) $(EXTRA_libpartutil_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libpartutil_la_OBJECTS) $(libpartutil_la_LIBADD) $(LIBS)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -540,7 +639,8 @@
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -553,52 +653,69 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-udisks-helper-ata-smart-collect$(EXEEXT): $(udisks_helper_ata_smart_collect_OBJECTS) $(udisks_helper_ata_smart_collect_DEPENDENCIES) 
+
+udisks-helper-ata-smart-collect$(EXEEXT): $(udisks_helper_ata_smart_collect_OBJECTS) $(udisks_helper_ata_smart_collect_DEPENDENCIES) $(EXTRA_udisks_helper_ata_smart_collect_DEPENDENCIES) 
 	@rm -f udisks-helper-ata-smart-collect$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_ata_smart_collect_OBJECTS) $(udisks_helper_ata_smart_collect_LDADD) $(LIBS)
-udisks-helper-ata-smart-selftest$(EXEEXT): $(udisks_helper_ata_smart_selftest_OBJECTS) $(udisks_helper_ata_smart_selftest_DEPENDENCIES) 
+
+udisks-helper-ata-smart-selftest$(EXEEXT): $(udisks_helper_ata_smart_selftest_OBJECTS) $(udisks_helper_ata_smart_selftest_DEPENDENCIES) $(EXTRA_udisks_helper_ata_smart_selftest_DEPENDENCIES) 
 	@rm -f udisks-helper-ata-smart-selftest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_ata_smart_selftest_OBJECTS) $(udisks_helper_ata_smart_selftest_LDADD) $(LIBS)
-udisks-helper-change-filesystem-label$(EXEEXT): $(udisks_helper_change_filesystem_label_OBJECTS) $(udisks_helper_change_filesystem_label_DEPENDENCIES) 
+
+udisks-helper-change-filesystem-label$(EXEEXT): $(udisks_helper_change_filesystem_label_OBJECTS) $(udisks_helper_change_filesystem_label_DEPENDENCIES) $(EXTRA_udisks_helper_change_filesystem_label_DEPENDENCIES) 
 	@rm -f udisks-helper-change-filesystem-label$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_change_filesystem_label_OBJECTS) $(udisks_helper_change_filesystem_label_LDADD) $(LIBS)
-udisks-helper-create-partition$(EXEEXT): $(udisks_helper_create_partition_OBJECTS) $(udisks_helper_create_partition_DEPENDENCIES) 
+
+udisks-helper-create-partition$(EXEEXT): $(udisks_helper_create_partition_OBJECTS) $(udisks_helper_create_partition_DEPENDENCIES) $(EXTRA_udisks_helper_create_partition_DEPENDENCIES) 
 	@rm -f udisks-helper-create-partition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_create_partition_OBJECTS) $(udisks_helper_create_partition_LDADD) $(LIBS)
-udisks-helper-create-partition-table$(EXEEXT): $(udisks_helper_create_partition_table_OBJECTS) $(udisks_helper_create_partition_table_DEPENDENCIES) 
+
+udisks-helper-create-partition-table$(EXEEXT): $(udisks_helper_create_partition_table_OBJECTS) $(udisks_helper_create_partition_table_DEPENDENCIES) $(EXTRA_udisks_helper_create_partition_table_DEPENDENCIES) 
 	@rm -f udisks-helper-create-partition-table$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_create_partition_table_OBJECTS) $(udisks_helper_create_partition_table_LDADD) $(LIBS)
-udisks-helper-delete-partition$(EXEEXT): $(udisks_helper_delete_partition_OBJECTS) $(udisks_helper_delete_partition_DEPENDENCIES) 
+
+udisks-helper-delete-partition$(EXEEXT): $(udisks_helper_delete_partition_OBJECTS) $(udisks_helper_delete_partition_DEPENDENCIES) $(EXTRA_udisks_helper_delete_partition_DEPENDENCIES) 
 	@rm -f udisks-helper-delete-partition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_delete_partition_OBJECTS) $(udisks_helper_delete_partition_LDADD) $(LIBS)
-udisks-helper-drive-benchmark$(EXEEXT): $(udisks_helper_drive_benchmark_OBJECTS) $(udisks_helper_drive_benchmark_DEPENDENCIES) 
+
+udisks-helper-drive-benchmark$(EXEEXT): $(udisks_helper_drive_benchmark_OBJECTS) $(udisks_helper_drive_benchmark_DEPENDENCIES) $(EXTRA_udisks_helper_drive_benchmark_DEPENDENCIES) 
 	@rm -f udisks-helper-drive-benchmark$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_drive_benchmark_OBJECTS) $(udisks_helper_drive_benchmark_LDADD) $(LIBS)
-udisks-helper-drive-detach$(EXEEXT): $(udisks_helper_drive_detach_OBJECTS) $(udisks_helper_drive_detach_DEPENDENCIES) 
+
+udisks-helper-drive-detach$(EXEEXT): $(udisks_helper_drive_detach_OBJECTS) $(udisks_helper_drive_detach_DEPENDENCIES) $(EXTRA_udisks_helper_drive_detach_DEPENDENCIES) 
 	@rm -f udisks-helper-drive-detach$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_drive_detach_OBJECTS) $(udisks_helper_drive_detach_LDADD) $(LIBS)
-udisks-helper-drive-poll$(EXEEXT): $(udisks_helper_drive_poll_OBJECTS) $(udisks_helper_drive_poll_DEPENDENCIES) 
+
+udisks-helper-drive-poll$(EXEEXT): $(udisks_helper_drive_poll_OBJECTS) $(udisks_helper_drive_poll_DEPENDENCIES) $(EXTRA_udisks_helper_drive_poll_DEPENDENCIES) 
 	@rm -f udisks-helper-drive-poll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_drive_poll_OBJECTS) $(udisks_helper_drive_poll_LDADD) $(LIBS)
-udisks-helper-fstab-mounter$(EXEEXT): $(udisks_helper_fstab_mounter_OBJECTS) $(udisks_helper_fstab_mounter_DEPENDENCIES) 
+
+udisks-helper-fstab-mounter$(EXEEXT): $(udisks_helper_fstab_mounter_OBJECTS) $(udisks_helper_fstab_mounter_DEPENDENCIES) $(EXTRA_udisks_helper_fstab_mounter_DEPENDENCIES) 
 	@rm -f udisks-helper-fstab-mounter$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_fstab_mounter_OBJECTS) $(udisks_helper_fstab_mounter_LDADD) $(LIBS)
-udisks-helper-linux-md-check$(EXEEXT): $(udisks_helper_linux_md_check_OBJECTS) $(udisks_helper_linux_md_check_DEPENDENCIES) 
+
+udisks-helper-linux-md-check$(EXEEXT): $(udisks_helper_linux_md_check_OBJECTS) $(udisks_helper_linux_md_check_DEPENDENCIES) $(EXTRA_udisks_helper_linux_md_check_DEPENDENCIES) 
 	@rm -f udisks-helper-linux-md-check$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_linux_md_check_OBJECTS) $(udisks_helper_linux_md_check_LDADD) $(LIBS)
-udisks-helper-linux-md-remove-component$(EXEEXT): $(udisks_helper_linux_md_remove_component_OBJECTS) $(udisks_helper_linux_md_remove_component_DEPENDENCIES) 
+
+udisks-helper-linux-md-remove-component$(EXEEXT): $(udisks_helper_linux_md_remove_component_OBJECTS) $(udisks_helper_linux_md_remove_component_DEPENDENCIES) $(EXTRA_udisks_helper_linux_md_remove_component_DEPENDENCIES) 
 	@rm -f udisks-helper-linux-md-remove-component$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_linux_md_remove_component_OBJECTS) $(udisks_helper_linux_md_remove_component_LDADD) $(LIBS)
-udisks-helper-mkfs$(EXEEXT): $(udisks_helper_mkfs_OBJECTS) $(udisks_helper_mkfs_DEPENDENCIES) 
+
+udisks-helper-mkfs$(EXEEXT): $(udisks_helper_mkfs_OBJECTS) $(udisks_helper_mkfs_DEPENDENCIES) $(EXTRA_udisks_helper_mkfs_DEPENDENCIES) 
 	@rm -f udisks-helper-mkfs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_mkfs_OBJECTS) $(udisks_helper_mkfs_LDADD) $(LIBS)
-udisks-helper-modify-partition$(EXEEXT): $(udisks_helper_modify_partition_OBJECTS) $(udisks_helper_modify_partition_DEPENDENCIES) 
+
+udisks-helper-modify-partition$(EXEEXT): $(udisks_helper_modify_partition_OBJECTS) $(udisks_helper_modify_partition_DEPENDENCIES) $(EXTRA_udisks_helper_modify_partition_DEPENDENCIES) 
 	@rm -f udisks-helper-modify-partition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_helper_modify_partition_OBJECTS) $(udisks_helper_modify_partition_LDADD) $(LIBS)
 install-dist_libexecSCRIPTS: $(dist_libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(dist_libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -626,9 +743,7 @@
 	@list='$(dist_libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -655,258 +770,226 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libpartutil_la-partutil.lo: partutil.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpartutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpartutil_la-partutil.lo -MD -MP -MF $(DEPDIR)/libpartutil_la-partutil.Tpo -c -o libpartutil_la-partutil.lo `test -f 'partutil.c' || echo '$(srcdir)/'`partutil.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpartutil_la-partutil.Tpo $(DEPDIR)/libpartutil_la-partutil.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='partutil.c' object='libpartutil_la-partutil.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='partutil.c' object='libpartutil_la-partutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpartutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpartutil_la-partutil.lo `test -f 'partutil.c' || echo '$(srcdir)/'`partutil.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpartutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpartutil_la-partutil.lo `test -f 'partutil.c' || echo '$(srcdir)/'`partutil.c
 
 udisks_helper_ata_smart_collect-job-ata-smart-collect.o: job-ata-smart-collect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_ata_smart_collect-job-ata-smart-collect.o -MD -MP -MF $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Tpo -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.o `test -f 'job-ata-smart-collect.c' || echo '$(srcdir)/'`job-ata-smart-collect.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Tpo $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-ata-smart-collect.c' object='udisks_helper_ata_smart_collect-job-ata-smart-collect.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-ata-smart-collect.c' object='udisks_helper_ata_smart_collect-job-ata-smart-collect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.o `test -f 'job-ata-smart-collect.c' || echo '$(srcdir)/'`job-ata-smart-collect.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.o `test -f 'job-ata-smart-collect.c' || echo '$(srcdir)/'`job-ata-smart-collect.c
 
 udisks_helper_ata_smart_collect-job-ata-smart-collect.obj: job-ata-smart-collect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_ata_smart_collect-job-ata-smart-collect.obj -MD -MP -MF $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Tpo -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.obj `if test -f 'job-ata-smart-collect.c'; then $(CYGPATH_W) 'job-ata-smart-collect.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-collect.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Tpo $(DEPDIR)/udisks_helper_ata_smart_collect-job-ata-smart-collect.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-ata-smart-collect.c' object='udisks_helper_ata_smart_collect-job-ata-smart-collect.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-ata-smart-collect.c' object='udisks_helper_ata_smart_collect-job-ata-smart-collect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.obj `if test -f 'job-ata-smart-collect.c'; then $(CYGPATH_W) 'job-ata-smart-collect.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-collect.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_collect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_collect-job-ata-smart-collect.obj `if test -f 'job-ata-smart-collect.c'; then $(CYGPATH_W) 'job-ata-smart-collect.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-collect.c'; fi`
 
 udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o: job-ata-smart-selftest.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o -MD -MP -MF $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Tpo -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o `test -f 'job-ata-smart-selftest.c' || echo '$(srcdir)/'`job-ata-smart-selftest.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Tpo $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-ata-smart-selftest.c' object='udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-ata-smart-selftest.c' object='udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o `test -f 'job-ata-smart-selftest.c' || echo '$(srcdir)/'`job-ata-smart-selftest.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.o `test -f 'job-ata-smart-selftest.c' || echo '$(srcdir)/'`job-ata-smart-selftest.c
 
 udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj: job-ata-smart-selftest.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj -MD -MP -MF $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Tpo -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj `if test -f 'job-ata-smart-selftest.c'; then $(CYGPATH_W) 'job-ata-smart-selftest.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-selftest.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Tpo $(DEPDIR)/udisks_helper_ata_smart_selftest-job-ata-smart-selftest.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-ata-smart-selftest.c' object='udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-ata-smart-selftest.c' object='udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj `if test -f 'job-ata-smart-selftest.c'; then $(CYGPATH_W) 'job-ata-smart-selftest.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-selftest.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_ata_smart_selftest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_ata_smart_selftest-job-ata-smart-selftest.obj `if test -f 'job-ata-smart-selftest.c'; then $(CYGPATH_W) 'job-ata-smart-selftest.c'; else $(CYGPATH_W) '$(srcdir)/job-ata-smart-selftest.c'; fi`
 
 udisks_helper_change_filesystem_label-job-change-filesystem-label.o: job-change-filesystem-label.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_change_filesystem_label-job-change-filesystem-label.o -MD -MP -MF $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Tpo -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.o `test -f 'job-change-filesystem-label.c' || echo '$(srcdir)/'`job-change-filesystem-label.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Tpo $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-change-filesystem-label.c' object='udisks_helper_change_filesystem_label-job-change-filesystem-label.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-change-filesystem-label.c' object='udisks_helper_change_filesystem_label-job-change-filesystem-label.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.o `test -f 'job-change-filesystem-label.c' || echo '$(srcdir)/'`job-change-filesystem-label.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.o `test -f 'job-change-filesystem-label.c' || echo '$(srcdir)/'`job-change-filesystem-label.c
 
 udisks_helper_change_filesystem_label-job-change-filesystem-label.obj: job-change-filesystem-label.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_change_filesystem_label-job-change-filesystem-label.obj -MD -MP -MF $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Tpo -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.obj `if test -f 'job-change-filesystem-label.c'; then $(CYGPATH_W) 'job-change-filesystem-label.c'; else $(CYGPATH_W) '$(srcdir)/job-change-filesystem-label.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Tpo $(DEPDIR)/udisks_helper_change_filesystem_label-job-change-filesystem-label.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-change-filesystem-label.c' object='udisks_helper_change_filesystem_label-job-change-filesystem-label.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-change-filesystem-label.c' object='udisks_helper_change_filesystem_label-job-change-filesystem-label.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.obj `if test -f 'job-change-filesystem-label.c'; then $(CYGPATH_W) 'job-change-filesystem-label.c'; else $(CYGPATH_W) '$(srcdir)/job-change-filesystem-label.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_change_filesystem_label_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_change_filesystem_label-job-change-filesystem-label.obj `if test -f 'job-change-filesystem-label.c'; then $(CYGPATH_W) 'job-change-filesystem-label.c'; else $(CYGPATH_W) '$(srcdir)/job-change-filesystem-label.c'; fi`
 
 udisks_helper_create_partition-job-create-partition.o: job-create-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_create_partition-job-create-partition.o -MD -MP -MF $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Tpo -c -o udisks_helper_create_partition-job-create-partition.o `test -f 'job-create-partition.c' || echo '$(srcdir)/'`job-create-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Tpo $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-create-partition.c' object='udisks_helper_create_partition-job-create-partition.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-create-partition.c' object='udisks_helper_create_partition-job-create-partition.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition-job-create-partition.o `test -f 'job-create-partition.c' || echo '$(srcdir)/'`job-create-partition.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition-job-create-partition.o `test -f 'job-create-partition.c' || echo '$(srcdir)/'`job-create-partition.c
 
 udisks_helper_create_partition-job-create-partition.obj: job-create-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_create_partition-job-create-partition.obj -MD -MP -MF $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Tpo -c -o udisks_helper_create_partition-job-create-partition.obj `if test -f 'job-create-partition.c'; then $(CYGPATH_W) 'job-create-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Tpo $(DEPDIR)/udisks_helper_create_partition-job-create-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-create-partition.c' object='udisks_helper_create_partition-job-create-partition.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-create-partition.c' object='udisks_helper_create_partition-job-create-partition.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition-job-create-partition.obj `if test -f 'job-create-partition.c'; then $(CYGPATH_W) 'job-create-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition-job-create-partition.obj `if test -f 'job-create-partition.c'; then $(CYGPATH_W) 'job-create-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition.c'; fi`
 
 udisks_helper_create_partition_table-job-create-partition-table.o: job-create-partition-table.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_create_partition_table-job-create-partition-table.o -MD -MP -MF $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Tpo -c -o udisks_helper_create_partition_table-job-create-partition-table.o `test -f 'job-create-partition-table.c' || echo '$(srcdir)/'`job-create-partition-table.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Tpo $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-create-partition-table.c' object='udisks_helper_create_partition_table-job-create-partition-table.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-create-partition-table.c' object='udisks_helper_create_partition_table-job-create-partition-table.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition_table-job-create-partition-table.o `test -f 'job-create-partition-table.c' || echo '$(srcdir)/'`job-create-partition-table.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition_table-job-create-partition-table.o `test -f 'job-create-partition-table.c' || echo '$(srcdir)/'`job-create-partition-table.c
 
 udisks_helper_create_partition_table-job-create-partition-table.obj: job-create-partition-table.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_create_partition_table-job-create-partition-table.obj -MD -MP -MF $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Tpo -c -o udisks_helper_create_partition_table-job-create-partition-table.obj `if test -f 'job-create-partition-table.c'; then $(CYGPATH_W) 'job-create-partition-table.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition-table.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Tpo $(DEPDIR)/udisks_helper_create_partition_table-job-create-partition-table.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-create-partition-table.c' object='udisks_helper_create_partition_table-job-create-partition-table.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-create-partition-table.c' object='udisks_helper_create_partition_table-job-create-partition-table.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition_table-job-create-partition-table.obj `if test -f 'job-create-partition-table.c'; then $(CYGPATH_W) 'job-create-partition-table.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition-table.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_create_partition_table_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_create_partition_table-job-create-partition-table.obj `if test -f 'job-create-partition-table.c'; then $(CYGPATH_W) 'job-create-partition-table.c'; else $(CYGPATH_W) '$(srcdir)/job-create-partition-table.c'; fi`
 
 udisks_helper_delete_partition-job-delete-partition.o: job-delete-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_delete_partition-job-delete-partition.o -MD -MP -MF $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Tpo -c -o udisks_helper_delete_partition-job-delete-partition.o `test -f 'job-delete-partition.c' || echo '$(srcdir)/'`job-delete-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Tpo $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-delete-partition.c' object='udisks_helper_delete_partition-job-delete-partition.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-delete-partition.c' object='udisks_helper_delete_partition-job-delete-partition.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_delete_partition-job-delete-partition.o `test -f 'job-delete-partition.c' || echo '$(srcdir)/'`job-delete-partition.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_delete_partition-job-delete-partition.o `test -f 'job-delete-partition.c' || echo '$(srcdir)/'`job-delete-partition.c
 
 udisks_helper_delete_partition-job-delete-partition.obj: job-delete-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_delete_partition-job-delete-partition.obj -MD -MP -MF $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Tpo -c -o udisks_helper_delete_partition-job-delete-partition.obj `if test -f 'job-delete-partition.c'; then $(CYGPATH_W) 'job-delete-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-delete-partition.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Tpo $(DEPDIR)/udisks_helper_delete_partition-job-delete-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-delete-partition.c' object='udisks_helper_delete_partition-job-delete-partition.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-delete-partition.c' object='udisks_helper_delete_partition-job-delete-partition.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_delete_partition-job-delete-partition.obj `if test -f 'job-delete-partition.c'; then $(CYGPATH_W) 'job-delete-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-delete-partition.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_delete_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_delete_partition-job-delete-partition.obj `if test -f 'job-delete-partition.c'; then $(CYGPATH_W) 'job-delete-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-delete-partition.c'; fi`
 
 udisks_helper_drive_benchmark-job-drive-benchmark.o: job-drive-benchmark.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_benchmark-job-drive-benchmark.o -MD -MP -MF $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Tpo -c -o udisks_helper_drive_benchmark-job-drive-benchmark.o `test -f 'job-drive-benchmark.c' || echo '$(srcdir)/'`job-drive-benchmark.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Tpo $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-benchmark.c' object='udisks_helper_drive_benchmark-job-drive-benchmark.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-benchmark.c' object='udisks_helper_drive_benchmark-job-drive-benchmark.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_benchmark-job-drive-benchmark.o `test -f 'job-drive-benchmark.c' || echo '$(srcdir)/'`job-drive-benchmark.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_benchmark-job-drive-benchmark.o `test -f 'job-drive-benchmark.c' || echo '$(srcdir)/'`job-drive-benchmark.c
 
 udisks_helper_drive_benchmark-job-drive-benchmark.obj: job-drive-benchmark.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_benchmark-job-drive-benchmark.obj -MD -MP -MF $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Tpo -c -o udisks_helper_drive_benchmark-job-drive-benchmark.obj `if test -f 'job-drive-benchmark.c'; then $(CYGPATH_W) 'job-drive-benchmark.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-benchmark.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Tpo $(DEPDIR)/udisks_helper_drive_benchmark-job-drive-benchmark.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-benchmark.c' object='udisks_helper_drive_benchmark-job-drive-benchmark.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-benchmark.c' object='udisks_helper_drive_benchmark-job-drive-benchmark.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_benchmark-job-drive-benchmark.obj `if test -f 'job-drive-benchmark.c'; then $(CYGPATH_W) 'job-drive-benchmark.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-benchmark.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_benchmark-job-drive-benchmark.obj `if test -f 'job-drive-benchmark.c'; then $(CYGPATH_W) 'job-drive-benchmark.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-benchmark.c'; fi`
 
 udisks_helper_drive_detach-job-drive-detach.o: job-drive-detach.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_detach-job-drive-detach.o -MD -MP -MF $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Tpo -c -o udisks_helper_drive_detach-job-drive-detach.o `test -f 'job-drive-detach.c' || echo '$(srcdir)/'`job-drive-detach.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Tpo $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-detach.c' object='udisks_helper_drive_detach-job-drive-detach.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-detach.c' object='udisks_helper_drive_detach-job-drive-detach.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_detach-job-drive-detach.o `test -f 'job-drive-detach.c' || echo '$(srcdir)/'`job-drive-detach.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_detach-job-drive-detach.o `test -f 'job-drive-detach.c' || echo '$(srcdir)/'`job-drive-detach.c
 
 udisks_helper_drive_detach-job-drive-detach.obj: job-drive-detach.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_detach-job-drive-detach.obj -MD -MP -MF $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Tpo -c -o udisks_helper_drive_detach-job-drive-detach.obj `if test -f 'job-drive-detach.c'; then $(CYGPATH_W) 'job-drive-detach.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-detach.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Tpo $(DEPDIR)/udisks_helper_drive_detach-job-drive-detach.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-detach.c' object='udisks_helper_drive_detach-job-drive-detach.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-detach.c' object='udisks_helper_drive_detach-job-drive-detach.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_detach-job-drive-detach.obj `if test -f 'job-drive-detach.c'; then $(CYGPATH_W) 'job-drive-detach.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-detach.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_detach_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_detach-job-drive-detach.obj `if test -f 'job-drive-detach.c'; then $(CYGPATH_W) 'job-drive-detach.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-detach.c'; fi`
 
 udisks_helper_drive_poll-job-drive-poll.o: job-drive-poll.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_poll-job-drive-poll.o -MD -MP -MF $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Tpo -c -o udisks_helper_drive_poll-job-drive-poll.o `test -f 'job-drive-poll.c' || echo '$(srcdir)/'`job-drive-poll.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Tpo $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-poll.c' object='udisks_helper_drive_poll-job-drive-poll.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-poll.c' object='udisks_helper_drive_poll-job-drive-poll.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_poll-job-drive-poll.o `test -f 'job-drive-poll.c' || echo '$(srcdir)/'`job-drive-poll.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_poll-job-drive-poll.o `test -f 'job-drive-poll.c' || echo '$(srcdir)/'`job-drive-poll.c
 
 udisks_helper_drive_poll-job-drive-poll.obj: job-drive-poll.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_drive_poll-job-drive-poll.obj -MD -MP -MF $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Tpo -c -o udisks_helper_drive_poll-job-drive-poll.obj `if test -f 'job-drive-poll.c'; then $(CYGPATH_W) 'job-drive-poll.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-poll.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Tpo $(DEPDIR)/udisks_helper_drive_poll-job-drive-poll.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-drive-poll.c' object='udisks_helper_drive_poll-job-drive-poll.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-drive-poll.c' object='udisks_helper_drive_poll-job-drive-poll.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_poll-job-drive-poll.obj `if test -f 'job-drive-poll.c'; then $(CYGPATH_W) 'job-drive-poll.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-poll.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_drive_poll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_drive_poll-job-drive-poll.obj `if test -f 'job-drive-poll.c'; then $(CYGPATH_W) 'job-drive-poll.c'; else $(CYGPATH_W) '$(srcdir)/job-drive-poll.c'; fi`
 
 udisks_helper_fstab_mounter-job-fstab-mounter.o: job-fstab-mounter.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_fstab_mounter-job-fstab-mounter.o -MD -MP -MF $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Tpo -c -o udisks_helper_fstab_mounter-job-fstab-mounter.o `test -f 'job-fstab-mounter.c' || echo '$(srcdir)/'`job-fstab-mounter.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Tpo $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-fstab-mounter.c' object='udisks_helper_fstab_mounter-job-fstab-mounter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-fstab-mounter.c' object='udisks_helper_fstab_mounter-job-fstab-mounter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_fstab_mounter-job-fstab-mounter.o `test -f 'job-fstab-mounter.c' || echo '$(srcdir)/'`job-fstab-mounter.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_fstab_mounter-job-fstab-mounter.o `test -f 'job-fstab-mounter.c' || echo '$(srcdir)/'`job-fstab-mounter.c
 
 udisks_helper_fstab_mounter-job-fstab-mounter.obj: job-fstab-mounter.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_fstab_mounter-job-fstab-mounter.obj -MD -MP -MF $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Tpo -c -o udisks_helper_fstab_mounter-job-fstab-mounter.obj `if test -f 'job-fstab-mounter.c'; then $(CYGPATH_W) 'job-fstab-mounter.c'; else $(CYGPATH_W) '$(srcdir)/job-fstab-mounter.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Tpo $(DEPDIR)/udisks_helper_fstab_mounter-job-fstab-mounter.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-fstab-mounter.c' object='udisks_helper_fstab_mounter-job-fstab-mounter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-fstab-mounter.c' object='udisks_helper_fstab_mounter-job-fstab-mounter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_fstab_mounter-job-fstab-mounter.obj `if test -f 'job-fstab-mounter.c'; then $(CYGPATH_W) 'job-fstab-mounter.c'; else $(CYGPATH_W) '$(srcdir)/job-fstab-mounter.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_fstab_mounter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_fstab_mounter-job-fstab-mounter.obj `if test -f 'job-fstab-mounter.c'; then $(CYGPATH_W) 'job-fstab-mounter.c'; else $(CYGPATH_W) '$(srcdir)/job-fstab-mounter.c'; fi`
 
 udisks_helper_linux_md_check-job-linux-md-check.o: job-linux-md-check.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_linux_md_check-job-linux-md-check.o -MD -MP -MF $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Tpo -c -o udisks_helper_linux_md_check-job-linux-md-check.o `test -f 'job-linux-md-check.c' || echo '$(srcdir)/'`job-linux-md-check.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Tpo $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-linux-md-check.c' object='udisks_helper_linux_md_check-job-linux-md-check.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-linux-md-check.c' object='udisks_helper_linux_md_check-job-linux-md-check.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_check-job-linux-md-check.o `test -f 'job-linux-md-check.c' || echo '$(srcdir)/'`job-linux-md-check.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_check-job-linux-md-check.o `test -f 'job-linux-md-check.c' || echo '$(srcdir)/'`job-linux-md-check.c
 
 udisks_helper_linux_md_check-job-linux-md-check.obj: job-linux-md-check.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_linux_md_check-job-linux-md-check.obj -MD -MP -MF $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Tpo -c -o udisks_helper_linux_md_check-job-linux-md-check.obj `if test -f 'job-linux-md-check.c'; then $(CYGPATH_W) 'job-linux-md-check.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-check.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Tpo $(DEPDIR)/udisks_helper_linux_md_check-job-linux-md-check.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-linux-md-check.c' object='udisks_helper_linux_md_check-job-linux-md-check.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-linux-md-check.c' object='udisks_helper_linux_md_check-job-linux-md-check.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_check-job-linux-md-check.obj `if test -f 'job-linux-md-check.c'; then $(CYGPATH_W) 'job-linux-md-check.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-check.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_check_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_check-job-linux-md-check.obj `if test -f 'job-linux-md-check.c'; then $(CYGPATH_W) 'job-linux-md-check.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-check.c'; fi`
 
 udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o: job-linux-md-remove-component.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o -MD -MP -MF $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Tpo -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o `test -f 'job-linux-md-remove-component.c' || echo '$(srcdir)/'`job-linux-md-remove-component.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Tpo $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-linux-md-remove-component.c' object='udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-linux-md-remove-component.c' object='udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o `test -f 'job-linux-md-remove-component.c' || echo '$(srcdir)/'`job-linux-md-remove-component.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.o `test -f 'job-linux-md-remove-component.c' || echo '$(srcdir)/'`job-linux-md-remove-component.c
 
 udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj: job-linux-md-remove-component.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj -MD -MP -MF $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Tpo -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj `if test -f 'job-linux-md-remove-component.c'; then $(CYGPATH_W) 'job-linux-md-remove-component.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-remove-component.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Tpo $(DEPDIR)/udisks_helper_linux_md_remove_component-job-linux-md-remove-component.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-linux-md-remove-component.c' object='udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-linux-md-remove-component.c' object='udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj `if test -f 'job-linux-md-remove-component.c'; then $(CYGPATH_W) 'job-linux-md-remove-component.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-remove-component.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_linux_md_remove_component_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_linux_md_remove_component-job-linux-md-remove-component.obj `if test -f 'job-linux-md-remove-component.c'; then $(CYGPATH_W) 'job-linux-md-remove-component.c'; else $(CYGPATH_W) '$(srcdir)/job-linux-md-remove-component.c'; fi`
 
 udisks_helper_mkfs-job-mkfs.o: job-mkfs.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_mkfs-job-mkfs.o -MD -MP -MF $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Tpo -c -o udisks_helper_mkfs-job-mkfs.o `test -f 'job-mkfs.c' || echo '$(srcdir)/'`job-mkfs.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Tpo $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-mkfs.c' object='udisks_helper_mkfs-job-mkfs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-mkfs.c' object='udisks_helper_mkfs-job-mkfs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_mkfs-job-mkfs.o `test -f 'job-mkfs.c' || echo '$(srcdir)/'`job-mkfs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_mkfs-job-mkfs.o `test -f 'job-mkfs.c' || echo '$(srcdir)/'`job-mkfs.c
 
 udisks_helper_mkfs-job-mkfs.obj: job-mkfs.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_mkfs-job-mkfs.obj -MD -MP -MF $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Tpo -c -o udisks_helper_mkfs-job-mkfs.obj `if test -f 'job-mkfs.c'; then $(CYGPATH_W) 'job-mkfs.c'; else $(CYGPATH_W) '$(srcdir)/job-mkfs.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Tpo $(DEPDIR)/udisks_helper_mkfs-job-mkfs.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-mkfs.c' object='udisks_helper_mkfs-job-mkfs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-mkfs.c' object='udisks_helper_mkfs-job-mkfs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_mkfs-job-mkfs.obj `if test -f 'job-mkfs.c'; then $(CYGPATH_W) 'job-mkfs.c'; else $(CYGPATH_W) '$(srcdir)/job-mkfs.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_mkfs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_mkfs-job-mkfs.obj `if test -f 'job-mkfs.c'; then $(CYGPATH_W) 'job-mkfs.c'; else $(CYGPATH_W) '$(srcdir)/job-mkfs.c'; fi`
 
 udisks_helper_modify_partition-job-modify-partition.o: job-modify-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_modify_partition-job-modify-partition.o -MD -MP -MF $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Tpo -c -o udisks_helper_modify_partition-job-modify-partition.o `test -f 'job-modify-partition.c' || echo '$(srcdir)/'`job-modify-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Tpo $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-modify-partition.c' object='udisks_helper_modify_partition-job-modify-partition.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-modify-partition.c' object='udisks_helper_modify_partition-job-modify-partition.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_modify_partition-job-modify-partition.o `test -f 'job-modify-partition.c' || echo '$(srcdir)/'`job-modify-partition.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_modify_partition-job-modify-partition.o `test -f 'job-modify-partition.c' || echo '$(srcdir)/'`job-modify-partition.c
 
 udisks_helper_modify_partition-job-modify-partition.obj: job-modify-partition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_helper_modify_partition-job-modify-partition.obj -MD -MP -MF $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Tpo -c -o udisks_helper_modify_partition-job-modify-partition.obj `if test -f 'job-modify-partition.c'; then $(CYGPATH_W) 'job-modify-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-modify-partition.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Tpo $(DEPDIR)/udisks_helper_modify_partition-job-modify-partition.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job-modify-partition.c' object='udisks_helper_modify_partition-job-modify-partition.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='job-modify-partition.c' object='udisks_helper_modify_partition-job-modify-partition.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_modify_partition-job-modify-partition.obj `if test -f 'job-modify-partition.c'; then $(CYGPATH_W) 'job-modify-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-modify-partition.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_helper_modify_partition_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_helper_modify_partition-job-modify-partition.obj `if test -f 'job-modify-partition.c'; then $(CYGPATH_W) 'job-modify-partition.c'; else $(CYGPATH_W) '$(srcdir)/job-modify-partition.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -914,26 +997,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -945,15 +1017,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -962,6 +1030,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1013,10 +1096,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1101,21 +1189,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_libexecSCRIPTS install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_libexecSCRIPTS \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
 	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-dist_libexecSCRIPTS \
-	uninstall-libexecPROGRAMS
+	tags tags-am uninstall uninstall-am \
+	uninstall-dist_libexecSCRIPTS uninstall-libexecPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru udisks-1.0.4/src/main.c udisks-1.0.5/src/main.c
--- udisks-1.0.4/src/main.c	2011-08-26 15:29:05.000000000 +0000
+++ udisks-1.0.5/src/main.c	2014-03-10 08:57:48.000000000 +0000
@@ -141,12 +141,13 @@
   static char *helper_dir = NULL;
   char *path;
   int ret;
-  static gboolean replace;
+  static gboolean replace = FALSE;
+  static gboolean no_debug = FALSE;
   static GOptionEntry entries[] =
     {
-      { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL },
-      { "helper-dir", 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING,
-	  &helper_dir, "Directory for helper tools",  NULL },
+      { "no-debug", 'n', 0, G_OPTION_ARG_NONE, &no_debug, "Don't print debug information", NULL },
+      { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL },
+      { "helper-dir", 0, 0, G_OPTION_ARG_FILENAME, &helper_dir, "Directory for helper tools",  NULL },
       { NULL } };
 
   PROFILE ("main(): start");
@@ -181,6 +182,25 @@
   g_option_context_parse (context, &argc, &argv, NULL);
   g_option_context_free (context);
 
+  /* If --no-debug is requested don't clutter stdout/stderr etc.
+   */
+  if (no_debug)
+    {
+      gint dev_null_fd;
+      dev_null_fd = open ("/dev/null", O_RDWR);
+      if (dev_null_fd >= 0)
+        {
+          dup2 (dev_null_fd, STDIN_FILENO);
+          dup2 (dev_null_fd, STDOUT_FILENO);
+          dup2 (dev_null_fd, STDERR_FILENO);
+          close (dev_null_fd);
+        }
+      else
+        {
+          g_warning ("Error opening /dev/null: %m");
+        }
+    }
+
   /* run with a controlled path */
   if (helper_dir != NULL)
       path = g_strdup_printf ("%s:" PACKAGE_LIBEXEC_DIR ":/sbin:/bin:/usr/sbin:/usr/bin", helper_dir);
diff -Nru udisks-1.0.4/src/Makefile.in udisks-1.0.5/src/Makefile.in
--- udisks-1.0.4/src/Makefile.in	2011-08-26 15:27:59.000000000 +0000
+++ udisks-1.0.5/src/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,7 +80,8 @@
 host_triplet = @host@
 libexec_PROGRAMS = udisks-daemon$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -69,12 +114,25 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 udisks_daemon_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(udisks_daemon_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -85,36 +143,58 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(udisks_daemon_SOURCES)
 DIST_SOURCES = $(udisks_daemon_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -188,6 +268,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -204,6 +287,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -295,6 +382,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -312,6 +401,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -426,14 +516,19 @@
 $(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -454,7 +549,8 @@
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -467,7 +563,8 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-udisks-daemon$(EXEEXT): $(udisks_daemon_OBJECTS) $(udisks_daemon_DEPENDENCIES) 
+
+udisks-daemon$(EXEEXT): $(udisks_daemon_OBJECTS) $(udisks_daemon_DEPENDENCIES) $(EXTRA_udisks_daemon_DEPENDENCIES) 
 	@rm -f udisks-daemon$(EXEEXT)
 	$(AM_V_CCLD)$(udisks_daemon_LINK) $(udisks_daemon_OBJECTS) $(udisks_daemon_LDADD) $(LIBS)
 
@@ -497,282 +594,247 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 udisks_daemon-daemon.o: daemon.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-daemon.o -MD -MP -MF $(DEPDIR)/udisks_daemon-daemon.Tpo -c -o udisks_daemon-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-daemon.Tpo $(DEPDIR)/udisks_daemon-daemon.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='daemon.c' object='udisks_daemon-daemon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='daemon.c' object='udisks_daemon-daemon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c
 
 udisks_daemon-daemon.obj: daemon.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-daemon.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-daemon.Tpo -c -o udisks_daemon-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-daemon.Tpo $(DEPDIR)/udisks_daemon-daemon.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='daemon.c' object='udisks_daemon-daemon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='daemon.c' object='udisks_daemon-daemon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi`
 
 udisks_daemon-device.o: device.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-device.o -MD -MP -MF $(DEPDIR)/udisks_daemon-device.Tpo -c -o udisks_daemon-device.o `test -f 'device.c' || echo '$(srcdir)/'`device.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-device.Tpo $(DEPDIR)/udisks_daemon-device.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device.c' object='udisks_daemon-device.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device.c' object='udisks_daemon-device.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device.o `test -f 'device.c' || echo '$(srcdir)/'`device.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device.o `test -f 'device.c' || echo '$(srcdir)/'`device.c
 
 udisks_daemon-device.obj: device.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-device.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-device.Tpo -c -o udisks_daemon-device.obj `if test -f 'device.c'; then $(CYGPATH_W) 'device.c'; else $(CYGPATH_W) '$(srcdir)/device.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-device.Tpo $(DEPDIR)/udisks_daemon-device.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device.c' object='udisks_daemon-device.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device.c' object='udisks_daemon-device.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device.obj `if test -f 'device.c'; then $(CYGPATH_W) 'device.c'; else $(CYGPATH_W) '$(srcdir)/device.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device.obj `if test -f 'device.c'; then $(CYGPATH_W) 'device.c'; else $(CYGPATH_W) '$(srcdir)/device.c'; fi`
 
 udisks_daemon-device-private.o: device-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-device-private.o -MD -MP -MF $(DEPDIR)/udisks_daemon-device-private.Tpo -c -o udisks_daemon-device-private.o `test -f 'device-private.c' || echo '$(srcdir)/'`device-private.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-device-private.Tpo $(DEPDIR)/udisks_daemon-device-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device-private.c' object='udisks_daemon-device-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device-private.c' object='udisks_daemon-device-private.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device-private.o `test -f 'device-private.c' || echo '$(srcdir)/'`device-private.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device-private.o `test -f 'device-private.c' || echo '$(srcdir)/'`device-private.c
 
 udisks_daemon-device-private.obj: device-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-device-private.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-device-private.Tpo -c -o udisks_daemon-device-private.obj `if test -f 'device-private.c'; then $(CYGPATH_W) 'device-private.c'; else $(CYGPATH_W) '$(srcdir)/device-private.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-device-private.Tpo $(DEPDIR)/udisks_daemon-device-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device-private.c' object='udisks_daemon-device-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device-private.c' object='udisks_daemon-device-private.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device-private.obj `if test -f 'device-private.c'; then $(CYGPATH_W) 'device-private.c'; else $(CYGPATH_W) '$(srcdir)/device-private.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-device-private.obj `if test -f 'device-private.c'; then $(CYGPATH_W) 'device-private.c'; else $(CYGPATH_W) '$(srcdir)/device-private.c'; fi`
 
 udisks_daemon-adapter.o: adapter.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-adapter.o -MD -MP -MF $(DEPDIR)/udisks_daemon-adapter.Tpo -c -o udisks_daemon-adapter.o `test -f 'adapter.c' || echo '$(srcdir)/'`adapter.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-adapter.Tpo $(DEPDIR)/udisks_daemon-adapter.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adapter.c' object='udisks_daemon-adapter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adapter.c' object='udisks_daemon-adapter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter.o `test -f 'adapter.c' || echo '$(srcdir)/'`adapter.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter.o `test -f 'adapter.c' || echo '$(srcdir)/'`adapter.c
 
 udisks_daemon-adapter.obj: adapter.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-adapter.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-adapter.Tpo -c -o udisks_daemon-adapter.obj `if test -f 'adapter.c'; then $(CYGPATH_W) 'adapter.c'; else $(CYGPATH_W) '$(srcdir)/adapter.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-adapter.Tpo $(DEPDIR)/udisks_daemon-adapter.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adapter.c' object='udisks_daemon-adapter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adapter.c' object='udisks_daemon-adapter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter.obj `if test -f 'adapter.c'; then $(CYGPATH_W) 'adapter.c'; else $(CYGPATH_W) '$(srcdir)/adapter.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter.obj `if test -f 'adapter.c'; then $(CYGPATH_W) 'adapter.c'; else $(CYGPATH_W) '$(srcdir)/adapter.c'; fi`
 
 udisks_daemon-adapter-private.o: adapter-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-adapter-private.o -MD -MP -MF $(DEPDIR)/udisks_daemon-adapter-private.Tpo -c -o udisks_daemon-adapter-private.o `test -f 'adapter-private.c' || echo '$(srcdir)/'`adapter-private.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-adapter-private.Tpo $(DEPDIR)/udisks_daemon-adapter-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adapter-private.c' object='udisks_daemon-adapter-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adapter-private.c' object='udisks_daemon-adapter-private.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter-private.o `test -f 'adapter-private.c' || echo '$(srcdir)/'`adapter-private.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter-private.o `test -f 'adapter-private.c' || echo '$(srcdir)/'`adapter-private.c
 
 udisks_daemon-adapter-private.obj: adapter-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-adapter-private.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-adapter-private.Tpo -c -o udisks_daemon-adapter-private.obj `if test -f 'adapter-private.c'; then $(CYGPATH_W) 'adapter-private.c'; else $(CYGPATH_W) '$(srcdir)/adapter-private.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-adapter-private.Tpo $(DEPDIR)/udisks_daemon-adapter-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adapter-private.c' object='udisks_daemon-adapter-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adapter-private.c' object='udisks_daemon-adapter-private.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter-private.obj `if test -f 'adapter-private.c'; then $(CYGPATH_W) 'adapter-private.c'; else $(CYGPATH_W) '$(srcdir)/adapter-private.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-adapter-private.obj `if test -f 'adapter-private.c'; then $(CYGPATH_W) 'adapter-private.c'; else $(CYGPATH_W) '$(srcdir)/adapter-private.c'; fi`
 
 udisks_daemon-expander.o: expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-expander.o -MD -MP -MF $(DEPDIR)/udisks_daemon-expander.Tpo -c -o udisks_daemon-expander.o `test -f 'expander.c' || echo '$(srcdir)/'`expander.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-expander.Tpo $(DEPDIR)/udisks_daemon-expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='expander.c' object='udisks_daemon-expander.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='expander.c' object='udisks_daemon-expander.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander.o `test -f 'expander.c' || echo '$(srcdir)/'`expander.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander.o `test -f 'expander.c' || echo '$(srcdir)/'`expander.c
 
 udisks_daemon-expander.obj: expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-expander.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-expander.Tpo -c -o udisks_daemon-expander.obj `if test -f 'expander.c'; then $(CYGPATH_W) 'expander.c'; else $(CYGPATH_W) '$(srcdir)/expander.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-expander.Tpo $(DEPDIR)/udisks_daemon-expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='expander.c' object='udisks_daemon-expander.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='expander.c' object='udisks_daemon-expander.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander.obj `if test -f 'expander.c'; then $(CYGPATH_W) 'expander.c'; else $(CYGPATH_W) '$(srcdir)/expander.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander.obj `if test -f 'expander.c'; then $(CYGPATH_W) 'expander.c'; else $(CYGPATH_W) '$(srcdir)/expander.c'; fi`
 
 udisks_daemon-expander-private.o: expander-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-expander-private.o -MD -MP -MF $(DEPDIR)/udisks_daemon-expander-private.Tpo -c -o udisks_daemon-expander-private.o `test -f 'expander-private.c' || echo '$(srcdir)/'`expander-private.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-expander-private.Tpo $(DEPDIR)/udisks_daemon-expander-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='expander-private.c' object='udisks_daemon-expander-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='expander-private.c' object='udisks_daemon-expander-private.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander-private.o `test -f 'expander-private.c' || echo '$(srcdir)/'`expander-private.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander-private.o `test -f 'expander-private.c' || echo '$(srcdir)/'`expander-private.c
 
 udisks_daemon-expander-private.obj: expander-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-expander-private.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-expander-private.Tpo -c -o udisks_daemon-expander-private.obj `if test -f 'expander-private.c'; then $(CYGPATH_W) 'expander-private.c'; else $(CYGPATH_W) '$(srcdir)/expander-private.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-expander-private.Tpo $(DEPDIR)/udisks_daemon-expander-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='expander-private.c' object='udisks_daemon-expander-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='expander-private.c' object='udisks_daemon-expander-private.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander-private.obj `if test -f 'expander-private.c'; then $(CYGPATH_W) 'expander-private.c'; else $(CYGPATH_W) '$(srcdir)/expander-private.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-expander-private.obj `if test -f 'expander-private.c'; then $(CYGPATH_W) 'expander-private.c'; else $(CYGPATH_W) '$(srcdir)/expander-private.c'; fi`
 
 udisks_daemon-port.o: port.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-port.o -MD -MP -MF $(DEPDIR)/udisks_daemon-port.Tpo -c -o udisks_daemon-port.o `test -f 'port.c' || echo '$(srcdir)/'`port.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-port.Tpo $(DEPDIR)/udisks_daemon-port.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='port.c' object='udisks_daemon-port.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='port.c' object='udisks_daemon-port.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port.o `test -f 'port.c' || echo '$(srcdir)/'`port.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port.o `test -f 'port.c' || echo '$(srcdir)/'`port.c
 
 udisks_daemon-port.obj: port.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-port.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-port.Tpo -c -o udisks_daemon-port.obj `if test -f 'port.c'; then $(CYGPATH_W) 'port.c'; else $(CYGPATH_W) '$(srcdir)/port.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-port.Tpo $(DEPDIR)/udisks_daemon-port.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='port.c' object='udisks_daemon-port.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='port.c' object='udisks_daemon-port.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port.obj `if test -f 'port.c'; then $(CYGPATH_W) 'port.c'; else $(CYGPATH_W) '$(srcdir)/port.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port.obj `if test -f 'port.c'; then $(CYGPATH_W) 'port.c'; else $(CYGPATH_W) '$(srcdir)/port.c'; fi`
 
 udisks_daemon-port-private.o: port-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-port-private.o -MD -MP -MF $(DEPDIR)/udisks_daemon-port-private.Tpo -c -o udisks_daemon-port-private.o `test -f 'port-private.c' || echo '$(srcdir)/'`port-private.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-port-private.Tpo $(DEPDIR)/udisks_daemon-port-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='port-private.c' object='udisks_daemon-port-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='port-private.c' object='udisks_daemon-port-private.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port-private.o `test -f 'port-private.c' || echo '$(srcdir)/'`port-private.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port-private.o `test -f 'port-private.c' || echo '$(srcdir)/'`port-private.c
 
 udisks_daemon-port-private.obj: port-private.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-port-private.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-port-private.Tpo -c -o udisks_daemon-port-private.obj `if test -f 'port-private.c'; then $(CYGPATH_W) 'port-private.c'; else $(CYGPATH_W) '$(srcdir)/port-private.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-port-private.Tpo $(DEPDIR)/udisks_daemon-port-private.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='port-private.c' object='udisks_daemon-port-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='port-private.c' object='udisks_daemon-port-private.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port-private.obj `if test -f 'port-private.c'; then $(CYGPATH_W) 'port-private.c'; else $(CYGPATH_W) '$(srcdir)/port-private.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-port-private.obj `if test -f 'port-private.c'; then $(CYGPATH_W) 'port-private.c'; else $(CYGPATH_W) '$(srcdir)/port-private.c'; fi`
 
 udisks_daemon-mount-file.o: mount-file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount-file.o -MD -MP -MF $(DEPDIR)/udisks_daemon-mount-file.Tpo -c -o udisks_daemon-mount-file.o `test -f 'mount-file.c' || echo '$(srcdir)/'`mount-file.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount-file.Tpo $(DEPDIR)/udisks_daemon-mount-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount-file.c' object='udisks_daemon-mount-file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount-file.c' object='udisks_daemon-mount-file.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-file.o `test -f 'mount-file.c' || echo '$(srcdir)/'`mount-file.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-file.o `test -f 'mount-file.c' || echo '$(srcdir)/'`mount-file.c
 
 udisks_daemon-mount-file.obj: mount-file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount-file.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-mount-file.Tpo -c -o udisks_daemon-mount-file.obj `if test -f 'mount-file.c'; then $(CYGPATH_W) 'mount-file.c'; else $(CYGPATH_W) '$(srcdir)/mount-file.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount-file.Tpo $(DEPDIR)/udisks_daemon-mount-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount-file.c' object='udisks_daemon-mount-file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount-file.c' object='udisks_daemon-mount-file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-file.obj `if test -f 'mount-file.c'; then $(CYGPATH_W) 'mount-file.c'; else $(CYGPATH_W) '$(srcdir)/mount-file.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-file.obj `if test -f 'mount-file.c'; then $(CYGPATH_W) 'mount-file.c'; else $(CYGPATH_W) '$(srcdir)/mount-file.c'; fi`
 
 udisks_daemon-mount.o: mount.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount.o -MD -MP -MF $(DEPDIR)/udisks_daemon-mount.Tpo -c -o udisks_daemon-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount.Tpo $(DEPDIR)/udisks_daemon-mount.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='udisks_daemon-mount.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount.c' object='udisks_daemon-mount.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
 
 udisks_daemon-mount.obj: mount.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-mount.Tpo -c -o udisks_daemon-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount.Tpo $(DEPDIR)/udisks_daemon-mount.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='udisks_daemon-mount.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount.c' object='udisks_daemon-mount.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
 
 udisks_daemon-mount-monitor.o: mount-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount-monitor.o -MD -MP -MF $(DEPDIR)/udisks_daemon-mount-monitor.Tpo -c -o udisks_daemon-mount-monitor.o `test -f 'mount-monitor.c' || echo '$(srcdir)/'`mount-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount-monitor.Tpo $(DEPDIR)/udisks_daemon-mount-monitor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount-monitor.c' object='udisks_daemon-mount-monitor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount-monitor.c' object='udisks_daemon-mount-monitor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-monitor.o `test -f 'mount-monitor.c' || echo '$(srcdir)/'`mount-monitor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-monitor.o `test -f 'mount-monitor.c' || echo '$(srcdir)/'`mount-monitor.c
 
 udisks_daemon-mount-monitor.obj: mount-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-mount-monitor.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-mount-monitor.Tpo -c -o udisks_daemon-mount-monitor.obj `if test -f 'mount-monitor.c'; then $(CYGPATH_W) 'mount-monitor.c'; else $(CYGPATH_W) '$(srcdir)/mount-monitor.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-mount-monitor.Tpo $(DEPDIR)/udisks_daemon-mount-monitor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount-monitor.c' object='udisks_daemon-mount-monitor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount-monitor.c' object='udisks_daemon-mount-monitor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-monitor.obj `if test -f 'mount-monitor.c'; then $(CYGPATH_W) 'mount-monitor.c'; else $(CYGPATH_W) '$(srcdir)/mount-monitor.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-mount-monitor.obj `if test -f 'mount-monitor.c'; then $(CYGPATH_W) 'mount-monitor.c'; else $(CYGPATH_W) '$(srcdir)/mount-monitor.c'; fi`
 
 udisks_daemon-inhibitor.o: inhibitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-inhibitor.o -MD -MP -MF $(DEPDIR)/udisks_daemon-inhibitor.Tpo -c -o udisks_daemon-inhibitor.o `test -f 'inhibitor.c' || echo '$(srcdir)/'`inhibitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-inhibitor.Tpo $(DEPDIR)/udisks_daemon-inhibitor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inhibitor.c' object='udisks_daemon-inhibitor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='inhibitor.c' object='udisks_daemon-inhibitor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-inhibitor.o `test -f 'inhibitor.c' || echo '$(srcdir)/'`inhibitor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-inhibitor.o `test -f 'inhibitor.c' || echo '$(srcdir)/'`inhibitor.c
 
 udisks_daemon-inhibitor.obj: inhibitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-inhibitor.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-inhibitor.Tpo -c -o udisks_daemon-inhibitor.obj `if test -f 'inhibitor.c'; then $(CYGPATH_W) 'inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/inhibitor.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-inhibitor.Tpo $(DEPDIR)/udisks_daemon-inhibitor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inhibitor.c' object='udisks_daemon-inhibitor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='inhibitor.c' object='udisks_daemon-inhibitor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-inhibitor.obj `if test -f 'inhibitor.c'; then $(CYGPATH_W) 'inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/inhibitor.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-inhibitor.obj `if test -f 'inhibitor.c'; then $(CYGPATH_W) 'inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/inhibitor.c'; fi`
 
 udisks_daemon-poller.o: poller.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-poller.o -MD -MP -MF $(DEPDIR)/udisks_daemon-poller.Tpo -c -o udisks_daemon-poller.o `test -f 'poller.c' || echo '$(srcdir)/'`poller.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-poller.Tpo $(DEPDIR)/udisks_daemon-poller.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poller.c' object='udisks_daemon-poller.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poller.c' object='udisks_daemon-poller.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-poller.o `test -f 'poller.c' || echo '$(srcdir)/'`poller.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-poller.o `test -f 'poller.c' || echo '$(srcdir)/'`poller.c
 
 udisks_daemon-poller.obj: poller.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-poller.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-poller.Tpo -c -o udisks_daemon-poller.obj `if test -f 'poller.c'; then $(CYGPATH_W) 'poller.c'; else $(CYGPATH_W) '$(srcdir)/poller.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-poller.Tpo $(DEPDIR)/udisks_daemon-poller.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poller.c' object='udisks_daemon-poller.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poller.c' object='udisks_daemon-poller.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-poller.obj `if test -f 'poller.c'; then $(CYGPATH_W) 'poller.c'; else $(CYGPATH_W) '$(srcdir)/poller.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-poller.obj `if test -f 'poller.c'; then $(CYGPATH_W) 'poller.c'; else $(CYGPATH_W) '$(srcdir)/poller.c'; fi`
 
 udisks_daemon-main.o: main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-main.o -MD -MP -MF $(DEPDIR)/udisks_daemon-main.Tpo -c -o udisks_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-main.Tpo $(DEPDIR)/udisks_daemon-main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='udisks_daemon-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='udisks_daemon-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 
 udisks_daemon-main.obj: main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-main.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-main.Tpo -c -o udisks_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-main.Tpo $(DEPDIR)/udisks_daemon-main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='udisks_daemon-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='udisks_daemon-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
 
 udisks_daemon-marshal.o: marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-marshal.o -MD -MP -MF $(DEPDIR)/udisks_daemon-marshal.Tpo -c -o udisks_daemon-marshal.o `test -f 'marshal.c' || echo '$(srcdir)/'`marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-marshal.Tpo $(DEPDIR)/udisks_daemon-marshal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='marshal.c' object='udisks_daemon-marshal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='marshal.c' object='udisks_daemon-marshal.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-marshal.o `test -f 'marshal.c' || echo '$(srcdir)/'`marshal.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-marshal.o `test -f 'marshal.c' || echo '$(srcdir)/'`marshal.c
 
 udisks_daemon-marshal.obj: marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -MT udisks_daemon-marshal.obj -MD -MP -MF $(DEPDIR)/udisks_daemon-marshal.Tpo -c -o udisks_daemon-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_daemon-marshal.Tpo $(DEPDIR)/udisks_daemon-marshal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='marshal.c' object='udisks_daemon-marshal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='marshal.c' object='udisks_daemon-marshal.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_daemon_CPPFLAGS) $(CPPFLAGS) $(udisks_daemon_CFLAGS) $(CFLAGS) -c -o udisks_daemon-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -781,22 +843,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -811,57 +876,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -877,12 +897,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -894,15 +909,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -911,6 +922,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -947,13 +973,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -993,10 +1016,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1081,26 +1109,24 @@
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	ctags-recursive install install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
-	clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libexecPROGRAMS \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-libexecPROGRAMS
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libexecPROGRAMS \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libexecPROGRAMS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libexecPROGRAMS
 
 
 marshal.h: marshal.list
diff -Nru udisks-1.0.4/src/marshal.c udisks-1.0.5/src/marshal.c
--- udisks-1.0.4/src/marshal.c	2011-08-25 21:16:05.000000000 +0000
+++ udisks-1.0.5/src/marshal.c	2014-03-10 09:04:21.000000000 +0000
@@ -5,7 +5,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
diff -Nru udisks-1.0.4/src/mount-monitor.c udisks-1.0.5/src/mount-monitor.c
--- udisks-1.0.4/src/mount-monitor.c	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/src/mount-monitor.c	2014-03-10 08:58:42.000000000 +0000
@@ -39,6 +39,11 @@
 #include "mount.h"
 #include "private.h"
 
+/* build a %Ns format string macro with N == PATH_MAX */
+#define xstr(s) str(s)
+#define str(s) #s
+#define PATH_MAX_FMT "%" xstr(PATH_MAX) "s"
+
 /*--------------------------------------------------------------------------------------------------------------*/
 
 enum
@@ -320,8 +325,8 @@
       guint mount_id;
       guint parent_id;
       guint major, minor;
-      gchar encoded_root[PATH_MAX];
-      gchar encoded_mount_point[PATH_MAX];
+      gchar encoded_root[PATH_MAX + 1];
+      gchar encoded_mount_point[PATH_MAX + 1];
       gchar *mount_point;
       dev_t dev;
 
@@ -329,7 +334,7 @@
         continue;
 
       if (sscanf (lines[n],
-                  "%d %d %d:%d %s %s",
+                  "%d %d %d:%d " PATH_MAX_FMT " " PATH_MAX_FMT,
                   &mount_id,
                   &parent_id,
                   &major,
@@ -340,6 +345,8 @@
           g_warning ("Error parsing line '%s'", lines[n]);
           continue;
         }
+      encoded_root[sizeof encoded_root - 1] = '\0';
+      encoded_mount_point[sizeof encoded_mount_point - 1] = '\0';
 
       /* ignore mounts where only a subtree of a filesystem is mounted */
       if (g_strcmp0 (encoded_root, "/") != 0)
@@ -358,15 +365,17 @@
           sep = strstr (lines[n], " - ");
           if (sep != NULL)
             {
-              gchar fstype[PATH_MAX];
-              gchar mount_source[PATH_MAX];
+              gchar fstype[PATH_MAX + 1];
+              gchar mount_source[PATH_MAX + 1];
               struct stat statbuf;
 
-              if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2)
+              if (sscanf (sep + 3, PATH_MAX_FMT " " PATH_MAX_FMT, fstype, mount_source) != 2)
                 {
                   g_warning ("Error parsing things past - for '%s'", lines[n]);
                   continue;
                 }
+              fstype[sizeof fstype - 1] = '\0';
+              mount_source[sizeof mount_source - 1] = '\0';
 
               if (g_strcmp0 (fstype, "btrfs") != 0)
                 continue;
diff -Nru udisks-1.0.4/src/probers/Makefile.in udisks-1.0.5/src/probers/Makefile.in
--- udisks-1.0.4/src/probers/Makefile.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/src/probers/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -40,7 +84,8 @@
 	$(am__EXEEXT_2)
 @HAVE_LVM2_TRUE@am__append_1 = udisks-lvm-pv-export
 subdir = src/probers
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,9 +104,10 @@
 am__DEPENDENCIES_1 =
 udisks_dm_export_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_udisks_lvm_pv_export_OBJECTS =  \
 	udisks_lvm_pv_export-udisks-lvm-pv-export.$(OBJEXT)
 udisks_lvm_pv_export_OBJECTS = $(am_udisks_lvm_pv_export_OBJECTS)
@@ -81,6 +127,18 @@
 udisks_probe_sas_expander_OBJECTS =  \
 	$(am_udisks_probe_sas_expander_OBJECTS)
 udisks_probe_sas_expander_DEPENDENCIES = $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -91,22 +149,18 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(udisks_dm_export_SOURCES) $(udisks_lvm_pv_export_SOURCES) \
 	$(udisks_part_id_SOURCES) $(udisks_probe_ata_smart_SOURCES) \
 	$(udisks_probe_sas_expander_SOURCES)
@@ -114,6 +168,28 @@
 	$(udisks_lvm_pv_export_SOURCES) $(udisks_part_id_SOURCES) \
 	$(udisks_probe_ata_smart_SOURCES) \
 	$(udisks_probe_sas_expander_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -161,6 +237,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -177,6 +256,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -268,6 +351,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -285,6 +370,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -361,14 +447,19 @@
 $(am__aclocal_m4_deps):
 install-udevhelperPROGRAMS: $(udevhelper_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(udevhelperdir)" || $(MKDIR_P) "$(DESTDIR)$(udevhelperdir)"
 	@list='$(udevhelper_PROGRAMS)'; test -n "$(udevhelperdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(udevhelperdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(udevhelperdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -389,7 +480,8 @@
 	@list='$(udevhelper_PROGRAMS)'; test -n "$(udevhelperdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(udevhelperdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(udevhelperdir)" && rm -f $$files
@@ -402,19 +494,24 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-udisks-dm-export$(EXEEXT): $(udisks_dm_export_OBJECTS) $(udisks_dm_export_DEPENDENCIES) 
+
+udisks-dm-export$(EXEEXT): $(udisks_dm_export_OBJECTS) $(udisks_dm_export_DEPENDENCIES) $(EXTRA_udisks_dm_export_DEPENDENCIES) 
 	@rm -f udisks-dm-export$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_dm_export_OBJECTS) $(udisks_dm_export_LDADD) $(LIBS)
-udisks-lvm-pv-export$(EXEEXT): $(udisks_lvm_pv_export_OBJECTS) $(udisks_lvm_pv_export_DEPENDENCIES) 
+
+udisks-lvm-pv-export$(EXEEXT): $(udisks_lvm_pv_export_OBJECTS) $(udisks_lvm_pv_export_DEPENDENCIES) $(EXTRA_udisks_lvm_pv_export_DEPENDENCIES) 
 	@rm -f udisks-lvm-pv-export$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_lvm_pv_export_OBJECTS) $(udisks_lvm_pv_export_LDADD) $(LIBS)
-udisks-part-id$(EXEEXT): $(udisks_part_id_OBJECTS) $(udisks_part_id_DEPENDENCIES) 
+
+udisks-part-id$(EXEEXT): $(udisks_part_id_OBJECTS) $(udisks_part_id_DEPENDENCIES) $(EXTRA_udisks_part_id_DEPENDENCIES) 
 	@rm -f udisks-part-id$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_part_id_OBJECTS) $(udisks_part_id_LDADD) $(LIBS)
-udisks-probe-ata-smart$(EXEEXT): $(udisks_probe_ata_smart_OBJECTS) $(udisks_probe_ata_smart_DEPENDENCIES) 
+
+udisks-probe-ata-smart$(EXEEXT): $(udisks_probe_ata_smart_OBJECTS) $(udisks_probe_ata_smart_DEPENDENCIES) $(EXTRA_udisks_probe_ata_smart_DEPENDENCIES) 
 	@rm -f udisks-probe-ata-smart$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_probe_ata_smart_OBJECTS) $(udisks_probe_ata_smart_LDADD) $(LIBS)
-udisks-probe-sas-expander$(EXEEXT): $(udisks_probe_sas_expander_OBJECTS) $(udisks_probe_sas_expander_DEPENDENCIES) 
+
+udisks-probe-sas-expander$(EXEEXT): $(udisks_probe_sas_expander_OBJECTS) $(udisks_probe_sas_expander_DEPENDENCIES) $(EXTRA_udisks_probe_sas_expander_DEPENDENCIES) 
 	@rm -f udisks-probe-sas-expander$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_probe_sas_expander_OBJECTS) $(udisks_probe_sas_expander_LDADD) $(LIBS)
 
@@ -433,106 +530,93 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 udisks_dm_export-udisks-dm-export.o: udisks-dm-export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_dm_export-udisks-dm-export.o -MD -MP -MF $(DEPDIR)/udisks_dm_export-udisks-dm-export.Tpo -c -o udisks_dm_export-udisks-dm-export.o `test -f 'udisks-dm-export.c' || echo '$(srcdir)/'`udisks-dm-export.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_dm_export-udisks-dm-export.Tpo $(DEPDIR)/udisks_dm_export-udisks-dm-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-dm-export.c' object='udisks_dm_export-udisks-dm-export.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-dm-export.c' object='udisks_dm_export-udisks-dm-export.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_dm_export-udisks-dm-export.o `test -f 'udisks-dm-export.c' || echo '$(srcdir)/'`udisks-dm-export.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_dm_export-udisks-dm-export.o `test -f 'udisks-dm-export.c' || echo '$(srcdir)/'`udisks-dm-export.c
 
 udisks_dm_export-udisks-dm-export.obj: udisks-dm-export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_dm_export-udisks-dm-export.obj -MD -MP -MF $(DEPDIR)/udisks_dm_export-udisks-dm-export.Tpo -c -o udisks_dm_export-udisks-dm-export.obj `if test -f 'udisks-dm-export.c'; then $(CYGPATH_W) 'udisks-dm-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-dm-export.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_dm_export-udisks-dm-export.Tpo $(DEPDIR)/udisks_dm_export-udisks-dm-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-dm-export.c' object='udisks_dm_export-udisks-dm-export.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-dm-export.c' object='udisks_dm_export-udisks-dm-export.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_dm_export-udisks-dm-export.obj `if test -f 'udisks-dm-export.c'; then $(CYGPATH_W) 'udisks-dm-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-dm-export.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_dm_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_dm_export-udisks-dm-export.obj `if test -f 'udisks-dm-export.c'; then $(CYGPATH_W) 'udisks-dm-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-dm-export.c'; fi`
 
 udisks_lvm_pv_export-udisks-lvm-pv-export.o: udisks-lvm-pv-export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_lvm_pv_export-udisks-lvm-pv-export.o -MD -MP -MF $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Tpo -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.o `test -f 'udisks-lvm-pv-export.c' || echo '$(srcdir)/'`udisks-lvm-pv-export.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Tpo $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-lvm-pv-export.c' object='udisks_lvm_pv_export-udisks-lvm-pv-export.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-lvm-pv-export.c' object='udisks_lvm_pv_export-udisks-lvm-pv-export.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.o `test -f 'udisks-lvm-pv-export.c' || echo '$(srcdir)/'`udisks-lvm-pv-export.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.o `test -f 'udisks-lvm-pv-export.c' || echo '$(srcdir)/'`udisks-lvm-pv-export.c
 
 udisks_lvm_pv_export-udisks-lvm-pv-export.obj: udisks-lvm-pv-export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_lvm_pv_export-udisks-lvm-pv-export.obj -MD -MP -MF $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Tpo -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.obj `if test -f 'udisks-lvm-pv-export.c'; then $(CYGPATH_W) 'udisks-lvm-pv-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-lvm-pv-export.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Tpo $(DEPDIR)/udisks_lvm_pv_export-udisks-lvm-pv-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-lvm-pv-export.c' object='udisks_lvm_pv_export-udisks-lvm-pv-export.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-lvm-pv-export.c' object='udisks_lvm_pv_export-udisks-lvm-pv-export.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.obj `if test -f 'udisks-lvm-pv-export.c'; then $(CYGPATH_W) 'udisks-lvm-pv-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-lvm-pv-export.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_lvm_pv_export_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_lvm_pv_export-udisks-lvm-pv-export.obj `if test -f 'udisks-lvm-pv-export.c'; then $(CYGPATH_W) 'udisks-lvm-pv-export.c'; else $(CYGPATH_W) '$(srcdir)/udisks-lvm-pv-export.c'; fi`
 
 udisks_part_id-part-id.o: part-id.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_part_id-part-id.o -MD -MP -MF $(DEPDIR)/udisks_part_id-part-id.Tpo -c -o udisks_part_id-part-id.o `test -f 'part-id.c' || echo '$(srcdir)/'`part-id.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_part_id-part-id.Tpo $(DEPDIR)/udisks_part_id-part-id.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='part-id.c' object='udisks_part_id-part-id.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='part-id.c' object='udisks_part_id-part-id.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_part_id-part-id.o `test -f 'part-id.c' || echo '$(srcdir)/'`part-id.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_part_id-part-id.o `test -f 'part-id.c' || echo '$(srcdir)/'`part-id.c
 
 udisks_part_id-part-id.obj: part-id.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_part_id-part-id.obj -MD -MP -MF $(DEPDIR)/udisks_part_id-part-id.Tpo -c -o udisks_part_id-part-id.obj `if test -f 'part-id.c'; then $(CYGPATH_W) 'part-id.c'; else $(CYGPATH_W) '$(srcdir)/part-id.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_part_id-part-id.Tpo $(DEPDIR)/udisks_part_id-part-id.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='part-id.c' object='udisks_part_id-part-id.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='part-id.c' object='udisks_part_id-part-id.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_part_id-part-id.obj `if test -f 'part-id.c'; then $(CYGPATH_W) 'part-id.c'; else $(CYGPATH_W) '$(srcdir)/part-id.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_part_id_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_part_id-part-id.obj `if test -f 'part-id.c'; then $(CYGPATH_W) 'part-id.c'; else $(CYGPATH_W) '$(srcdir)/part-id.c'; fi`
 
 udisks_probe_ata_smart-udisks-probe-ata-smart.o: udisks-probe-ata-smart.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_probe_ata_smart-udisks-probe-ata-smart.o -MD -MP -MF $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Tpo -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.o `test -f 'udisks-probe-ata-smart.c' || echo '$(srcdir)/'`udisks-probe-ata-smart.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Tpo $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-probe-ata-smart.c' object='udisks_probe_ata_smart-udisks-probe-ata-smart.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-probe-ata-smart.c' object='udisks_probe_ata_smart-udisks-probe-ata-smart.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.o `test -f 'udisks-probe-ata-smart.c' || echo '$(srcdir)/'`udisks-probe-ata-smart.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.o `test -f 'udisks-probe-ata-smart.c' || echo '$(srcdir)/'`udisks-probe-ata-smart.c
 
 udisks_probe_ata_smart-udisks-probe-ata-smart.obj: udisks-probe-ata-smart.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_probe_ata_smart-udisks-probe-ata-smart.obj -MD -MP -MF $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Tpo -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.obj `if test -f 'udisks-probe-ata-smart.c'; then $(CYGPATH_W) 'udisks-probe-ata-smart.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-ata-smart.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Tpo $(DEPDIR)/udisks_probe_ata_smart-udisks-probe-ata-smart.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-probe-ata-smart.c' object='udisks_probe_ata_smart-udisks-probe-ata-smart.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-probe-ata-smart.c' object='udisks_probe_ata_smart-udisks-probe-ata-smart.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.obj `if test -f 'udisks-probe-ata-smart.c'; then $(CYGPATH_W) 'udisks-probe-ata-smart.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-ata-smart.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_ata_smart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_ata_smart-udisks-probe-ata-smart.obj `if test -f 'udisks-probe-ata-smart.c'; then $(CYGPATH_W) 'udisks-probe-ata-smart.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-ata-smart.c'; fi`
 
 udisks_probe_sas_expander-udisks-probe-sas-expander.o: udisks-probe-sas-expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_probe_sas_expander-udisks-probe-sas-expander.o -MD -MP -MF $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Tpo -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.o `test -f 'udisks-probe-sas-expander.c' || echo '$(srcdir)/'`udisks-probe-sas-expander.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Tpo $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-probe-sas-expander.c' object='udisks_probe_sas_expander-udisks-probe-sas-expander.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-probe-sas-expander.c' object='udisks_probe_sas_expander-udisks-probe-sas-expander.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.o `test -f 'udisks-probe-sas-expander.c' || echo '$(srcdir)/'`udisks-probe-sas-expander.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.o `test -f 'udisks-probe-sas-expander.c' || echo '$(srcdir)/'`udisks-probe-sas-expander.c
 
 udisks_probe_sas_expander-udisks-probe-sas-expander.obj: udisks-probe-sas-expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT udisks_probe_sas_expander-udisks-probe-sas-expander.obj -MD -MP -MF $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Tpo -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.obj `if test -f 'udisks-probe-sas-expander.c'; then $(CYGPATH_W) 'udisks-probe-sas-expander.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-sas-expander.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Tpo $(DEPDIR)/udisks_probe_sas_expander-udisks-probe-sas-expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-probe-sas-expander.c' object='udisks_probe_sas_expander-udisks-probe-sas-expander.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-probe-sas-expander.c' object='udisks_probe_sas_expander-udisks-probe-sas-expander.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.obj `if test -f 'udisks-probe-sas-expander.c'; then $(CYGPATH_W) 'udisks-probe-sas-expander.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-sas-expander.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_probe_sas_expander_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o udisks_probe_sas_expander-udisks-probe-sas-expander.obj `if test -f 'udisks-probe-sas-expander.c'; then $(CYGPATH_W) 'udisks-probe-sas-expander.c'; else $(CYGPATH_W) '$(srcdir)/udisks-probe-sas-expander.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -540,26 +624,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -571,15 +644,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -588,6 +657,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -639,10 +723,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -727,19 +816,20 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-udevhelperPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-udevhelperPROGRAMS installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-udevhelperPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-udevhelperPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip \
+	install-udevhelperPROGRAMS installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-udevhelperPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru udisks-1.0.4/test-driver udisks-1.0.5/test-driver
--- udisks-1.0.4/test-driver	1970-01-01 00:00:00.000000000 +0000
+++ udisks-1.0.5/test-driver	2014-01-02 19:14:59.000000000 +0000
@@ -0,0 +1,139 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru udisks-1.0.4/tests/Makefile.in udisks-1.0.5/tests/Makefile.in
--- udisks-1.0.4/tests/Makefile.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/tests/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,7 +78,7 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -43,14 +87,26 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -96,6 +152,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -112,6 +171,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -203,6 +266,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -220,6 +285,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -264,11 +330,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -315,10 +381,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -399,15 +470,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru udisks-1.0.4/tests/run udisks-1.0.5/tests/run
--- udisks-1.0.4/tests/run	2011-08-25 18:27:33.000000000 +0000
+++ udisks-1.0.5/tests/run	2014-03-10 08:57:48.000000000 +0000
@@ -291,6 +291,7 @@
                       'ext3': ['-F'],
                       'ext4': ['-F'],
                       'ntfs': ['-F'],
+                      'reiserfs': ['-f', '-q'],
                     }
 
         cmd = [mkcmd.get(type, 'mkfs.' + type)] + extra_opt.get(type, [])
@@ -752,7 +753,8 @@
             self.assertRaises(dbus.DBusException, iface.FilesystemSetLabel, 'foo')
 
         # check fs
-        self.assertEqual(iface.FilesystemCheck([]), True)
+        if type != 'swap':
+            self.assertEqual(iface.FilesystemCheck([]), True)
 
     def _do_file_perms_checks(self, type, mount_point):
         '''Check for permissions for data files and executables.
@@ -1223,6 +1225,7 @@
                 self.assertEqual(e._dbus_error_name, 'org.freedesktop.UDisks.Error.Failed')
         else:
             sys.stderr.write('[N/A] ')
+            info = self.get_info(devname=hd)
             self.assertEqual(info['ATA SMART'], 'not available')
             self.assertEqual(props.Get(I_D, 'DriveAtaSmartTimeCollected'), 0)
             self.assertEqual(props.Get(I_D, 'DriveAtaSmartBlob'), [])
diff -Nru udisks-1.0.4/tools/Makefile.in udisks-1.0.5/tools/Makefile.in
--- udisks-1.0.4/tools/Makefile.in	2011-08-26 15:08:43.000000000 +0000
+++ udisks-1.0.5/tools/Makefile.in	2014-03-10 09:04:34.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -41,7 +85,8 @@
 # ----------------------------------------------------------------------------------------------------
 @REMOTE_ACCESS_ENABLED_TRUE@am__append_1 = udisks-tcp-bridge
 subdir = tools
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,9 +104,10 @@
 udisks_OBJECTS = $(am_udisks_OBJECTS)
 am__DEPENDENCIES_1 =
 udisks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 udisks_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(udisks_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -92,7 +138,25 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 SCRIPTS = $(profile_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -103,26 +167,44 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(udisks_SOURCES) $(udisks_tcp_bridge_SOURCES) \
 	$(umount_udisks_SOURCES)
 DIST_SOURCES = $(udisks_SOURCES) $(udisks_tcp_bridge_SOURCES) \
 	$(umount_udisks_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +252,9 @@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
@@ -186,6 +271,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@
@@ -277,6 +366,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -294,6 +385,7 @@
 slashsbindir = @slashsbindir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -383,14 +475,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -411,7 +508,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -426,14 +524,19 @@
 	rm -f $$list
 install-slashsbinPROGRAMS: $(slashsbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(slashsbindir)" || $(MKDIR_P) "$(DESTDIR)$(slashsbindir)"
 	@list='$(slashsbin_PROGRAMS)'; test -n "$(slashsbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(slashsbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(slashsbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -454,7 +557,8 @@
 	@list='$(slashsbin_PROGRAMS)'; test -n "$(slashsbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(slashsbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(slashsbindir)" && rm -f $$files
@@ -467,19 +571,25 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-udisks$(EXEEXT): $(udisks_OBJECTS) $(udisks_DEPENDENCIES) 
+
+udisks$(EXEEXT): $(udisks_OBJECTS) $(udisks_DEPENDENCIES) $(EXTRA_udisks_DEPENDENCIES) 
 	@rm -f udisks$(EXEEXT)
 	$(AM_V_CCLD)$(udisks_LINK) $(udisks_OBJECTS) $(udisks_LDADD) $(LIBS)
-udisks-tcp-bridge$(EXEEXT): $(udisks_tcp_bridge_OBJECTS) $(udisks_tcp_bridge_DEPENDENCIES) 
+
+udisks-tcp-bridge$(EXEEXT): $(udisks_tcp_bridge_OBJECTS) $(udisks_tcp_bridge_DEPENDENCIES) $(EXTRA_udisks_tcp_bridge_DEPENDENCIES) 
 	@rm -f udisks-tcp-bridge$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(udisks_tcp_bridge_OBJECTS) $(udisks_tcp_bridge_LDADD) $(LIBS)
-umount.udisks$(EXEEXT): $(umount_udisks_OBJECTS) $(umount_udisks_DEPENDENCIES) 
+
+umount.udisks$(EXEEXT): $(umount_udisks_OBJECTS) $(umount_udisks_DEPENDENCIES) $(EXTRA_umount_udisks_DEPENDENCIES) 
 	@rm -f umount.udisks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(umount_udisks_OBJECTS) $(umount_udisks_LDADD) $(LIBS)
 install-profileSCRIPTS: $(profile_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(profiledir)" || $(MKDIR_P) "$(DESTDIR)$(profiledir)"
 	@list='$(profile_SCRIPTS)'; test -n "$(profiledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(profiledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(profiledir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -507,9 +617,7 @@
 	@list='$(profile_SCRIPTS)'; test -n "$(profiledir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(profiledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(profiledir)" && rm -f $$files
+	dir='$(DESTDIR)$(profiledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -525,58 +633,51 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 udisks-udisks.o: udisks.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -MT udisks-udisks.o -MD -MP -MF $(DEPDIR)/udisks-udisks.Tpo -c -o udisks-udisks.o `test -f 'udisks.c' || echo '$(srcdir)/'`udisks.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks-udisks.Tpo $(DEPDIR)/udisks-udisks.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks.c' object='udisks-udisks.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks.c' object='udisks-udisks.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks.o `test -f 'udisks.c' || echo '$(srcdir)/'`udisks.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks.o `test -f 'udisks.c' || echo '$(srcdir)/'`udisks.c
 
 udisks-udisks.obj: udisks.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -MT udisks-udisks.obj -MD -MP -MF $(DEPDIR)/udisks-udisks.Tpo -c -o udisks-udisks.obj `if test -f 'udisks.c'; then $(CYGPATH_W) 'udisks.c'; else $(CYGPATH_W) '$(srcdir)/udisks.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks-udisks.Tpo $(DEPDIR)/udisks-udisks.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks.c' object='udisks-udisks.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks.c' object='udisks-udisks.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks.obj `if test -f 'udisks.c'; then $(CYGPATH_W) 'udisks.c'; else $(CYGPATH_W) '$(srcdir)/udisks.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks.obj `if test -f 'udisks.c'; then $(CYGPATH_W) 'udisks.c'; else $(CYGPATH_W) '$(srcdir)/udisks.c'; fi`
 
 udisks-udisks-marshal.o: udisks-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -MT udisks-udisks-marshal.o -MD -MP -MF $(DEPDIR)/udisks-udisks-marshal.Tpo -c -o udisks-udisks-marshal.o `test -f 'udisks-marshal.c' || echo '$(srcdir)/'`udisks-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks-udisks-marshal.Tpo $(DEPDIR)/udisks-udisks-marshal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-marshal.c' object='udisks-udisks-marshal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-marshal.c' object='udisks-udisks-marshal.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks-marshal.o `test -f 'udisks-marshal.c' || echo '$(srcdir)/'`udisks-marshal.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks-marshal.o `test -f 'udisks-marshal.c' || echo '$(srcdir)/'`udisks-marshal.c
 
 udisks-udisks-marshal.obj: udisks-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -MT udisks-udisks-marshal.obj -MD -MP -MF $(DEPDIR)/udisks-udisks-marshal.Tpo -c -o udisks-udisks-marshal.obj `if test -f 'udisks-marshal.c'; then $(CYGPATH_W) 'udisks-marshal.c'; else $(CYGPATH_W) '$(srcdir)/udisks-marshal.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udisks-udisks-marshal.Tpo $(DEPDIR)/udisks-udisks-marshal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udisks-marshal.c' object='udisks-udisks-marshal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udisks-marshal.c' object='udisks-udisks-marshal.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks-marshal.obj `if test -f 'udisks-marshal.c'; then $(CYGPATH_W) 'udisks-marshal.c'; else $(CYGPATH_W) '$(srcdir)/udisks-marshal.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(udisks_CPPFLAGS) $(CPPFLAGS) $(udisks_CFLAGS) $(CFLAGS) -c -o udisks-udisks-marshal.obj `if test -f 'udisks-marshal.c'; then $(CYGPATH_W) 'udisks-marshal.c'; else $(CYGPATH_W) '$(srcdir)/udisks-marshal.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -584,26 +685,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -615,15 +705,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -632,6 +718,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -685,10 +786,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -776,20 +882,21 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool clean-local \
-	clean-slashsbinPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-profileSCRIPTS install-ps \
-	install-ps-am install-slashsbinPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool clean-local \
+	clean-slashsbinPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-profileSCRIPTS install-ps install-ps-am \
+	install-slashsbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-profileSCRIPTS uninstall-slashsbinPROGRAMS
 
 
diff -Nru udisks-1.0.4/tools/udisks-marshal.c udisks-1.0.5/tools/udisks-marshal.c
--- udisks-1.0.4/tools/udisks-marshal.c	2011-08-25 21:16:16.000000000 +0000
+++ udisks-1.0.5/tools/udisks-marshal.c	2014-03-10 09:04:48.000000000 +0000
@@ -5,7 +5,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)