diff -Nru gconf-3.2.3/aclocal.m4 gconf-3.2.4/aclocal.m4 --- gconf-3.2.3/aclocal.m4 2011-10-31 15:30:44.000000000 +0000 +++ gconf-3.2.4/aclocal.m4 2012-03-08 17:10:52.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -19,648 +20,236 @@ 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'.])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +dnl -*- mode: autoconf -*- -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +# serial 1 -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +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 -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [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]))]) + 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 - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) + fi -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) - gt_cv_have_gettext=no + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi + 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]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +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]) + 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.]) +fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi +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 $< [$]@' - # We need to process the po/ directory. - POSUB=po +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +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"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +IT_PO_SUBDIR([po]) - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - -dnl -*- mode: autoconf -*- - -# serial 1 - -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 - - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [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]))]) - 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 - fi - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - - 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]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) - - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -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.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - 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 $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -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\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) +]) # IT_PO_SUBDIR(DIRNAME) @@ -757,6 +346,8 @@ ],dnl [auto],[dnl PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection ],dnl [dnl AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) @@ -812,8 +403,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 @@ -822,8 +413,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. @@ -957,6 +548,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 @@ -1442,7 +1035,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." @@ -1606,6 +1199,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)], @@ -1627,14 +1221,37 @@ ])# _LT_LANG -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], +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], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], [LT_LANG(F77)], [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) @@ -1657,6 +1274,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)])]) @@ -1759,7 +1380,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 @@ -1767,6 +1394,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 @@ -1778,6 +1406,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 @@ -1795,7 +1424,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 @@ -1840,8 +1471,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1852,6 +1483,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 @@ -2135,14 +1768,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" @@ -2219,13 +1865,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 @@ -2405,6 +2051,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 @@ -2444,7 +2095,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 @@ -2990,7 +2641,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 @@ -2999,7 +2650,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 @@ -3064,7 +2715,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' @@ -3203,7 +2854,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' @@ -3211,10 +2862,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. @@ -3222,7 +2869,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3240,7 +2887,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3260,7 +2907,7 @@ ;; gnu*) - 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}' @@ -3271,7 +2918,7 @@ ;; 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" @@ -3332,7 +2979,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}' @@ -3348,7 +2995,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 ;; @@ -3385,9 +3032,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - 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}' @@ -3462,7 +3109,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 @@ -3531,7 +3178,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}' @@ -3556,7 +3203,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 @@ -3580,7 +3227,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 @@ -3611,7 +3258,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}' @@ -3621,7 +3268,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 @@ -4043,7 +3690,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4463,6 +4110,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};"\ @@ -5047,7 +4695,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 @@ -5139,18 +4789,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 @@ -5310,7 +4975,9 @@ ;; 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'] @@ -5338,7 +5005,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 @@ -5592,8 +5258,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~ @@ -5889,6 +5554,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' @@ -5935,10 +5601,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 @@ -5951,7 +5613,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 @@ -5990,7 +5652,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 @@ -6432,9 +6093,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], @@ -6588,7 +6246,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 @@ -6958,7 +6615,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7719,12 +7376,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 @@ -7921,7 +7584,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 @@ -8054,7 +7716,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 @@ -8237,6 +7898,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 @@ -8306,6 +8034,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], @@ -8970,9 +8705,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]) @@ -9144,15 +8894,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) ]) @@ -9384,77 +9134,517 @@ ])# _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + 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 --cflags --libs "$2" 2>&1` + else + $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 + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) + +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl + +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) + +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) + + gt_cv_have_gettext=no + + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= + + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi + + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi + + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" + + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi + + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) + + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -pkg_failed=no -AC_MSG_CHECKING([for $1]) + # We need to process the po/ directory. + POSUB=po -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -if test $pkg_failed = yes; then - 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 --cflags --libs "$2" 2>&1` - else - $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 + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -$$1_PKG_ERRORS + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -_PKG_TEXT + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) -To get pkg-config, see .])[]dnl - ]) +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) + +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) + -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -9464,7 +9654,7 @@ [am__api_version='1.11' 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.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9480,19 +9670,21 @@ # 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.11.3])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, 2003, 2005, 2011 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 + # 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/../..'. @@ -9597,14 +9789,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, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 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 +# serial 12 # 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, @@ -9644,6 +9836,7 @@ # 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'. + 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. @@ -9708,7 +9901,7 @@ break fi ;; - msvisualcpp | msvcmsys) + 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. @@ -9773,10 +9966,13 @@ 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 -*- @@ -9998,12 +10194,15 @@ 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, 2003, 2005, 2008, 2011 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_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -10043,8 +10242,8 @@ # 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, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10064,7 +10263,7 @@ [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 @@ -10175,12 +10374,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -10203,13 +10405,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -10217,13 +10420,13 @@ [[_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)]) # _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)])]) @@ -10299,13 +10502,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 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 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -10320,18 +10523,50 @@ 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, 2003, 2005, 2011 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_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -10354,13 +10589,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 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 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -10369,13 +10604,13 @@ 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, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10397,10 +10632,11 @@ # 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]) +[# 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}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru gconf-3.2.3/backends/Makefile.in gconf-3.2.4/backends/Makefile.in --- gconf-3.2.3/backends/Makefile.in 2011-10-31 15:30:46.000000000 +0000 +++ gconf-3.2.4/backends/Makefile.in 2012-03-08 17:10:54.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 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. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -69,6 +69,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; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(backendconfdir)" "$(DESTDIR)$(schemadir)" LTLIBRARIES = $(backend_LTLIBRARIES) @@ -82,8 +88,8 @@ @LDAP_SUPPORT_TRUE@ evoldap-backend.lo libgconfbackend_evoldap_la_OBJECTS = \ $(am_libgconfbackend_evoldap_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 libgconfbackend_evoldap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -131,21 +137,21 @@ $(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 = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) 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 = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ 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 = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 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 = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgconfbackend_evoldap_la_SOURCES) \ $(libgconfbackend_oldxml_la_SOURCES) \ @@ -238,6 +244,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@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ @@ -332,6 +342,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@ @@ -469,11 +481,11 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgconfbackend-evoldap.la: $(libgconfbackend_evoldap_la_OBJECTS) $(libgconfbackend_evoldap_la_DEPENDENCIES) +libgconfbackend-evoldap.la: $(libgconfbackend_evoldap_la_OBJECTS) $(libgconfbackend_evoldap_la_DEPENDENCIES) $(EXTRA_libgconfbackend_evoldap_la_DEPENDENCIES) $(AM_V_CCLD)$(libgconfbackend_evoldap_la_LINK) $(am_libgconfbackend_evoldap_la_rpath) $(libgconfbackend_evoldap_la_OBJECTS) $(libgconfbackend_evoldap_la_LIBADD) $(LIBS) -libgconfbackend-oldxml.la: $(libgconfbackend_oldxml_la_OBJECTS) $(libgconfbackend_oldxml_la_DEPENDENCIES) +libgconfbackend-oldxml.la: $(libgconfbackend_oldxml_la_OBJECTS) $(libgconfbackend_oldxml_la_DEPENDENCIES) $(EXTRA_libgconfbackend_oldxml_la_DEPENDENCIES) $(AM_V_CCLD)$(libgconfbackend_oldxml_la_LINK) -rpath $(backenddir) $(libgconfbackend_oldxml_la_OBJECTS) $(libgconfbackend_oldxml_la_LIBADD) $(LIBS) -libgconfbackend-xml.la: $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_DEPENDENCIES) +libgconfbackend-xml.la: $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_DEPENDENCIES) $(EXTRA_libgconfbackend_xml_la_DEPENDENCIES) $(AM_V_CCLD)$(libgconfbackend_xml_la_LINK) -rpath $(backenddir) $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -527,10 +539,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_DEPENDENCIES) +gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_DEPENDENCIES) $(EXTRA_gconf_merge_tree_DEPENDENCIES) @rm -f gconf-merge-tree$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS) -xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) +xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) $(EXTRA_xml_test_DEPENDENCIES) @rm -f xml-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS) @@ -553,26 +565,23 @@ .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 $< .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 `$(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 $@ $< mostlyclean-libtool: -rm -f *.lo @@ -596,9 +605,7 @@ @$(NORMAL_UNINSTALL) @list='$(backendconf_DATA)'; test -n "$(backendconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(backendconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(backendconfdir)" && rm -f $$files + dir='$(DESTDIR)$(backendconfdir)'; $(am__uninstall_files_from_dir) install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" @@ -616,9 +623,7 @@ @$(NORMAL_UNINSTALL) @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemadir)" && rm -f $$files + dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -719,10 +724,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: diff -Nru gconf-3.2.3/ChangeLog gconf-3.2.4/ChangeLog --- gconf-3.2.3/ChangeLog 2011-10-31 15:33:46.000000000 +0000 +++ gconf-3.2.4/ChangeLog 2012-03-08 17:11:28.000000000 +0000 @@ -1,5 +1,284 @@ # Generated by Makefile. Do not edit. +commit 81b729de846ef3d7c69769dce4fba05ffae06e97 +Author: Ryan Lortie +Date: Thu Mar 8 12:10:22 2012 -0500 + + GConf 3.2.4 + + NEWS | 17 +++++++++++++++++ + configure.in | 2 +- + 2 files changed, 18 insertions(+), 1 deletions(-) + +commit 1f4573580320b744e6aaad7f7390cff84668d883 +Author: Ryan Lortie +Date: Thu Mar 8 12:08:13 2012 -0500 + + build: add uninstall hook for GSettings backend + + New automake is more strict about having the install directory clean + after 'make uninstall' during 'make distcheck'. + + gsettings/Makefile.am | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit c35ac7aff8f035710b3fbbee4fe34461cc78681e +Author: Ryan Lortie +Date: Thu Mar 8 11:47:35 2012 -0500 + + fix build failure with ORBit enabled + + With ORBit enabled, the internal gconf headers (that we are now using + from gsettings-data-convert) depend on ORBit headers. Add the proper + search path to the CFLAGS for gsettings-data-convert to fix that. + + gsettings/Makefile.am | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit d28bd006832bd136c58d42003bf1b0f25f74128e +Author: Ryan Lortie +Date: Wed Mar 7 15:04:53 2012 -0500 + + gsettings-data-convert: convert only user settings + + We only want to migrate settings that were in writable databases (in + order to avoid 'lifting' system defaults into the user's database). + + https://bugzilla.gnome.org/show_bug.cgi?id=671581 + + gsettings/Makefile.am | 1 + + gsettings/gsettings-data-convert.c | 65 ++++++++++++++++++++++++++++++++++- + 2 files changed, 64 insertions(+), 2 deletions(-) + +commit 27c183fe8e63a3a21b58348a294056e2594f985f +Author: Ryan Lortie +Date: Wed Mar 7 15:04:20 2012 -0500 + + sources: remove a harmless warning message + + GConf warns if there are no writable databases in use. Stop it from + doing that. + + https://bugzilla.gnome.org/show_bug.cgi?id=671581 + + gconf/gconf-sources.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +commit 0914a38ab9758741e878ce2345cc48650f368372 +Author: Daniel Korostil +Date: Fri Mar 2 17:07:01 2012 +0200 + + Uploaded Ukranian + + po/uk.po | 389 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 225 insertions(+), 164 deletions(-) + +commit ca6c66bdc2da414d2dacb7c96e40a7cdcbe58f03 +Author: Kasia Bondarava +Date: Sun Feb 26 01:15:19 2012 +0300 + + Updated Belarusian translation. + + po/be.po | 2919 ++++++++++++++++++++++++++++---------------------------------- + 1 files changed, 1334 insertions(+), 1585 deletions(-) + +commit 14176e68e899810eea404ea4a42b7480e5114524 +Author: Ray Strode +Date: Fri Jun 10 14:38:49 2011 -0400 + + daemon: tie saved_state file to session + + The code isn't really designed to work well with multiple + gconfd's writing to the same saved_state file, so we should + make it per-session. + + https://bugzilla.gnome.org/show_bug.cgi?id=652289 + + gconf/gconfd.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 79 insertions(+), 3 deletions(-) + +commit 2895a09bc0666cf7b26190bdb648ad1f52c174da +Author: Ray Strode +Date: Fri Jun 10 18:47:41 2011 -0400 + + daemon: store daemon data in XDG_RUNTIME_DIR + + If XDG_RUNTIME_DIR is available it's a much better + directory than /tmp since it ensures there's no + DoS possibilities + + https://bugzilla.gnome.org/show_bug.cgi?id=652289 + + gconf/gconf-internals.c | 19 ++++++++++++------- + 1 files changed, 12 insertions(+), 7 deletions(-) + +commit ea6894303f7ebadb98bf4bf70a79c5bf6ef7cb90 +Author: Ray Strode +Date: Fri Jun 10 11:25:55 2011 -0400 + + daemon: store saved_state in daemon dir not ~/.gconfd + + The daemon dir isn't always ~/.gconfd so we shouldn't hard + code it. + + https://bugzilla.gnome.org/show_bug.cgi?id=652289 + + gconf/gconfd.c | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +commit 6f3e127330cb0820a373be77be3cb2cacd0b352e +Author: Ray Strode +Date: Mon Feb 13 23:35:06 2012 -0500 + + gconf-dbus: don't crash during sync if gconfd shutting down + + The gconfd shuts down after a bit of inactivity. When that + happens there's a window where it refuses requests from the + client library with an error. The library is resposible for + gracefully handling this condition and reacting appropriately. + + There are many places in the code where the client library has + this idiom: + + db = gconf_engine_get_database (conf, TRUE, err); + + if (db == NULL) + { + g_return_if_fail(err == NULL || *err != NULL); + + return; + } + + In the event gconfd is shutting down, db will be NULL, and the + code will return early from whatever (non-critical) operation + it was doing. + + gconf_engine_suggest_sync has a similiar chunk of code, but it + neglected the "return;" and then promptly crashed since it wasn't + expecting db to be NULL. + + This commit adds the return; + + https://bugzilla.gnome.org/show_bug.cgi?id=670033 + + gconf/gconf-dbus.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 0bc3a90c2178ae0dd42029f7ad227fa7f44d6c0c +Author: Hannie Dumoleyn +Date: Sat Feb 4 18:43:35 2012 +0100 + + Updated Dutch translation + + po/nl.po | 384 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 224 insertions(+), 160 deletions(-) + +commit 6cd97ba58d2022378a627406bcd786eefd5b891a +Author: Kjartan Maraas +Date: Tue Jan 24 15:12:06 2012 +0100 + + Updated Norwegian bokmål translation + + po/nb.po | 220 ++++++++++++++++++++++++++----------------------------------- + 1 files changed, 94 insertions(+), 126 deletions(-) + +commit 212c2b9f69ccf4fd6a140726a45848d8810ae6ab +Author: Matthias Clasen +Date: Thu Jan 19 12:42:13 2012 -0500 + + Put back gthread-2.0 + + Turns out g_thread_init is used in gconftool + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 371b817fec29aeeeaabb24fca80248e8dc4d68c5 +Author: Matthias Clasen +Date: Thu Jan 19 11:37:42 2012 -0500 + + Back down gio requirements + + 2.32 doesn't actually exist yet... + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e06e9553b060d6b0fd96cdf40dbd5918045c52ca +Author: Matthias Clasen +Date: Thu Jan 19 09:54:58 2012 -0500 + + Bump GIO dep to 2.32 + + This is needed for the settings schema API. + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 120f116e608bc1f09cf65435333e40e00c6b8ad2 +Author: Matthias Clasen +Date: Thu Jan 19 09:53:08 2012 -0500 + + Skip nonexisting schemas + + This can happen in practice, due to e.g. schemas being packaged + in subpackages, while all the conversions are kept in a single + file. + + gsettings/gsettings-data-convert.c | 17 +++++++++++++++++ + 1 files changed, 17 insertions(+), 0 deletions(-) + +commit 76e5c8e2cf3d2555beb8d06211711d82962a9ebf +Author: Matthias Clasen +Date: Thu Jan 19 09:51:16 2012 -0500 + + Cosmetics: Consistenly capitalize messages + + gsettings/gsettings-data-convert.c | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +commit 8a9c168c8b9f58cfcfdb021e45fb5a16674a3969 +Author: Colin Walters +Date: Sat Jan 14 22:08:48 2012 -0500 + + build: Add --disable-documentation configure option + + Documentation is the source of many cyclical build loops. Allow + operating system builders to manually cut these cycles initially + by disabling documentation for a first pass. + + configure.in | 5 +++++ + gsettings/Makefile.am | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletions(-) + +commit 635d28cbf635d89b8bbbb008bf86cc864b8dabb7 +Author: Richard Purdie +Date: Mon Nov 28 14:34:43 2011 +0000 + + Allow the backend directory to be specified from the environment. + + This is required in Yoctor so we can relocate gconf-native to different paths + and still allow it to work. + + https://bugzilla.gnome.org/show_bug.cgi?id=664650 + + gconf/gconf-backend.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +commit c129898afaa562ffc38f434e5e0c607f525101b8 +Author: Sascha Silbe +Date: Mon Nov 14 16:13:27 2011 +0100 + + D-Bus backend: Add GCONF_DEFAULT_SOURCE_PATH support (#664031) + + Forward-port 7baf4c6b33a6dd0697a8bdb81bd86c72d58ebdc6 + ("Allow overriding the default config via $GCONF_DEFAULT_SOURCE_PATH") + from the ORBit to the D-Bus backend to fix (sugar-)jhbuild breakage when + building with --disable-orbit. + + gconf/gconf-dbus.c | 30 +++++++++++++++++++----------- + 1 files changed, 19 insertions(+), 11 deletions(-) + commit e203d15c02b64f0e74498f85b52d9ca876baa996 Author: Ross Burton Date: Mon Oct 31 15:30:17 2011 +0000 @@ -4257,12 +4536,12 @@ be used by gconf-editor. Fixes bug 558619 NEWS | 8 + - defaults/gconf-defaults.c | 486 +++++++++++++++++++++++++++---------------- - defaults/gconf-defaults.h | 38 ++-- + defaults/gconf-defaults.c | 484 +++++++++++++++++++++++++++---------------- + defaults/gconf-defaults.h | 38 +++-- defaults/gconf-defaults.xml | 48 ++++- gconf/gconf-internals.h | 3 - gconf/gconf-value.h | 3 + - 6 files changed, 379 insertions(+), 207 deletions(-) + 6 files changed, 378 insertions(+), 206 deletions(-) commit c9e62896b8c221694cfba25994894b13161e83cd Author: Matthias Clasen @@ -20359,8 +20638,8 @@ NULL and the last error if we failed to resolve any of the addresses. ChangeLog | 5 +++ - gconf/gconf-sources.c | 68 ++++++++++++++++++++++++++++++++---------------- - 2 files changed, 50 insertions(+), 23 deletions(-) + gconf/gconf-sources.c | 66 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 49 insertions(+), 22 deletions(-) commit 1485dc88e576cb5535fab9c568629b0a334626ad Author: Richard Hult @@ -27318,8 +27597,8 @@ Updated Polish translation by GNOME PL Team po/ChangeLog | 5 +++++ - po/pl.po | 39 +++++++++++++++++++++------------------ - 2 files changed, 26 insertions(+), 18 deletions(-) + po/pl.po | 41 ++++++++++++++++++++++------------------- + 2 files changed, 27 insertions(+), 19 deletions(-) commit 34bcc22a252024fbe4786c10ac7c371e603fc487 Author: Changwoo Ryu @@ -28076,8 +28355,8 @@ * sv.po: Fixed Swedish translation. po/ChangeLog | 4 + - po/sv.po | 203 ++++++++++++++++++++++++++-------------------------------- - 2 files changed, 96 insertions(+), 111 deletions(-) + po/sv.po | 177 ++++++++++++++++++++++++++-------------------------------- + 2 files changed, 83 insertions(+), 98 deletions(-) commit a74e1ad9f66e65adf9aceb41a0486dd944efc687 Author: Stanislav Visnovsky @@ -30644,10 +30923,10 @@ gconf/gconf-sources.c | 2 +- gconf/gconf.c | 125 ++---- gconf/gconf.h | 12 +- - gconf/gconfd.c | 139 ++----- + gconf/gconfd.c | 137 ++----- gconf/gconftool.c | 11 - tests/testactivationraces.sh | 28 ++ - 16 files changed, 843 insertions(+), 568 deletions(-) + 16 files changed, 842 insertions(+), 567 deletions(-) commit 59446e32f33e23b2c1395a9567455b9319e8162d Author: Valek Frob diff -Nru gconf-3.2.3/config.guess gconf-3.2.4/config.guess --- gconf-3.2.3/config.guess 2011-10-31 15:30:46.000000000 +0000 +++ gconf-3.2.4/config.guess 2012-03-08 17:10:54.000000000 +0000 @@ -2,9 +2,9 @@ # 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, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-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 @@ -17,9 +17,7 @@ # 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 @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -145,7 +143,7 @@ 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 @@ -792,13 +790,12 @@ 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*:*) @@ -807,6 +804,9 @@ *: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 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ 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 diff -Nru gconf-3.2.3/config.sub gconf-3.2.4/config.sub --- gconf-3.2.3/config.sub 2011-10-31 15:30:46.000000000 +0000 +++ gconf-3.2.4/config.sub 2012-03-08 17:10:54.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # 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 @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -132,6 +130,10 @@ 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 ] @@ -247,17 +249,22 @@ # 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 \ + | be32 | be64 \ | bfin \ | c4x | 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 \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | 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 \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # 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-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | 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-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 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-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,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 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru gconf-3.2.3/configure gconf-3.2.4/configure --- gconf-3.2.3/configure 2011-10-31 15:30:45.000000000 +0000 +++ gconf-3.2.4/configure 2012-03-08 17:10:53.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GConf 3.2.3. +# Generated by GNU Autoconf 2.68 for GConf 3.2.4. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='GConf' PACKAGE_TARNAME='GConf' -PACKAGE_VERSION='3.2.3' -PACKAGE_STRING='GConf 3.2.3' +PACKAGE_VERSION='3.2.4' +PACKAGE_STRING='GConf 3.2.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GConf' PACKAGE_URL='' @@ -665,6 +665,12 @@ 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 @@ -707,6 +713,8 @@ DEPENDENT_WITH_XML_CFLAGS DEPENDENT_LIBS DEPENDENT_CFLAGS +ENABLE_DOCUMENTATION_FALSE +ENABLE_DOCUMENTATION_TRUE GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -768,6 +776,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -796,6 +805,8 @@ MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -876,6 +887,7 @@ enable_gtk_doc enable_gtk_doc_html enable_gtk_doc_pdf +enable_documentation with_gtk enable_gtk enable_orbit @@ -1461,7 +1473,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 GConf 3.2.3 to adapt to many kinds of systems. +\`configure' configures GConf 3.2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1543,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GConf 3.2.3:";; + short | recursive ) echo "Configuration of GConf 3.2.4:";; esac cat <<\_ACEOF @@ -1555,6 +1567,7 @@ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] --enable-gtk-doc-html build documentation in html format [[default=yes]] --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] + --enable-documentation enable documentation generated via XSLT --enable-gtk Enable GTK+ support (for gconf-sanity-check) [default=auto] --disable-orbit Disable using ORBit for IPC @@ -1569,7 +1582,7 @@ 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 @@ -1701,7 +1714,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GConf configure 3.2.3 +GConf configure 3.2.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2191,7 +2204,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GConf $as_me 3.2.3, which was +It was created by GConf $as_me 3.2.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3011,7 +3024,7 @@ # Define the identity of the package. PACKAGE='GConf' - VERSION='3.2.3' + VERSION='3.2.4' cat >>confdefs.h <<_ACEOF @@ -3041,11 +3054,11 @@ # 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}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3062,12 +3075,39 @@ 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='\' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval @@ -4032,6 +4072,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= @@ -4056,6 +4097,7 @@ # 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'. + 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. @@ -4115,7 +4157,7 @@ break fi ;; - msvisualcpp | msvcmsys) + 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. @@ -4440,6 +4482,7 @@ # 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'. + 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. @@ -4499,7 +4542,7 @@ break fi ;; - msvisualcpp | msvcmsys) + 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. @@ -5164,6 +5207,7 @@ # 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'. + 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. @@ -5223,7 +5267,7 @@ break fi ;; - msvisualcpp | msvcmsys) + 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. @@ -5972,8 +6016,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -6617,6 +6661,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 @@ -6656,7 +6705,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 @@ -7082,7 +7131,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7719,13 +7768,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 @@ -7872,6 +7921,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};"\ @@ -8260,7 +8310,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 @@ -8271,7 +8321,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" @@ -8911,7 +8974,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 @@ -8922,6 +8991,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 : @@ -8954,6 +9024,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 : @@ -8975,7 +9046,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 @@ -9139,7 +9212,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 @@ -9217,6 +9305,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9672,7 +9764,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 @@ -9763,18 +9857,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 @@ -10136,7 +10245,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 @@ -10389,8 +10497,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~ @@ -10770,6 +10877,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' @@ -10815,6 +10923,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 @@ -10843,10 +10952,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 @@ -10859,7 +10964,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 @@ -10898,7 +11003,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 @@ -11522,11 +11626,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -11616,7 +11715,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 @@ -11625,7 +11724,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 @@ -11690,7 +11789,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' @@ -11829,7 +11928,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' @@ -11837,10 +11936,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. @@ -11848,7 +11943,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11866,7 +11961,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11886,7 +11981,7 @@ ;; gnu*) - 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}' @@ -11897,7 +11992,7 @@ ;; 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" @@ -11958,7 +12053,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}' @@ -11974,7 +12069,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 ;; @@ -12011,9 +12106,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - 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}' @@ -12107,7 +12202,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 @@ -12176,7 +12271,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}' @@ -12201,7 +12296,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 @@ -12225,7 +12320,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 @@ -12256,7 +12351,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}' @@ -12266,7 +12361,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 @@ -13191,7 +13286,6 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -13775,6 +13869,7 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`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_CXX='' fi @@ -13819,7 +13914,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -14495,6 +14590,7 @@ case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15284,7 +15380,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -15440,8 +15538,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -15467,7 +15563,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 @@ -15476,7 +15572,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 @@ -15541,7 +15637,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' @@ -15678,7 +15774,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' @@ -15686,10 +15782,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. @@ -15697,7 +15789,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15715,7 +15807,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15735,7 +15827,7 @@ ;; gnu*) - 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}' @@ -15746,7 +15838,7 @@ ;; 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" @@ -15807,7 +15899,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}' @@ -15823,7 +15915,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 ;; @@ -15860,9 +15952,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - 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}' @@ -15956,7 +16048,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 @@ -16025,7 +16117,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}' @@ -16050,7 +16142,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 @@ -16074,7 +16166,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 @@ -16105,7 +16197,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}' @@ -16115,7 +16207,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 @@ -16254,6 +16346,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -16838,6 +16932,22 @@ +# Check whether --enable-documentation was given. +if test "${enable_documentation+set}" = set; then : + enableval=$enable_documentation; +else + enable_documentation=yes +fi + + if test x$enable_documentation = xyes; then + ENABLE_DOCUMENTATION_TRUE= + ENABLE_DOCUMENTATION_FALSE='#' +else + ENABLE_DOCUMENTATION_TRUE='#' + ENABLE_DOCUMENTATION_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which gtk+ version to compile against" >&5 $as_echo_n "checking which gtk+ version to compile against... " >&6; } @@ -16871,7 +16981,7 @@ fi -PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gio-2.0 >= 2.25.9 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0' +PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gio-2.0 >= 2.31.0 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0' PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0" PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libxml-2.0" @@ -17969,14 +18079,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.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.35.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 $as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.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" || @@ -18107,25 +18215,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 $< $@' @@ -18444,7 +18575,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 @@ -19089,6 +19220,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -19272,6 +19407,7 @@ else found_introspection=no fi + enable_introspection=$found_introspection ;; #( *) : as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 @@ -19487,6 +19623,10 @@ as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DOCUMENTATION_TRUE}" && test -z "${ENABLE_DOCUMENTATION_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DOCUMENTATION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_CORBA_TRUE}" && test -z "${HAVE_CORBA_FALSE}"; then as_fn_error $? "conditional \"HAVE_CORBA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19940,7 +20080,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GConf $as_me 3.2.3, which was +This file was extended by GConf $as_me 3.2.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20006,7 +20146,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GConf config.status 3.2.3 +GConf config.status 3.2.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -20146,6 +20286,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"`' @@ -20226,7 +20367,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"`' @@ -20298,7 +20438,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -20340,6 +20479,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -20388,7 +20528,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -20422,7 +20561,6 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -21244,8 +21382,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. @@ -21308,6 +21446,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 @@ -21603,10 +21744,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 @@ -21949,10 +22086,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# 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_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX diff -Nru gconf-3.2.3/configure.in gconf-3.2.4/configure.in --- gconf-3.2.3/configure.in 2011-10-31 15:29:00.000000000 +0000 +++ gconf-3.2.4/configure.in 2012-03-08 16:40:40.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ(2.60) AC_INIT([GConf], - [3.2.3], + [3.2.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=GConf], [GConf]) @@ -139,6 +139,11 @@ GTK_DOC_CHECK([1.0]) +AC_ARG_ENABLE([documentation], + AS_HELP_STRING([--enable-documentation], [enable documentation generated via XSLT]), + [], [enable_documentation=yes]) +AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) + AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])], @@ -163,7 +168,7 @@ [Enable GTK+ support (for gconf-sanity-check) @<:@default=auto@:>@]), , enable_gtk=auto) -PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gio-2.0 >= 2.25.9 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0' +PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gio-2.0 >= 2.31.0 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0' PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0" PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libxml-2.0" diff -Nru gconf-3.2.3/debian/changelog gconf-3.2.4/debian/changelog --- gconf-3.2.3/debian/changelog 2012-03-05 23:30:02.000000000 +0000 +++ gconf-3.2.4/debian/changelog 2012-03-08 20:39:57.000000000 +0000 @@ -1,3 +1,9 @@ +gconf (3.2.4-0ubuntu1) precise; urgency=low + + * New upstream version + + -- Sebastien Bacher Thu, 08 Mar 2012 21:38:45 +0100 + gconf (3.2.3-3ubuntu1) precise; urgency=low * Merge from Debian testing, remaining changes: diff -Nru gconf-3.2.3/defaults/gconf-defaults-glue.h gconf-3.2.4/defaults/gconf-defaults-glue.h --- gconf-3.2.3/defaults/gconf-defaults-glue.h 2011-10-31 15:32:47.000000000 +0000 +++ gconf-3.2.4/defaults/gconf-defaults-glue.h 2012-03-08 17:11:20.000000000 +0000 @@ -10,7 +10,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 gconf-3.2.3/defaults/Makefile.in gconf-3.2.4/defaults/Makefile.in --- gconf-3.2.3/defaults/Makefile.in 2011-10-31 15:30:46.000000000 +0000 +++ gconf-3.2.4/defaults/Makefile.in 2012-03-08 17:10:54.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 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. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -57,8 +57,8 @@ am__DEPENDENCIES_1 = gconf_defaults_mechanism_DEPENDENCIES = \ $(top_builddir)/gconf/libgconf-2.la $(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 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -70,21 +70,21 @@ $(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 = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) 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 = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ 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 = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 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 = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(gconf_defaults_mechanism_SOURCES) DIST_SOURCES = $(gconf_defaults_mechanism_SOURCES) @@ -109,6 +109,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; }; \ + } DATA = $(dbus_conf_DATA) $(dbus_services_DATA) $(polkit_DATA) ETAGS = etags CTAGS = ctags @@ -192,6 +198,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@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ @@ -286,6 +296,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@ @@ -422,7 +434,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -gconf-defaults-mechanism$(EXEEXT): $(gconf_defaults_mechanism_OBJECTS) $(gconf_defaults_mechanism_DEPENDENCIES) +gconf-defaults-mechanism$(EXEEXT): $(gconf_defaults_mechanism_OBJECTS) $(gconf_defaults_mechanism_DEPENDENCIES) $(EXTRA_gconf_defaults_mechanism_DEPENDENCIES) @rm -f gconf-defaults-mechanism$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gconf_defaults_mechanism_OBJECTS) $(gconf_defaults_mechanism_LDADD) $(LIBS) @@ -438,26 +450,23 @@ .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 $< .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 `$(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 $@ $< mostlyclean-libtool: -rm -f *.lo @@ -481,9 +490,7 @@ @$(NORMAL_UNINSTALL) @list='$(dbus_conf_DATA)'; test -n "$(dbus_confdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbus_confdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbus_confdir)" && rm -f $$files + dir='$(DESTDIR)$(dbus_confdir)'; $(am__uninstall_files_from_dir) install-dbus_servicesDATA: $(dbus_services_DATA) @$(NORMAL_INSTALL) test -z "$(dbus_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" @@ -501,9 +508,7 @@ @$(NORMAL_UNINSTALL) @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files + dir='$(DESTDIR)$(dbus_servicesdir)'; $(am__uninstall_files_from_dir) install-polkitDATA: $(polkit_DATA) @$(NORMAL_INSTALL) test -z "$(polkitdir)" || $(MKDIR_P) "$(DESTDIR)$(polkitdir)" @@ -521,9 +526,7 @@ @$(NORMAL_UNINSTALL) @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(polkitdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(polkitdir)" && rm -f $$files + dir='$(DESTDIR)$(polkitdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -626,10 +629,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: diff -Nru gconf-3.2.3/depcomp gconf-3.2.4/depcomp --- gconf-3.2.3/depcomp 2011-10-31 15:30:47.000000000 +0000 +++ gconf-3.2.4/depcomp 2012-03-08 17:10:54.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 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 @@ -44,7 +44,7 @@ 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 . @@ -90,10 +90,18 @@ # 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" + 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 + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## 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" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ rm -f "$tmpdepfile" ;; +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" = 0; then : + else + 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/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + 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 # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$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" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru gconf-3.2.3/doc/gconf/html/ch01.html gconf-3.2.4/doc/gconf/html/ch01.html --- gconf-3.2.3/doc/gconf/html/ch01.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/ch01.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ Using the GConf library - + @@ -21,7 +21,7 @@

-Using the GConf library

+Using the GConf library
GConfClient — GObject-based convenience wrapper diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-backend.html gconf-3.2.4/doc/gconf/html/gconf-gconf-backend.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-backend.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-backend.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ gconf-backend - + @@ -39,16 +39,16 @@

Synopsis

struct              GConfBackendVTable;
                     GConfBackend;
-gchar *             gconf_address_backend               (const gchar *address);
-gchar *             gconf_address_resource              (const gchar *address);
-gchar *             gconf_backend_file                  (const gchar *address);
-GConfBackend *      gconf_get_backend                   (const gchar *address,
-                                                         GError **err);
+gchar *             gconf_address_backend               (const gchar *address);
+gchar *             gconf_address_resource              (const gchar *address);
+gchar *             gconf_backend_file                  (const gchar *address);
+GConfBackend *      gconf_get_backend                   (const gchar *address,
+                                                         GError **err);
 void                gconf_backend_ref                   (GConfBackend *backend);
 void                gconf_backend_unref                 (GConfBackend *backend);
 GConfSource *       gconf_backend_resolve_address       (GConfBackend *backend,
-                                                         const gchar *address,
-                                                         GError **err);
+                                                         const gchar *address,
+                                                         GError **err);
@@ -415,29 +415,29 @@

gconf_address_backend ()

-
gchar *             gconf_address_backend               (const gchar *address);
+
gchar *             gconf_address_backend               (const gchar *address);

gconf_address_resource ()

-
gchar *             gconf_address_resource              (const gchar *address);
+
gchar *             gconf_address_resource              (const gchar *address);

gconf_backend_file ()

-
gchar *             gconf_backend_file                  (const gchar *address);
+
gchar *             gconf_backend_file                  (const gchar *address);

gconf_get_backend ()

-
GConfBackend *      gconf_get_backend                   (const gchar *address,
-                                                         GError **err);
+
GConfBackend *      gconf_get_backend                   (const gchar *address,
+                                                         GError **err);

@@ -459,8 +459,8 @@

gconf_backend_resolve_address ()

GConfSource *       gconf_backend_resolve_address       (GConfBackend *backend,
-                                                         const gchar *address,
-                                                         GError **err);
+ const gchar *address, + GError **err);

diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-changeset.html gconf-3.2.4/doc/gconf/html/gconf-gconf-changeset.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-changeset.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-changeset.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GConfChangeSet - + @@ -38,75 +38,75 @@

Synopsis

                    GConfChangeSet;
 void                (*GConfChangeSetForeachFunc)        (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value,
-                                                         gpointer user_data);
-gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
+                                                         gpointer user_data);
+gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);
+                                                         gboolean remove_committed,
+                                                         GError **err);
 GConfChangeSet *    gconf_engine_reverse_change_set     (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+                                                         GError **err);
 GConfChangeSet *    gconf_engine_change_set_from_currentv
                                                         (GConfEngine *conf,
-                                                         const gchar **keys,
-                                                         GError **err);
+                                                         const gchar **keys,
+                                                         GError **err);
 GConfChangeSet *    gconf_engine_change_set_from_current
                                                         (GConfEngine *conf,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);
 GConfChangeSet *    gconf_change_set_new                (void);
 GConfChangeSet *    gconf_change_set_ref                (GConfChangeSet *cs);
 void                gconf_change_set_unref              (GConfChangeSet *cs);
 void                gconf_change_set_clear              (GConfChangeSet *cs);
-guint               gconf_change_set_size               (GConfChangeSet *cs);
+guint               gconf_change_set_size               (GConfChangeSet *cs);
 void                gconf_change_set_remove             (GConfChangeSet *cs,
-                                                         const gchar *key);
+                                                         const gchar *key);
 void                gconf_change_set_foreach            (GConfChangeSet *cs,
                                                          GConfChangeSetForeachFunc func,
-                                                         gpointer user_data);
-gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         gpointer user_data);
+gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue **value_retloc);
 void                gconf_change_set_set                (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);
 void                gconf_change_set_set_nocopy         (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);
 void                gconf_change_set_unset              (GConfChangeSet *cs,
-                                                         const gchar *key);
+                                                         const gchar *key);
 void                gconf_change_set_set_float          (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gdouble val);
+                                                         const gchar *key,
+                                                         gdouble val);
 void                gconf_change_set_set_int            (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gint val);
+                                                         const gchar *key,
+                                                         gint val);
 void                gconf_change_set_set_string         (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         const gchar *val);
+                                                         const gchar *key,
+                                                         const gchar *val);
 void                gconf_change_set_set_bool           (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gboolean val);
+                                                         const gchar *key,
+                                                         gboolean val);
 void                gconf_change_set_set_schema         (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfSchema *val);
 void                gconf_change_set_set_list           (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list);
+                                                         GSList *list);
 void                gconf_change_set_set_pair           (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr);
+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr);
 void                gconf_change_set_set_user_data      (GConfChangeSet *cs,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
-gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);
+                                                         gpointer data,
+                                                         GDestroyNotify dnotify);
+gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);
@@ -144,9 +144,9 @@

GConfChangeSetForeachFunc ()

void                (*GConfChangeSetForeachFunc)        (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value,
-                                                         gpointer user_data);
+ gpointer user_data);

The type of a function passed to gconf_change_set_foreach(). The cs argument is the GConfChangeSet you're iterating over. key is @@ -179,10 +179,10 @@

gconf_engine_commit_change_set ()

-
gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
+
gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);

+                                                         gboolean remove_committed,
+                                                         GError **err);

Applies the changes in the change set to the GConfEngine passed as the first argument. If remove_committed is TRUE, @@ -215,7 +215,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -230,7 +230,7 @@

gconf_engine_reverse_change_set ()

GConfChangeSet *    gconf_engine_reverse_change_set     (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+ GError **err);

Creates a change set that would reverse cs. That is, for each change in cs, save the current state of that key in the returned change set. @@ -248,7 +248,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -262,8 +262,8 @@

gconf_engine_change_set_from_currentv ()

GConfChangeSet *    gconf_engine_change_set_from_currentv
                                                         (GConfEngine *conf,
-                                                         const gchar **keys,
-                                                         GError **err);
+ const gchar **keys, + GError **err);

Creates a change set that will change the keys in NULLterminated array keys to their current state. @@ -282,7 +282,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -296,8 +296,8 @@

gconf_engine_change_set_from_current ()

GConfChangeSet *    gconf_engine_change_set_from_current
                                                         (GConfEngine *conf,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);

Convenient Varags version of gconf_engine_change_set_from_current(). @@ -311,7 +311,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

first_key :

@@ -396,9 +396,9 @@

gconf_change_set_size ()

-
guint               gconf_change_set_size               (GConfChangeSet *cs);
+
guint               gconf_change_set_size               (GConfChangeSet *cs);

-Returns the size of the changeset, a guint value. +Returns the size of the changeset, a guint value.

@@ -409,7 +409,7 @@ - +

Returns :

the size, a guint value.the size, a guint value.
@@ -418,7 +418,7 @@

gconf_change_set_remove ()

void                gconf_change_set_remove             (GConfChangeSet *cs,
-                                                         const gchar *key);
+ const gchar *key);

Removes a change from a GConfChangeSet. The key given as the key argument will not be modified if this change set is committed. @@ -443,7 +443,7 @@

gconf_change_set_foreach ()

void                gconf_change_set_foreach            (GConfChangeSet *cs,
                                                          GConfChangeSetForeachFunc func,
-                                                         gpointer user_data);
+ gpointer user_data);

Iterates over a GConfChangeSet by calling a GConfChangeSetForeachFunc for each change in the set. See the @@ -473,8 +473,8 @@

gconf_change_set_check_value ()

-
gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
-                                                         const gchar *key,
+
gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue **value_retloc);

 

 Looks up the hash table associated with the GConfChangeSet for the key key. If the key
@@ -507,7 +507,7 @@
 

 
gconf_change_set_set ()

 
void                gconf_change_set_set                (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);

 

 Adds a "set" operation to a change set. This function is similar to
@@ -536,7 +536,7 @@
 

 
gconf_change_set_set_nocopy ()

 
void                gconf_change_set_set_nocopy         (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);

 

 Like gconf_change_set_set(), except that the GConfChangeSet takes
@@ -566,7 +566,7 @@
 

 
gconf_change_set_unset ()

 
void                gconf_change_set_unset              (GConfChangeSet *cs,
-                                                         const gchar *key);

+                                                         const gchar *key);

Adds an "unset" operation to a GConfChangeSet. This function schedules a gconf_engine_unset(). @@ -589,10 +589,10 @@

gconf_change_set_set_float ()

void                gconf_change_set_set_float          (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gdouble val);
+ const gchar *key, + gdouble val);

-Adds a "set" operation; takes a gdouble argument, so you can avoid +Adds a "set" operation; takes a gdouble argument, so you can avoid creating a GConfValue.

@@ -617,10 +617,10 @@

gconf_change_set_set_int ()

void                gconf_change_set_set_int            (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gint val);
+ const gchar *key, + gint val);

-Adds a "set" operation; takes a gint argument, so you can avoid +Adds a "set" operation; takes a gint argument, so you can avoid creating a GConfValue.

@@ -645,10 +645,10 @@

gconf_change_set_set_string ()

void                gconf_change_set_set_string         (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         const gchar *val);
+ const gchar *key, + const gchar *val);

-Adds a "set" operation; takes a gchar* argument, so you can avoid +Adds a "set" operation; takes a gchar* argument, so you can avoid creating a GConfValue.

@@ -673,10 +673,10 @@

gconf_change_set_set_bool ()

void                gconf_change_set_set_bool           (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gboolean val);
+ const gchar *key, + gboolean val);

-Adds a "set" operation; takes a gboolean argument, so you can avoid +Adds a "set" operation; takes a gboolean argument, so you can avoid creating a GConfValue.

@@ -701,7 +701,7 @@

gconf_change_set_set_schema ()

void                gconf_change_set_set_schema         (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfSchema *val);

Adds a "set" operation; takes a GConfSchema argument, so you can @@ -730,11 +730,11 @@

gconf_change_set_set_list ()

void                gconf_change_set_set_list           (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list);
+ GSList *list);

-Adds a "set" operation; takes a GList argument and the type of the +Adds a "set" operation; takes a GList argument and the type of the list, so you can avoid creating a GConfValue. This results in the list of values being set for the key.

@@ -755,7 +755,7 @@
- +

list :

a GList containing the values to be set.a GList containing the values to be set.
@@ -764,11 +764,11 @@

gconf_change_set_set_pair ()

void                gconf_change_set_set_pair           (GConfChangeSet *cs,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr);
+ gconstpointer address_of_car, + gconstpointer address_of_cdr);

Adds a "set" operation; takes a pointer to the addresses of the pair of values, so you can avoid creating a GConfValue. This results in @@ -808,8 +808,8 @@

gconf_change_set_set_user_data ()

void                gconf_change_set_set_user_data      (GConfChangeSet *cs,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
+ gpointer data, + GDestroyNotify dnotify);

Sets the user_data and the destroy notification function fields of the GConfChangeSet. @@ -823,7 +823,7 @@

data :

-a gpointer. +a gpointer.

dnotify :

@@ -835,7 +835,7 @@

gconf_change_set_get_user_data ()

-
gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);
+
gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);

Returns the user_data field of the GConfChangeSet.

diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-client.html gconf-3.2.4/doc/gconf/html/gconf-gconf-client.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-client.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-client.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GConfClient - + @@ -40,29 +40,29 @@ 
enum                GConfClientPreloadType;
 enum                GConfClientErrorHandlingMode;
 void                (*GConfClientNotifyFunc)            (GConfClient *client,
-                                                         guint cnxn_id,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                (*GConfClientErrorHandlerFunc)      (GConfClient *client,
-                                                         GError *error);
+                                                         GError *error);
 #define             GCONF_CLIENT                        (obj)
 GConfClient *       gconf_client_get_default            (void);
 GConfClient *       gconf_client_get_for_engine         (GConfEngine *engine);
 void                gconf_client_add_dir                (GConfClient *client,
-                                                         const gchar *dir,
+                                                         const gchar *dir,
                                                          GConfClientPreloadType preload,
-                                                         GError **err);
+                                                         GError **err);
 void                gconf_client_remove_dir             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
-guint               gconf_client_notify_add             (GConfClient *client,
-                                                         const gchar *namespace_section,
+                                                         const gchar *dir,
+                                                         GError **err);
+guint               gconf_client_notify_add             (GConfClient *client,
+                                                         const gchar *namespace_section,
                                                          GConfClientNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GFreeFunc destroy_notify,
-                                                         GError **err);
+                                                         gpointer user_data,
+                                                         GFreeFunc destroy_notify,
+                                                         GError **err);
 void                gconf_client_notify_remove          (GConfClient *client,
-                                                         guint cnxn);
+                                                         guint cnxn);
 void                gconf_client_notify                 (GConfClient *client,
                                                          const char *key);
 void                gconf_client_set_error_handling     (GConfClient *client,
@@ -71,129 +71,129 @@
                                                         (GConfClientErrorHandlerFunc func);
 void                gconf_client_clear_cache            (GConfClient *client);
 void                gconf_client_preload                (GConfClient *client,
-                                                         const gchar *dirname,
+                                                         const gchar *dirname,
                                                          GConfClientPreloadType type,
-                                                         GError **err);
+                                                         GError **err);
 void                gconf_client_set                    (GConfClient *client,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          const GConfValue *val,
-                                                         GError **err);
+                                                         GError **err);
 GConfValue *        gconf_client_get                    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         GError **err);
 GConfValue *        gconf_client_get_without_default    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         GError **err);
 GConfEntry *        gconf_client_get_entry              (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         GError **err);
 GConfValue *        gconf_client_get_default_from_schema
                                                         (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_client_unset                  (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_client_recursive_unset        (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_client_unset                  (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_client_recursive_unset        (GConfClient *client,
                                                          const char *key,
                                                          GConfUnsetFlags flags,
-                                                         GError **err);
-GSList *            gconf_client_all_entries            (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
-GSList *            gconf_client_all_dirs               (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+                                                         GError **err);
+GSList *            gconf_client_all_entries            (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);
+GSList *            gconf_client_all_dirs               (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);
 void                gconf_client_suggest_sync           (GConfClient *client,
-                                                         GError **err);
-gboolean            gconf_client_dir_exists             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
-gboolean            gconf_client_key_is_writable        (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gdouble             gconf_client_get_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gint                gconf_client_get_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gchar *             gconf_client_get_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_client_get_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         GError **err);
+gboolean            gconf_client_dir_exists             (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);
+gboolean            gconf_client_key_is_writable        (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gdouble             gconf_client_get_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gint                gconf_client_get_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gchar *             gconf_client_get_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_client_get_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);
 GConfSchema *       gconf_client_get_schema             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
-GSList *            gconf_client_get_list               (GConfClient *client,
-                                                         const gchar *key,
+                                                         const gchar *key,
+                                                         GError **err);
+GSList *            gconf_client_get_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);
-gboolean            gconf_client_get_pair               (GConfClient *client,
-                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_client_get_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
-gboolean            gconf_client_set_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
-gboolean            gconf_client_set_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
-gboolean            gconf_client_set_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
-gboolean            gconf_client_set_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
-gboolean            gconf_client_set_schema             (GConfClient *client,
-                                                         const gchar *key,
+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);
+gboolean            gconf_client_set_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);
+gboolean            gconf_client_set_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);
+gboolean            gconf_client_set_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);
+gboolean            gconf_client_set_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);
+gboolean            gconf_client_set_schema             (GConfClient *client,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);
-gboolean            gconf_client_set_list               (GConfClient *client,
-                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_client_set_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
-gboolean            gconf_client_set_pair               (GConfClient *client,
-                                                         const gchar *key,
+                                                         GSList *list,
+                                                         GError **err);
+gboolean            gconf_client_set_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr,
+                                                         GError **err);
 void                gconf_client_error                  (GConfClient *client,
-                                                         GError *error);
+                                                         GError *error);
 void                gconf_client_unreturned_error       (GConfClient *client,
-                                                         GError *error);
+                                                         GError *error);
 void                gconf_client_value_changed          (GConfClient *client,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);
-gboolean            gconf_client_commit_change_set      (GConfClient *client,
+gboolean            gconf_client_commit_change_set      (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);
+                                                         gboolean remove_committed,
+                                                         GError **err);
 GConfChangeSet *    gconf_client_reverse_change_set     (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+                                                         GError **err);
 GConfChangeSet *    gconf_client_change_set_from_currentv
                                                         (GConfClient *client,
-                                                         const gchar **keys,
-                                                         GError **err);
+                                                         const gchar **keys,
+                                                         GError **err);
 GConfChangeSet *    gconf_client_change_set_from_current
                                                         (GConfClient *client,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);
@@ -225,7 +225,7 @@ gconf_client_get_default(), there is no (legitimate) way to obtain a pointer to the underlying GConfEngine. If you create a GConfClient from an existing engine, you'll have to be disciplined enough to avoid using that engine directly. -[1] +[1]

@@ -238,12 +238,12 @@

There are two error-related signals in GConfClient. The first is plain "error"; it's emitted anytime an error occurs. The second is "unreturned_error"; this -signal is emitted if you pass NULL as the GError** to any +signal is emitted if you pass NULL as the GError** to any GConfClient function. The idea is that you can have a global error handler attached to the "unreturned_error" signal; if you want to use this handler, you don't need to use the normal GConf error handling mechanism. However, if you ever need to handle errors for a specific function call, you can override the -global handler by passing a non-NULL GError** to the +global handler by passing a non-NULL GError** to the function. If you want an error handler that's always invoked, use the "error" signal.

@@ -351,7 +351,7 @@ unreturned errors are handled, or all errors are handled with this enumeration. You can prevent specific errors from being handled automatically by stopping the signal emission before the default signal handler is called (see the GLib -documentation, g_signal_stop_emission_by_name() for example). +documentation, g_signal_stop_emission_by_name() for example).

@@ -378,9 +378,9 @@

GConfClientNotifyFunc ()

void                (*GConfClientNotifyFunc)            (GConfClient *client,
-                                                         guint cnxn_id,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
+ gpointer user_data);

This is the signature of a user function added with gconf_client_notify_add(). The notify function is invoked when the value of a key changes. The entry @@ -415,7 +415,7 @@

GConfClientErrorHandlerFunc ()

void                (*GConfClientErrorHandlerFunc)      (GConfClient *client,
-                                                         GError *error);
+ GError *error);

This is the signature of a user function which needs to be called for error handling. @@ -429,7 +429,7 @@

- +

error :

the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.
@@ -461,13 +461,13 @@ with the reference count incremented. So you have to unref either way.

-It's important to call g_type_init() before using this GObject, to initialize the type system. +It's important to call g_type_init() before using this GObject, to initialize the type system.

-

Returns :

a new GConfClient. g_object_unref() when you're done. [transfer full] +a new GConfClient. g_object_unref() when you're done. [transfer full]
@@ -479,7 +479,7 @@

Creates a new GConfClient with a specific GConfEngine. Only specialized configuration-related programs should need to call this function. The -returned GConfClient should be unref'd when you're done with g_object_unref(). +returned GConfClient should be unref'd when you're done with g_object_unref(). Remember to avoid using the GConfEngine directly once you have a GConfClient wrapper.

@@ -502,9 +502,9 @@

gconf_client_add_dir ()

void                gconf_client_add_dir                (GConfClient *client,
-                                                         const gchar *dir,
+                                                         const gchar *dir,
                                                          GConfClientPreloadType preload,
-                                                         GError **err);
+ GError **err);

Add a directory to the list of directories the GConfClient will watch. Any changes to keys below this directory will cause the "value_changed" signal to be @@ -535,7 +535,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -544,8 +544,8 @@

gconf_client_remove_dir ()

void                gconf_client_remove_dir             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+ const gchar *dir, + GError **err);

Remove a directory from the list created with gconf_client_add_dir(). If any notifications have been added below this directory with @@ -566,7 +566,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -574,12 +574,12 @@

gconf_client_notify_add ()

-
guint               gconf_client_notify_add             (GConfClient *client,
-                                                         const gchar *namespace_section,
+
guint               gconf_client_notify_add             (GConfClient *client,
+                                                         const gchar *namespace_section,
                                                          GConfClientNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GFreeFunc destroy_notify,
-                                                         GError **err);

+                                                         gpointer user_data,
+                                                         GFreeFunc destroy_notify,
+                                                         GError **err);

Request notification of changes to namespace_section. This includes the key namespace_section itself, and any keys below it (the behavior is identical to @@ -631,7 +631,7 @@

gconf_client_notify_remove ()

void                gconf_client_notify_remove          (GConfClient *client,
-                                                         guint cnxn);
+ guint cnxn);

Remove a notification using the ID returned from gconf_client_notify_add(). Invokes the destroy notify function on the @@ -736,9 +736,9 @@

gconf_client_preload ()

void                gconf_client_preload                (GConfClient *client,
-                                                         const gchar *dirname,
+                                                         const gchar *dirname,
                                                          GConfClientPreloadType type,
-                                                         GError **err);
+ GError **err);

Preloads a directory. Normally you do this when you call gconf_client_add_dir(), but if you've called gconf_client_clear_cache() there may be a reason to do it @@ -761,7 +761,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -770,9 +770,9 @@

gconf_client_set ()

void                gconf_client_set                    (GConfClient *client,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          const GConfValue *val,
-                                                         GError **err);
+ GError **err);

Sets the value of a configuration key. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. The val argument will not be @@ -795,7 +795,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -804,8 +804,8 @@

gconf_client_get ()

GConfValue *        gconf_client_get                    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Gets the value of a configuration key. Just like gconf_engine_get(), but uses GConfClient caching and error-handling features. @@ -823,7 +823,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -836,8 +836,8 @@

gconf_client_get_without_default ()

GConfValue *        gconf_client_get_without_default    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Gets the value of a configuration key. Just like gconf_client_get() but doesn't look for a default value if the key is unset.

@@ -854,7 +854,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -867,10 +867,10 @@

gconf_client_get_entry ()

GConfEntry *        gconf_client_get_entry              (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
+ const gchar *key, + const gchar *locale, + gboolean use_schema_default, + GError **err);

Obtains the full GConfEntry for a value. Just like gconf_engine_get_entry(), but uses GConfClient caching and error-handling features.

@@ -895,7 +895,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -909,8 +909,8 @@

gconf_client_get_default_from_schema ()

GConfValue *        gconf_client_get_default_from_schema
                                                         (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Returns the default value stored in the key's schema, if the key has a schema associated and the schema exists and the schema contains a default value. Note @@ -933,7 +933,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -945,9 +945,9 @@

gconf_client_unset ()

-
gboolean            gconf_client_unset                  (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_unset                  (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Unsets the value of key; if key is already unset, has no effect. An error of note is GCONF_OVERRIDDEN, indicating that the system @@ -967,7 +967,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -980,10 +980,10 @@

gconf_client_recursive_unset ()

-
gboolean            gconf_client_recursive_unset        (GConfClient *client,
+
gboolean            gconf_client_recursive_unset        (GConfClient *client,
                                                          const char *key,
                                                          GConfUnsetFlags flags,
-                                                         GError **err);

+                                                         GError **err);

Unsets all keys below key, including key itself. If any unset fails, continues on to unset as much as it can. The first failure is returned in err. Just like gconf_engine_recursive_unset(), @@ -1006,7 +1006,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1020,16 +1020,16 @@

gconf_client_all_entries ()

-
GSList *            gconf_client_all_entries            (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList *            gconf_client_all_entries            (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the key-value pairs in dir. Does not list subdirectories; for that use gconf_client_all_dirs(). The returned list contains GConfEntry objects. A GConfEntry contains an absolute key and a value. The list is not recursive, it contains only the immediate children of dir. To free the returned list, gconf_entry_free() -each list element, then g_slist_free() the list itself. +each list element, then g_slist_free() the list itself. Just like gconf_engine_all_entries(), but uses GConfClient caching and error-handling features.

@@ -1045,7 +1045,7 @@ - + @@ -1058,14 +1058,14 @@

gconf_client_all_dirs ()

-
GSList *            gconf_client_all_dirs               (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList *            gconf_client_all_dirs               (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the subdirectories in dir. The returned list contains allocated strings. Each string is the absolute path of a -subdirectory. You should g_free() each string in the list, then -g_slist_free() the list itself. Just like gconf_engine_all_dirs(), +subdirectory. You should g_free() each string in the list, then +g_slist_free() the list itself. Just like gconf_engine_all_dirs(), but uses GConfClient caching and error-handling features.

err :

the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.

Returns :
@@ -1081,7 +1081,7 @@ - + @@ -1095,7 +1095,7 @@

gconf_client_suggest_sync ()

void                gconf_client_suggest_sync           (GConfClient *client,
-                                                         GError **err);
+ GError **err);

Suggests to gconfd that you've just finished a block of changes, and it would be an optimal time to sync to @@ -1115,7 +1115,7 @@

- +

err :

the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.

Returns :

err :

the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.
@@ -1123,9 +1123,9 @@

gconf_client_dir_exists ()

-
gboolean            gconf_client_dir_exists             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
gboolean            gconf_client_dir_exists             (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Queries whether the directory dir exists in the GConf database. Returns TRUE or FALSE. @@ -1144,7 +1144,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1157,9 +1157,9 @@

gconf_client_key_is_writable ()

-
gboolean            gconf_client_key_is_writable        (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_key_is_writable        (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Checks whether the key is writable.

@@ -1176,7 +1176,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1189,9 +1189,9 @@

gconf_client_get_float ()

-
gdouble             gconf_client_get_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gdouble             gconf_client_get_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the floating point number (GCONF_VALUE_FLOAT) stored at key. Automatically performs type-checking, so if a non-float is @@ -1212,7 +1212,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1224,9 +1224,9 @@

gconf_client_get_int ()

-
gint                gconf_client_get_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gint                gconf_client_get_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the integer (GCONF_VALUE_INT) stored at key. Automatically performs type-checking, so if a non-integer is @@ -1247,7 +1247,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1259,9 +1259,9 @@

gconf_client_get_string ()

-
gchar *             gconf_client_get_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gchar *             gconf_client_get_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the string (GCONF_VALUE_STRING) stored at key. Automatically performs type-checking, so if a non-string is @@ -1282,7 +1282,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1294,9 +1294,9 @@

gconf_client_get_bool ()

-
gboolean            gconf_client_get_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_get_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the boolean value (GCONF_VALUE_BOOL) stored at key. Automatically performs type-checking, so if a non-bool is @@ -1317,7 +1317,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1330,8 +1330,8 @@

gconf_client_get_schema ()

GConfSchema *       gconf_client_get_schema             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Requests the schema (GCONF_VALUE_SCHEMA) stored at key. Automatically performs type-checking, so if a non-schema is stored at @@ -1352,7 +1352,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1364,10 +1364,10 @@

gconf_client_get_list ()

-
GSList *            gconf_client_get_list               (GConfClient *client,
-                                                         const gchar *key,
+
GSList *            gconf_client_get_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);

+                                                         GError **err);

Requests the list (GCONF_VALUE_LIST) stored at key. Automatically performs type-checking, so if a non-list is stored at key, or the @@ -1399,22 +1399,22 @@ GCONF_VALUE_INT -The integer itself, converted with GINT_TO_POINTER() +The integer itself, converted with GINT_TO_POINTER() GCONF_VALUE_BOOL -The bool itself, converted with GINT_TO_POINTER() +The bool itself, converted with GINT_TO_POINTER() GCONF_VALUE_FLOAT -A pointer to gdouble, which should be freed with g_free() +A pointer to gdouble, which should be freed with g_free() GCONF_VALUE_STRING -A pointer to gchar, which should be freed with g_free() +A pointer to gchar, which should be freed with g_free() @@ -1427,9 +1427,9 @@

In the GCONF_VALUE_FLOAT and GCONF_VALUE_STRING cases, you must -g_free() each list element. In the GCONF_VALUE_SCHEMA case you must +g_free() each list element. In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() each element. In all cases you must free the -list itself with g_slist_free(). +list itself with g_slist_free().

Just like gconf_engine_get_list(), but uses GConfClient caching and error-handling features. @@ -1451,7 +1451,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1463,13 +1463,13 @@

gconf_client_get_pair ()

-
gboolean            gconf_client_get_pair               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_get_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);

+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);

Requests the pair (GCONF_VALUE_PAIR) stored at key. Automatically performs type-checking, so if a non-pair is stored at key, or the @@ -1496,22 +1496,22 @@ GCONF_VALUE_INT -pointer to gint +pointer to gint GCONF_VALUE_BOOL -pointer to gboolean +pointer to gboolean GCONF_VALUE_FLOAT -pointer to gdouble +pointer to gdouble GCONF_VALUE_STRING -pointer to gchar* +pointer to gchar* GCONF_VALUE_SCHEMA @@ -1520,7 +1520,7 @@

-In the GCONF_VALUE_STRING case, you must g_free() the string(s) +In the GCONF_VALUE_STRING case, you must g_free() the string(s) stored in the return location(s). In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() the returned schema. If there's an error or the value is unset, car_retloc and cdr_retloc are left unchanged. @@ -1587,7 +1587,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1600,10 +1600,10 @@

gconf_client_set_float ()

-
gboolean            gconf_client_set_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
+
gboolean            gconf_client_set_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a float (GCONF_VALUE_FLOAT), gconf_client_set_float() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -1625,7 +1625,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1638,10 +1638,10 @@

gconf_client_set_int ()

-
gboolean            gconf_client_set_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
+
gboolean            gconf_client_set_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store an integer (GCONF_VALUE_INT), gconf_client_set_int() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -1663,7 +1663,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1676,10 +1676,10 @@

gconf_client_set_string ()

-
gboolean            gconf_client_set_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
+
gboolean            gconf_client_set_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a string (GCONF_VALUE_STRING), gconf_client_set_string() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -1701,7 +1701,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1714,10 +1714,10 @@

gconf_client_set_bool ()

-
gboolean            gconf_client_set_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
+
gboolean            gconf_client_set_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but but doesn't store a boolean (GCONF_VALUE_BOOL), gconf_client_set_bool() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -1739,7 +1739,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1752,10 +1752,10 @@

gconf_client_set_schema ()

-
gboolean            gconf_client_set_schema             (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_schema             (GConfClient *client,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);

+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a schema value (GCONF_VALUE_SCHEMA), gconf_client_set_schema() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -1777,7 +1777,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1790,11 +1790,11 @@

gconf_client_set_list ()

-
gboolean            gconf_client_set_list               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);

+                                                         GSList *list,
+                                                         GError **err);

Changes the value of key to a list of type list_type. Automatically creates the key if it didn't exist before (ie it was unset or it had a default value). If the key already exists but doesn't store a list value @@ -1821,7 +1821,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1834,13 +1834,13 @@

gconf_client_set_pair ()

-
gboolean            gconf_client_set_pair               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);

+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr,
+                                                         GError **err);

Changes the value of key to a pair with the first field of type car_type and the second field of type cdr_type. Automatically creates the key if it didn't exist before (ie it was unset or it had a default value). If the key @@ -1875,7 +1875,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -1889,7 +1889,7 @@

gconf_client_error ()

void                gconf_client_error                  (GConfClient *client,
-                                                         GError *error);
+ GError *error);

Emits the "error" signal. Rarely useful.

@@ -1911,7 +1911,7 @@

gconf_client_unreturned_error ()

void                gconf_client_unreturned_error       (GConfClient *client,
-                                                         GError *error);
+ GError *error);

Emits the "unreturned_error" signal. Rarely useful.

@@ -1933,7 +1933,7 @@

gconf_client_value_changed ()

void                gconf_client_value_changed          (GConfClient *client,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          GConfValue *value);

Emits the "value_changed" signal. Rarely useful. @@ -1959,10 +1959,10 @@

gconf_client_commit_change_set ()

-
gboolean            gconf_client_commit_change_set      (GConfClient *client,
+
gboolean            gconf_client_commit_change_set      (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);

+                                                         gboolean remove_committed,
+                                                         GError **err);

Applies the changes in the change set to the GConfClient passed as the first argument. If remove_committed is TRUE, @@ -1995,7 +1995,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -2010,7 +2010,7 @@

gconf_client_reverse_change_set ()

GConfChangeSet *    gconf_client_reverse_change_set     (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+ GError **err);

Creates a change set that would reverse cs. That is, for each change in cs, save the current state of that key in the returned change set. @@ -2028,7 +2028,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -2042,8 +2042,8 @@

gconf_client_change_set_from_currentv ()

GConfChangeSet *    gconf_client_change_set_from_currentv
                                                         (GConfClient *client,
-                                                         const gchar **keys,
-                                                         GError **err);
+ const gchar **keys, + GError **err);

Creates a change set that will change the keys in NULL-terminated array keys to their current state. Use this to @@ -2064,7 +2064,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -2078,8 +2078,8 @@

gconf_client_change_set_from_current ()

GConfChangeSet *    gconf_client_change_set_from_current
                                                         (GConfClient *client,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);

Convenient varargs version of gconf_client_change_set_from_currentv(). @@ -2093,7 +2093,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

first_key :

@@ -2109,7 +2109,7 @@

-

[1] +

[1] This is all a white lie; some direct GConfEngine operations are safe. But it's complicated to know which, and if an operation isn't safe the resulting bugs will mangle the cache and cause weird bugs at an diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-engine.html gconf-3.2.4/doc/gconf/html/gconf-gconf-engine.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-engine.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-engine.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GConfEngine - + @@ -39,21 +39,21 @@

Synopsis

                    GConfEngine;
 GConfEngine *       gconf_engine_get_default            (void);
-GConfEngine *       gconf_engine_get_for_address        (const gchar *address,
-                                                         GError **err);
-GConfEngine *       gconf_engine_get_for_addresses      (GSList *addresses,
-                                                         GError **err);
+GConfEngine *       gconf_engine_get_for_address        (const gchar *address,
+                                                         GError **err);
+GConfEngine *       gconf_engine_get_for_addresses      (GSList *addresses,
+                                                         GError **err);
 void                gconf_engine_unref                  (GConfEngine *conf);
 void                gconf_engine_ref                    (GConfEngine *conf);
 GConfEngine *       gconf_engine_get_local              (const char *address,
-                                                         GError **err);
+                                                         GError **err);
 GConfEngine *       gconf_engine_get_local_for_addresses
-                                                        (GSList *addresses,
-                                                         GError **err);
+                                                        (GSList *addresses,
+                                                         GError **err);
 void                gconf_engine_set_user_data          (GConfEngine *engine,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
-gpointer            gconf_engine_get_user_data          (GConfEngine *engine);
+                                                         gpointer data,
+                                                         GDestroyNotify dnotify);
+gpointer            gconf_engine_get_user_data          (GConfEngine *engine);
@@ -105,8 +105,8 @@

gconf_engine_get_for_address ()

-
GConfEngine *       gconf_engine_get_for_address        (const gchar *address,
-                                                         GError **err);
+
GConfEngine *       gconf_engine_get_for_address        (const gchar *address,
+                                                         GError **err);

Obtains a special GConfEngine; mostly useful for specialized GConf-related tools. Normal clients shouldn't need to use it. @@ -122,7 +122,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -134,8 +134,8 @@

gconf_engine_get_for_addresses ()

-
GConfEngine *       gconf_engine_get_for_addresses      (GSList *addresses,
-                                                         GError **err);
+
GConfEngine *       gconf_engine_get_for_addresses      (GSList *addresses,
+                                                         GError **err);

Similar to gconf_engine_get_for_address() , but takes a list of addresses instead of a single address. @@ -149,7 +149,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -194,7 +194,7 @@

gconf_engine_get_local ()

GConfEngine *       gconf_engine_get_local              (const char *address,
-                                                         GError **err);
+ GError **err);

Obtain a local (non-process-transparent) GConfEngine. Local engines do not support notification, and can only access config databases @@ -210,7 +210,7 @@

err :

-return location of an allocated GError. +return location of an allocated GError.

Returns :

@@ -223,8 +223,8 @@

gconf_engine_get_local_for_addresses ()

GConfEngine *       gconf_engine_get_local_for_addresses
-                                                        (GSList *addresses,
-                                                         GError **err);
+ (GSList *addresses, + GError **err);

Obtains a local GConfEngine similar to gconf_engine_get_local(). Instead of taking the address of the local database, this function takes @@ -239,7 +239,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

Returns :

@@ -253,8 +253,8 @@

gconf_engine_set_user_data ()

void                gconf_engine_set_user_data          (GConfEngine *engine,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
+ gpointer data, + GDestroyNotify dnotify);

Sets the user_data and the destroy notification function fields of a GConfEngine.

@@ -267,7 +267,7 @@

data :

-a gpointer. +a gpointer.

dnotify :

@@ -279,7 +279,7 @@

gconf_engine_get_user_data ()

-
gpointer            gconf_engine_get_user_data          (GConfEngine *engine);
+
gpointer            gconf_engine_get_user_data          (GConfEngine *engine);

Returns the user_data field of a GConfEngine.

diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-error.html gconf-3.2.4/doc/gconf/html/gconf-gconf-error.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-error.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-error.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GError - + @@ -38,28 +38,28 @@

Synopsis

enum                GConfError;
-GError *            gconf_error_new                     (GConfError en,
-                                                         const gchar *format,
+GError *            gconf_error_new                     (GConfError en,
+                                                         const gchar *format,
                                                          ...);
-GQuark              gconf_error_quark                   (void);
-void                gconf_set_error                     (GError **err,
+GQuark              gconf_error_quark                   (void);
+void                gconf_set_error                     (GError **err,
                                                          GConfError en,
-                                                         const gchar *format,
+                                                         const gchar *format,
                                                          ...);
-GError *            gconf_compose_errors                (GError *err1,
-                                                         GError *err2);
+GError *            gconf_compose_errors                (GError *err1,
+                                                         GError *err2);

Description

-The GError object is used to report errors that occur in GConf +The GError object is used to report errors that occur in GConf library routines. All functions that report errors work the same way:

  • -The last argument to the function is a GError**, a pointer to a -location where a GError* can be placed. +The last argument to the function is a GError**, a pointer to a +location where a GError* can be placed.

  • This last argument may be NULL, in which case no @@ -67,13 +67,13 @@

  • If non-NULL, the argument should be the address of a -GError* variable, which should be initialized to +GError* variable, which should be initialized to NULL.

  • -If an error occurs, a GError will be allocated and placed in the -return location; the caller must free the GError with -g_error_free(). If no error occurs, the return location will be +If an error occurs, a GError will be allocated and placed in the +return location; the caller must free the GError with +g_error_free(). If no error occurs, the return location will be left untouched. That is, the test error != NULL should always be a reliable indicator of whether the operation failed.

    • @@ -86,13 +86,13 @@ on success. In some cases, a NULL return value indicates failure. Either way, if the return value indicates failure and you passed a non-NULL value for the last argument -to the function, a GError will be returned. If the return value -indicates success, then a GError will never be returned. These +to the function, a GError will be returned. If the return value +indicates success, then a GError will never be returned. These relationships are guaranteed; that is, you can reliably use the return -value to decide whether a GError was placed in the return +value to decide whether a GError was placed in the return location. If a function does not indicate success/failure by return value, you must check whether the -GError is NULL to detect errors. +GError is NULL to detect errors.

    Here's a short error handling example: @@ -146,7 +146,7 @@

    GCONF_ERROR_SUCCESS

    -indicates that no error occurred, won't be returned in a GError. +indicates that no error occurred, won't be returned in a GError. @@ -235,8 +235,8 @@

    gconf_error_new ()

    -
    GError *            gconf_error_new                     (GConfError en,
-                                                         const gchar *format,
+
    GError *            gconf_error_new                     (GConfError en,
+                                                         const gchar *format,
                                                          ...);
    
 
    
 Creates a new error. Normally the GConf library does this, but you
@@ -257,7 +257,7 @@
 
 
 
    Returns :
    
-newly-allocated GError.
+newly-allocated GError.
    @@ -265,24 +265,24 @@

    gconf_error_quark ()

    -
    GQuark              gconf_error_quark                   (void);
    +
    GQuark              gconf_error_quark                   (void);

    -Converts the string 'gconf-error-quark' to a GQuark and returns the value. +Converts the string 'gconf-error-quark' to a GQuark and returns the value.

    - +

    Returns :

    		the GQuark representing the string.the GQuark representing the string.

    gconf_set_error ()

    -
    void                gconf_set_error                     (GError **err,
+
    void                gconf_set_error                     (GError **err,
                                                          GConfError en,
-                                                         const gchar *format,
+                                                         const gchar *format,
                                                          ...);
    
 
    
 Internal function.
@@ -291,8 +291,8 @@
 
    
 
    
 
    gconf_compose_errors ()
    
-
    GError *            gconf_compose_errors                (GError *err1,
-                                                         GError *err2);
    
+
    GError *            gconf_compose_errors                (GError *err1,
+                                                         GError *err2);
    
 
    
 Internal function.
 
    
diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf.html gconf-3.2.4/doc/gconf/html/gconf-gconf.html
--- gconf-3.2.3/doc/gconf/html/gconf-gconf.html	2011-10-31 15:33:37.000000000 +0000
+++ gconf-3.2.4/doc/gconf/html/gconf-gconf.html	2012-03-08 17:11:23.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 GConf Core Interfaces
-
+
 
 
 
@@ -37,158 +37,158 @@
 
    
 
    
 
    Synopsis
    
-
    gboolean            gconf_init                          (int argc,
+
    gboolean            gconf_init                          (int argc,
                                                          char **argv,
-                                                         GError **err);
-void                gconf_preinit                       (gpointer app,
-                                                         gpointer mod_info);
-void                gconf_postinit                      (gpointer app,
-                                                         gpointer mod_info);
-gboolean            gconf_is_initialized                (void);
+                                                         GError **err);
+void                gconf_preinit                       (gpointer app,
+                                                         gpointer mod_info);
+void                gconf_postinit                      (gpointer app,
+                                                         gpointer mod_info);
+gboolean            gconf_is_initialized                (void);
 void                (*GConfNotifyFunc)                  (GConfEngine *conf,
-                                                         guint cnxn_id,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
-guint               gconf_engine_notify_add             (GConfEngine *conf,
-                                                         const gchar *namespace_section,
+                                                         gpointer user_data);
+guint               gconf_engine_notify_add             (GConfEngine *conf,
+                                                         const gchar *namespace_section,
                                                          GConfNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GError **err);
+                                                         gpointer user_data,
+                                                         GError **err);
 void                gconf_engine_notify_remove          (GConfEngine *conf,
-                                                         guint cnxn);
+                                                         guint cnxn);
 GConfValue *        gconf_engine_get                    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         GError **err);
 GConfValue *        gconf_engine_get_without_default    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         GError **err);
 GConfEntry *        gconf_engine_get_entry              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         GError **err);
 GConfValue *        gconf_engine_get_with_locale        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         GError **err);
 GConfValue *        gconf_engine_get_default_from_schema
                                                         (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_engine_set                    (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_engine_set                    (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfValue *value,
-                                                         GError **err);
-gboolean            gconf_engine_unset                  (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
-GSList *            gconf_engine_all_entries            (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
-GSList *            gconf_engine_all_dirs               (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+                                                         GError **err);
+gboolean            gconf_engine_unset                  (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *schema_key,
+                                                         GError **err);
+GSList *            gconf_engine_all_entries            (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);
+GSList *            gconf_engine_all_dirs               (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);
 void                gconf_engine_suggest_sync           (GConfEngine *conf,
-                                                         GError **err);
-gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+                                                         GError **err);
+gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);
 void                gconf_engine_remove_dir             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
-gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_valid_key                     (const gchar *key,
-                                                         gchar **why_invalid);
-gboolean            gconf_key_is_below                  (const gchar *above,
-                                                         const gchar *below);
-gchar *             gconf_concat_dir_and_key            (const gchar *dir,
-                                                         const gchar *key);
-gchar *             gconf_unique_key                    (void);
+                                                         const gchar *dir,
+                                                         GError **err);
+gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_valid_key                     (const gchar *key,
+                                                         gchar **why_invalid);
+gboolean            gconf_key_is_below                  (const gchar *above,
+                                                         const gchar *below);
+gchar *             gconf_concat_dir_and_key            (const gchar *dir,
+                                                         const gchar *key);
+gchar *             gconf_unique_key                    (void);
 char *              gconf_escape_key                    (const char *arbitrary_text,
                                                          int len);
 char *              gconf_unescape_key                  (const char *escaped_key,
                                                          int len);
-gdouble             gconf_engine_get_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gint                gconf_engine_get_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gchar *             gconf_engine_get_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-gboolean            gconf_engine_get_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+gdouble             gconf_engine_get_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
+gint                gconf_engine_get_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
+gchar *             gconf_engine_get_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_engine_get_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);
 GConfSchema *       gconf_engine_get_schema             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
-GSList *            gconf_engine_get_list               (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         const gchar *key,
+                                                         GError **err);
+GSList *            gconf_engine_get_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);
-gboolean            gconf_engine_get_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_engine_get_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
-gboolean            gconf_engine_set_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
-gboolean            gconf_engine_set_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
-gboolean            gconf_engine_set_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
-gboolean            gconf_engine_set_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
-gboolean            gconf_engine_set_schema             (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);
+gboolean            gconf_engine_set_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);
+gboolean            gconf_engine_set_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);
+gboolean            gconf_engine_set_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);
+gboolean            gconf_engine_set_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);
+gboolean            gconf_engine_set_schema             (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);
-gboolean            gconf_engine_set_list               (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         GError **err);
+gboolean            gconf_engine_set_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
-gboolean            gconf_engine_set_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+                                                         GSList *list,
+                                                         GError **err);
+gboolean            gconf_engine_set_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr,
+                                                         GError **err);
 struct              GConfEnumStringPair;
-gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
-                                                         const gchar *str,
-                                                         gint *enum_value_retloc);
-const gchar *       gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
-                                                         gint enum_value);
+gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
+                                                         const gchar *str,
+                                                         gint *enum_value_retloc);
+const gchar *       gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
+                                                         gint enum_value);
 void                gconf_clear_cache                   (GConfEngine *conf,
-                                                         GError **err);
+                                                         GError **err);
 void                gconf_synchronous_sync              (GConfEngine *conf,
-                                                         GError **err);
+                                                         GError **err);
 GConfValue *        gconf_engine_get_full               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         gboolean *is_default_p,
-                                                         gboolean *is_writable_p,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         gboolean *is_default_p,
+                                                         gboolean *is_writable_p,
+                                                         GError **err);
 
    
 
    
 
    
@@ -201,7 +201,7 @@
 schema names with keys.
 
    
 
    
-Most of this interface is replicated in the GObject wrapper
+Most of this interface is replicated in the GObject wrapper
 (GConfClient object); an alternative to the value-setting functions
 is the GConfChangeSet interface.
 
    
@@ -210,9 +210,9 @@
 
    Details
    
 
    
 
    gconf_init ()
    
-
    gboolean            gconf_init                          (int argc,
+
    gboolean            gconf_init                          (int argc,
                                                          char **argv,
-                                                         GError **err);
    
+                                                         GError **err);
    
 
    
 
    Warning
    
 
    gconf_init is deprecated and should not be used in newly-written code.
    
@@ -227,7 +227,7 @@
 
 
 
    err :
    
-the return location for an allocated GError, or NULL to ignore errors.
+the return location for an allocated GError, or NULL to ignore errors.
 
 
 
    Returns :
    
@@ -240,8 +240,8 @@
 
    
 
    
 
    gconf_preinit ()
    
-
    void                gconf_preinit                       (gpointer app,
-                                                         gpointer mod_info);
    
+
    void                gconf_preinit                       (gpointer app,
+                                                         gpointer mod_info);
    
 
    
 
    Warning
    
 
    gconf_preinit is deprecated and should not be used in newly-written code.
    
@@ -252,8 +252,8 @@
 
    
 
    
 
    gconf_postinit ()
    
-
    void                gconf_postinit                      (gpointer app,
-                                                         gpointer mod_info);
    
+
    void                gconf_postinit                      (gpointer app,
+                                                         gpointer mod_info);
    
 
    
 
    Warning
    
 
    gconf_postinit is deprecated and should not be used in newly-written code.
    
@@ -264,7 +264,7 @@
 
    
 
    
 
    gconf_is_initialized ()
    
-
    gboolean            gconf_is_initialized                (void);
    
+
    gboolean            gconf_is_initialized                (void);
    
 
    
 
    Warning
    
 
    gconf_is_initialized is deprecated and should not be used in newly-written code.
    
@@ -285,9 +285,9 @@
 
    
 
    GConfNotifyFunc ()
    
 
    void                (*GConfNotifyFunc)                  (GConfEngine *conf,
-                                                         guint cnxn_id,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
    
+                                                         gpointer user_data);

    A callback function invoked when a key's value changes. The cnxn_id parameter will be the connection ID returned from gconf_engine_notify_add(). key will be the @@ -319,18 +319,18 @@

    gconf_engine_notify_add ()

    -
    guint               gconf_engine_notify_add             (GConfEngine *conf,
-                                                         const gchar *namespace_section,
+
    guint               gconf_engine_notify_add             (GConfEngine *conf,
+                                                         const gchar *namespace_section,
                                                          GConfNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GError **err);
    
+                                                         gpointer user_data,
+                                                         GError **err);

    Registers a notification request with the gconfd server. The server will notify the client when any key at or below namespace_section is set or unset. Try to watch the smallest possible part of the namespace; otherwise you will slow down the server and your application with unnecessary notifications. Note that you should prefer gconf_client_notify_add() -if you're using the GObject wrapper library, because +if you're using the GObject wrapper library, because gconf_client_notify_add() does not require a client-server conversation for every callback. gconf_engine_notify_add() requests a different server notification for every callback. The function returns an ID you can use to remove the @@ -357,7 +357,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. Return value: an ID for the notification request, or 0 on error. @@ -371,7 +371,7 @@

    gconf_engine_notify_remove ()

    void                gconf_engine_notify_remove          (GConfEngine *conf,
-                                                         guint cnxn);
    + guint cnxn);

    Removes a notification request.

    @@ -393,8 +393,8 @@

    gconf_engine_get ()

    GConfValue *        gconf_engine_get                    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    + const gchar *key, + GError **err);

    Returns the GConfValue stored at key, or NULL if no value is set. You must call gconf_value_free() to free the returned value. If you know @@ -416,7 +416,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -429,8 +429,8 @@

    gconf_engine_get_without_default ()

    GConfValue *        gconf_engine_get_without_default    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    + const gchar *key, + GError **err);

    Identical to gconf_engine_get(), except that it will return NULL in place of the default value if the key is unset. Note that gconf_engine_get() can also @@ -449,7 +449,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -462,10 +462,10 @@

    gconf_engine_get_entry ()

    GConfEntry *        gconf_engine_get_entry              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
    + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + GError **err);

    Obtain the full GConfEntry for a value.

    @@ -486,12 +486,12 @@

    use_schema_default :

    -a gboolean value indicating whether the default value associated with schema +a gboolean value indicating whether the default value associated with schema should be used.

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -504,9 +504,9 @@

    gconf_engine_get_with_locale ()

    GConfValue *        gconf_engine_get_with_locale        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         GError **err);
    + const gchar *key, + const gchar *locale, + GError **err);

    Requests the value appropriate for a particular locale. Right now, only values of type GCONF_VALUE_SCHEMA are localized; the locale is @@ -533,7 +533,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -547,8 +547,8 @@

    gconf_engine_get_default_from_schema ()

    GConfValue *        gconf_engine_get_default_from_schema
                                                         (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    + const gchar *key, + GError **err);

    Returns the default value stored in the key's schema, if the key has a schema associated and the schema exists and the schema contains a default value. Note @@ -571,7 +571,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -583,10 +583,10 @@

    gconf_engine_set ()

    -
    gboolean            gconf_engine_set                    (GConfEngine *conf,
-                                                         const gchar *key,
+
    gboolean            gconf_engine_set                    (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfValue *value,
-                                                         GError **err);
    
+                                                         GError **err);

    Sets the value of key to value. Does not modify the passed-in GConfValue, you must free it yourself. You may prefer a type-specific @@ -616,7 +616,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -629,9 +629,9 @@

    gconf_engine_unset ()

    -
    gboolean            gconf_engine_unset                  (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gboolean            gconf_engine_unset                  (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Unsets the value of key; if key is already unset, has no effect. An error of note is GCONF_OVERRIDDEN, indicating that the system @@ -650,7 +650,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -663,10 +663,10 @@

    gconf_engine_associate_schema ()

    -
    gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
    +
    gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *schema_key,
+                                                         GError **err);

    Directs GConf to find the schema for key at location schema_key. That is, the value stored at schema_key should have type @@ -692,7 +692,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -705,16 +705,16 @@

    gconf_engine_all_entries ()

    -
    GSList *            gconf_engine_all_entries            (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
    +
    GSList *            gconf_engine_all_entries            (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

    Lists the key-value pairs in dir. Does not list subdirectories; for that use gconf_engine_all_dirs(). The returned list contains GConfEntry objects. A GConfEntry contains an absolute key and a value. The list is not recursive, it contains only the immediate children of dir. To free the returned list, gconf_entry_free() -each list element, then g_slist_free() the list itself. +each list element, then g_slist_free() the list itself.

    @@ -729,7 +729,7 @@ - + @@ -741,14 +741,14 @@

    gconf_engine_all_dirs ()

    -
    GSList *            gconf_engine_all_dirs               (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
    +
    GSList *            gconf_engine_all_dirs               (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

    Lists the subdirectories in dir. The returned list contains allocated strings. Each string is the absolute path of a -subdirectory. You should g_free() each string in the list, then -g_slist_free() the list itself. +subdirectory. You should g_free() each string in the list, then +g_slist_free() the list itself.

    err :

    		the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.

    Returns :
    @@ -763,7 +763,7 @@ - + @@ -776,7 +776,7 @@

    gconf_engine_suggest_sync ()

    void                gconf_engine_suggest_sync           (GConfEngine *conf,
-                                                         GError **err);
    + GError **err);

    Suggests to gconfd that you've just finished a block of changes, and it would be an optimal time to sync to @@ -795,7 +795,7 @@

    - +

    err :

    		the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    err :

    		the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.
    @@ -803,9 +803,9 @@

    gconf_engine_dir_exists ()

    -
    gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
    +
    gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

    Queries whether the directory dir exists in the GConf database. Returns TRUE or FALSE. @@ -823,7 +823,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -837,8 +837,8 @@

    gconf_engine_remove_dir ()

    void                gconf_engine_remove_dir             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
    + const gchar *dir, + GError **err);

    This function first checks the validity of the gconf key. In case of a local GConfEngine it removes the directory from the source backend calling gconf_sources_remove_dir(). Otherwise it obtains the @@ -858,7 +858,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
    @@ -866,9 +866,9 @@

    gconf_engine_key_is_writable ()

    -
    gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Checks whether the key is writable.

    @@ -885,7 +885,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -898,8 +898,8 @@

    gconf_valid_key ()

    -
    gboolean            gconf_valid_key                     (const gchar *key,
-                                                         gchar **why_invalid);
    +
    gboolean            gconf_valid_key                     (const gchar *key,
+                                                         gchar **why_invalid);

    Asks whether a key is syntactically correct, that is, it ensures that the key consists of slash-separated strings and contains only legal @@ -920,7 +920,7 @@

    why_invalid :

    -return location for an explanation of the problem, if any. g_free() the returned string. +return location for an explanation of the problem, if any. g_free() the returned string.

    Returns :

    @@ -933,8 +933,8 @@

    gconf_key_is_below ()

    -
    gboolean            gconf_key_is_below                  (const gchar *above,
-                                                         const gchar *below);
    +
    gboolean            gconf_key_is_below                  (const gchar *above,
+                                                         const gchar *below);

    Asks whether the key below would be found below the key above, were they both to exist in the database. For example, /foo @@ -964,8 +964,8 @@

    gconf_concat_dir_and_key ()

    -
    gchar *             gconf_concat_dir_and_key            (const gchar *dir,
-                                                         const gchar *key);
    +
    gchar *             gconf_concat_dir_and_key            (const gchar *dir,
+                                                         const gchar *key);

    Concatenates the dir and key passed removing the unnecessary '/' characters and returns the new string. @@ -991,7 +991,7 @@

    gconf_unique_key ()

    -
    gchar *             gconf_unique_key                    (void);
    +
    gchar *             gconf_unique_key                    (void);

    Generates a new and unique key using serial number, process id, current time and a random number generated. @@ -1000,7 +1000,7 @@

    Returns :

    -a newly created key, a gchar value. +a newly created key, a gchar value.
    @@ -1066,9 +1066,9 @@

    gconf_engine_get_float ()

    -
    gdouble             gconf_engine_get_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gdouble             gconf_engine_get_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Requests the floating point number (GCONF_VALUE_FLOAT) stored at key. Automatically performs type-checking, so if a non-float is @@ -1088,7 +1088,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1100,9 +1100,9 @@

    gconf_engine_get_int ()

    -
    gint                gconf_engine_get_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gint                gconf_engine_get_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Requests the integer (GCONF_VALUE_INT) stored at key. Automatically performs type-checking, so if a non-integer is @@ -1122,7 +1122,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1134,9 +1134,9 @@

    gconf_engine_get_string ()

    -
    gchar *             gconf_engine_get_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gchar *             gconf_engine_get_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Requests the string (GCONF_VALUE_STRING) stored at key. Automatically performs type-checking, so if a non-string is @@ -1156,7 +1156,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1168,9 +1168,9 @@

    gconf_engine_get_bool ()

    -
    gboolean            gconf_engine_get_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    +
    gboolean            gconf_engine_get_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

    Requests the boolean value (GCONF_VALUE_BOOL) stored at key. Automatically performs type-checking, so if a non-bool is @@ -1190,7 +1190,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1203,8 +1203,8 @@

    gconf_engine_get_schema ()

    GConfSchema *       gconf_engine_get_schema             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
    + const gchar *key, + GError **err);

    Requests the schema (GCONF_VALUE_SCHEMA) stored at key. Automatically performs type-checking, so if a non-schema is stored at @@ -1224,7 +1224,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1236,10 +1236,10 @@

    gconf_engine_get_list ()

    -
    GSList *            gconf_engine_get_list               (GConfEngine *conf,
-                                                         const gchar *key,
+
    GSList *            gconf_engine_get_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);
    
+                                                         GError **err);

    Requests the list (GCONF_VALUE_LIST) stored at key. Automatically performs type-checking, so if a non-list is stored at key, or the @@ -1271,22 +1271,22 @@ GCONF_VALUE_INT -The integer itself, converted with GINT_TO_POINTER() +The integer itself, converted with GINT_TO_POINTER() GCONF_VALUE_BOOL -The bool itself, converted with GINT_TO_POINTER() +The bool itself, converted with GINT_TO_POINTER() GCONF_VALUE_FLOAT -A pointer to gdouble, which should be freed with g_free() +A pointer to gdouble, which should be freed with g_free() GCONF_VALUE_STRING -A pointer to gchar, which should be freed with g_free() +A pointer to gchar, which should be freed with g_free() @@ -1299,9 +1299,9 @@

    In the GCONF_VALUE_FLOAT and GCONF_VALUE_STRING cases, you must -g_free() each list element. In the GCONF_VALUE_SCHEMA case you must +g_free() each list element. In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() each element. In all cases you must free the -list itself with g_slist_free(). +list itself with g_slist_free().

    @@ -1320,7 +1320,7 @@ - + @@ -1332,13 +1332,13 @@

    gconf_engine_get_pair ()

    -
    gboolean            gconf_engine_get_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+
    gboolean            gconf_engine_get_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
    
+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);

    Requests the pair (GCONF_VALUE_PAIR) stored at key. Automatically performs type-checking, so if a non-pair is stored at key, or the @@ -1365,22 +1365,22 @@

    - - - - + @@ -1389,7 +1389,7 @@

    err :

    		the return location for an allocated GError, or NULL to ignore errors.the return location for an allocated GError, or NULL to ignore errors.

    Returns :
    GCONF_VALUE_INTpointer to gint +pointer to gint
    GCONF_VALUE_BOOLpointer to gboolean +pointer to gboolean
    GCONF_VALUE_FLOATpointer to gdouble +pointer to gdouble
    GCONF_VALUE_STRINGpointer to gchar*pointer to gchar*
    GCONF_VALUE_SCHEMA

    -In the GCONF_VALUE_STRING case, you must g_free() the string(s) +In the GCONF_VALUE_STRING case, you must g_free() the string(s) stored in the return location(s). In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() the returned schema. If there's an error or the value is unset, car_retloc and cdr_retloc are left unchanged. @@ -1456,7 +1456,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1469,10 +1469,10 @@

    gconf_engine_set_float ()

    -
    gboolean            gconf_engine_set_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
    +
    gboolean            gconf_engine_set_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);

    Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a float (GCONF_VALUE_FLOAT), gconf_engine_set_float() will fail.

    @@ -1493,7 +1493,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1506,10 +1506,10 @@

    gconf_engine_set_int ()

    -
    gboolean            gconf_engine_set_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
    +
    gboolean            gconf_engine_set_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);

    Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store an integer (GCONF_VALUE_INT), gconf_engine_set_int() will fail.

    @@ -1530,7 +1530,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1543,10 +1543,10 @@

    gconf_engine_set_string ()

    -
    gboolean            gconf_engine_set_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
    +
    gboolean            gconf_engine_set_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);

    Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a string (GCONF_VALUE_STRING), gconf_engine_set_string() will fail.

    @@ -1567,7 +1567,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1580,10 +1580,10 @@

    gconf_engine_set_bool ()

    -
    gboolean            gconf_engine_set_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
    +
    gboolean            gconf_engine_set_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);

    Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but but doesn't store a boolean (GCONF_VALUE_BOOL), gconf_engine_set_bool() will fail.

    @@ -1604,7 +1604,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1617,10 +1617,10 @@

    gconf_engine_set_schema ()

    -
    gboolean            gconf_engine_set_schema             (GConfEngine *conf,
-                                                         const gchar *key,
+
    gboolean            gconf_engine_set_schema             (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);
    
+                                                         GError **err);

    Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a schema value (GCONF_VALUE_SCHEMA), gconf_engine_set_schema() will fail.

    @@ -1641,7 +1641,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1654,11 +1654,11 @@

    gconf_engine_set_list ()

    -
    gboolean            gconf_engine_set_list               (GConfEngine *conf,
-                                                         const gchar *key,
+
    gboolean            gconf_engine_set_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
    
+                                                         GSList *list,
+                                                         GError **err);

    Change the value of key to list of type list_type. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a list value @@ -1685,7 +1685,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1698,13 +1698,13 @@

    gconf_engine_set_pair ()

    -
    gboolean            gconf_engine_set_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+
    gboolean            gconf_engine_set_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
    
+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr,
+                                                         GError **err);

    Change the value of key to a pair of first type car_type and second type cdr_type . Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists @@ -1739,7 +1739,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    @@ -1763,9 +1763,9 @@

    gconf_string_to_enum ()

    -
    gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
-                                                         const gchar *str,
-                                                         gint *enum_value_retloc);
    +
    gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
+                                                         const gchar *str,
+                                                         gint *enum_value_retloc);

    It's best to store enumeration values as strings rather than integers. This is robust against changes in the enumeration, and also human-readable. @@ -1817,8 +1817,8 @@

    gconf_enum_to_string ()

    -
    const gchar *       gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
-                                                         gint enum_value);
    +
    const gchar *       gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
+                                                         gint enum_value);

    See gconf_string_to_enum() for background information on this function.

    @@ -1844,7 +1844,7 @@

    gconf_clear_cache ()

    void                gconf_clear_cache                   (GConfEngine *conf,
-                                                         GError **err);
    + GError **err);

    In case of a local GConfEngine, this function calls gconf_sources_clear_cache() to clear the cache from the source. Otherwise it obtains the configuration database using gconf_engine_get_database() @@ -1859,7 +1859,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
    @@ -1868,7 +1868,7 @@

    gconf_synchronous_sync ()

    void                gconf_synchronous_sync              (GConfEngine *conf,
-                                                         GError **err);
    + GError **err);

    In case of a local GConfEngine, this function syncs up all the gconf sources calling gconf_synchronous_sync(). Otherwise it obtains the configuration database using @@ -1883,7 +1883,7 @@

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
    @@ -1892,12 +1892,12 @@

    gconf_engine_get_full ()

    GConfValue *        gconf_engine_get_full               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         gboolean *is_default_p,
-                                                         gboolean *is_writable_p,
-                                                         GError **err);
    + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + gboolean *is_default_p, + gboolean *is_writable_p, + GError **err);

    Returns the GConfValue of a key and the associated GConfEntry fields depending on the parameters passed.

    @@ -1919,22 +1919,22 @@

    use_schema_default :

    -a gboolean value, indicating whether schema information is to be used as the default +a gboolean value, indicating whether schema information is to be used as the default value.

    is_default_p :

    -a gpointer if the is_default field of the GConfEntry is required, NULL +a gpointer if the is_default field of the GConfEntry is required, NULL otherwise.

    is_writable_p :

    -a gpointer if the is_writable field of the GConfEntry is required, NULL +a gpointer if the is_writable field of the GConfEntry is required, NULL otherwise.

    err :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    Returns :

    diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-internals.html gconf-3.2.4/doc/gconf/html/gconf-gconf-internals.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-internals.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-internals.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ gconf-internals - + @@ -37,65 +37,65 @@

    Synopsis

    -
    gchar *             gconf_key_directory                 (const gchar *key);
-const gchar *       gconf_key_key                       (const gchar *key);
+
    gchar *             gconf_key_directory                 (const gchar *key);
+const gchar *       gconf_key_key                       (const gchar *key);
 GConfValue *        gconf_value_from_corba_value        (const ConfigValue *value);
 GConfSchema *       gconf_schema_from_corba_schema      (const ConfigSchema *cs);
-const gchar *       gconf_value_type_to_string          (GConfValueType type);
-GConfValueType      gconf_value_type_from_string        (const gchar *str);
-GSList *            gconf_load_source_path              (const gchar *filename,
-                                                         GError **err);
-void                gconf_shutdown_daemon               (GError **err);
-gboolean            gconf_ping_daemon                   (void);
-gboolean            gconf_spawn_daemon                  (GError **err);
-gulong              gconf_string_to_gulong              (const gchar *str);
-const gchar *       gconf_current_locale                (void);
+const gchar *       gconf_value_type_to_string          (GConfValueType type);
+GConfValueType      gconf_value_type_from_string        (const gchar *str);
+GSList *            gconf_load_source_path              (const gchar *filename,
+                                                         GError **err);
+void                gconf_shutdown_daemon               (GError **err);
+gboolean            gconf_ping_daemon                   (void);
+gboolean            gconf_spawn_daemon                  (GError **err);
+gulong              gconf_string_to_gulong              (const gchar *str);
+const gchar *       gconf_current_locale                (void);
 enum                GConfLogPriority;
 void                gconf_log                           (GConfLogPriority pri,
-                                                         const gchar *format,
+                                                         const gchar *format,
                                                          ...);
-gboolean            gconf_key_check                     (const gchar *key,
-                                                         GError **err);
+gboolean            gconf_key_check                     (const gchar *key,
+                                                         GError **err);
 GConfValue *        gconf_value_new_list_from_string    (GConfValueType list_type,
-                                                         const gchar *str,
-                                                         GError **err);
+                                                         const gchar *str,
+                                                         GError **err);
 GConfValue *        gconf_value_new_pair_from_string    (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         const gchar *str,
-                                                         GError **err);
-gchar *             gconf_quote_string                  (const gchar *str);
-gchar *             gconf_unquote_string                (const gchar *str,
-                                                         const gchar **end,
-                                                         GError **err);
-void                gconf_unquote_string_inplace        (gchar *str,
-                                                         gchar **end,
-                                                         GError **err);
-GConfValue *        gconf_value_decode                  (const gchar *encoded);
-gchar *             gconf_value_encode                  (GConfValue *val);
+                                                         const gchar *str,
+                                                         GError **err);
+gchar *             gconf_quote_string                  (const gchar *str);
+gchar *             gconf_unquote_string                (const gchar *str,
+                                                         const gchar **end,
+                                                         GError **err);
+void                gconf_unquote_string_inplace        (gchar *str,
+                                                         gchar **end,
+                                                         GError **err);
+GConfValue *        gconf_value_decode                  (const gchar *encoded);
+gchar *             gconf_value_encode                  (GConfValue *val);
 GConfValue *        gconf_value_list_from_primitive_list
                                                         (GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
+                                                         GSList *list,
+                                                         GError **err);
 GConfValue *        gconf_value_pair_from_primitive_pair
                                                         (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
-GSList *            gconf_value_list_to_primitive_list_destructive
+                                                         gconstpointer address_of_car,
+                                                         gconstpointer address_of_cdr,
+                                                         GError **err);
+GSList *            gconf_value_list_to_primitive_list_destructive
                                                         (GConfValue *val,
                                                          GConfValueType list_type,
-                                                         GError **err);
-gboolean            gconf_value_pair_to_primitive_pair_destructive
+                                                         GError **err);
+gboolean            gconf_value_pair_to_primitive_pair_destructive
                                                         (GConfValue *val,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
-void                gconf_set_daemon_mode               (gboolean setting);
-gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
-                                                         GError **err);
+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);
+void                gconf_set_daemon_mode               (gboolean setting);
+gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
+                                                         GError **err);
    @@ -107,14 +107,14 @@

    Details

    gconf_key_directory ()

    -
    gchar *             gconf_key_directory                 (const gchar *key);
    +
    gchar *             gconf_key_directory                 (const gchar *key);

    gconf_key_key ()

    -
    const gchar *       gconf_key_key                       (const gchar *key);
    +
    const gchar *       gconf_key_key                       (const gchar *key);

    @@ -135,57 +135,57 @@

    gconf_value_type_to_string ()

    -
    const gchar *       gconf_value_type_to_string          (GConfValueType type);
    +
    const gchar *       gconf_value_type_to_string          (GConfValueType type);

    gconf_value_type_from_string ()

    -
    GConfValueType      gconf_value_type_from_string        (const gchar *str);
    +
    GConfValueType      gconf_value_type_from_string        (const gchar *str);

    gconf_load_source_path ()

    -
    GSList *            gconf_load_source_path              (const gchar *filename,
-                                                         GError **err);
    +
    GSList *            gconf_load_source_path              (const gchar *filename,
+                                                         GError **err);

    gconf_shutdown_daemon ()

    -
    void                gconf_shutdown_daemon               (GError **err);
    +
    void                gconf_shutdown_daemon               (GError **err);

    gconf_ping_daemon ()

    -
    gboolean            gconf_ping_daemon                   (void);
    +
    gboolean            gconf_ping_daemon                   (void);

    gconf_spawn_daemon ()

    -
    gboolean            gconf_spawn_daemon                  (GError **err);
    +
    gboolean            gconf_spawn_daemon                  (GError **err);

    gconf_string_to_gulong ()

    -
    gulong              gconf_string_to_gulong              (const gchar *str);
    +
    gulong              gconf_string_to_gulong              (const gchar *str);

    gconf_current_locale ()

    -
    const gchar *       gconf_current_locale                (void);
    +
    const gchar *       gconf_current_locale                (void);

    @@ -210,7 +210,7 @@

    gconf_log ()

    void                gconf_log                           (GConfLogPriority pri,
-                                                         const gchar *format,
+                                                         const gchar *format,
                                                          ...);

    @@ -218,8 +218,8 @@

    gconf_key_check ()

    -
    gboolean            gconf_key_check                     (const gchar *key,
-                                                         GError **err);
    +
    gboolean            gconf_key_check                     (const gchar *key,
+                                                         GError **err);

    @@ -227,8 +227,8 @@

    gconf_value_new_list_from_string ()

    GConfValue *        gconf_value_new_list_from_string    (GConfValueType list_type,
-                                                         const gchar *str,
-                                                         GError **err);
    + const gchar *str, + GError **err);

    This function does not work. Don't use it.

    @@ -238,8 +238,8 @@

    gconf_value_new_pair_from_string ()

    GConfValue *        gconf_value_new_pair_from_string    (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         const gchar *str,
-                                                         GError **err);
    + const gchar *str, + GError **err);

    This function does not work. Don't use it.

    @@ -247,39 +247,39 @@

    gconf_quote_string ()

    -
    gchar *             gconf_quote_string                  (const gchar *str);
    +
    gchar *             gconf_quote_string                  (const gchar *str);

    gconf_unquote_string ()

    -
    gchar *             gconf_unquote_string                (const gchar *str,
-                                                         const gchar **end,
-                                                         GError **err);
    +
    gchar *             gconf_unquote_string                (const gchar *str,
+                                                         const gchar **end,
+                                                         GError **err);

    gconf_unquote_string_inplace ()

    -
    void                gconf_unquote_string_inplace        (gchar *str,
-                                                         gchar **end,
-                                                         GError **err);
    +
    void                gconf_unquote_string_inplace        (gchar *str,
+                                                         gchar **end,
+                                                         GError **err);

    gconf_value_decode ()

    -
    GConfValue *        gconf_value_decode                  (const gchar *encoded);
    +
    GConfValue *        gconf_value_decode                  (const gchar *encoded);

    gconf_value_encode ()

    -
    gchar *             gconf_value_encode                  (GConfValue *val);
    +
    gchar *             gconf_value_encode                  (GConfValue *val);

    @@ -288,8 +288,8 @@

    gconf_value_list_from_primitive_list ()

    GConfValue *        gconf_value_list_from_primitive_list
                                                         (GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
    + GSList *list, + GError **err);

    @@ -299,47 +299,47 @@ 
    GConfValue *        gconf_value_pair_from_primitive_pair
                                                         (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
    + gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err);

    gconf_value_list_to_primitive_list_destructive ()

    -
    GSList *            gconf_value_list_to_primitive_list_destructive
+
    GSList *            gconf_value_list_to_primitive_list_destructive
                                                         (GConfValue *val,
                                                          GConfValueType list_type,
-                                                         GError **err);
    
+                                                         GError **err);

    gconf_value_pair_to_primitive_pair_destructive ()

    -
    gboolean            gconf_value_pair_to_primitive_pair_destructive
+
    gboolean            gconf_value_pair_to_primitive_pair_destructive
                                                         (GConfValue *val,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
    
+                                                         gpointer car_retloc,
+                                                         gpointer cdr_retloc,
+                                                         GError **err);

    gconf_set_daemon_mode ()

    -
    void                gconf_set_daemon_mode               (gboolean setting);
    +
    void                gconf_set_daemon_mode               (gboolean setting);

    gconf_handle_oaf_exception ()

    -
    gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
-                                                         GError **err);
    +
    gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
+                                                         GError **err);

    diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-listeners.html gconf-3.2.4/doc/gconf/html/gconf-gconf-listeners.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-listeners.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-listeners.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ gconf-listeners - + @@ -39,33 +39,33 @@

    Synopsis

                        GConfListeners;
 void                (*GConfListenersCallback)           (GConfListeners *listeners,
-                                                         const gchar *all_above_key,
-                                                         guint cnxn_id,
-                                                         gpointer listener_data,
-                                                         gpointer user_data);
+                                                         const gchar *all_above_key,
+                                                         guint cnxn_id,
+                                                         gpointer listener_data,
+                                                         gpointer user_data);
 GConfListeners *    gconf_listeners_new                 (void);
 void                gconf_listeners_free                (GConfListeners *listeners);
-guint               gconf_listeners_add                 (GConfListeners *listeners,
-                                                         const gchar *listen_point,
-                                                         gpointer listener_data,
-                                                         GFreeFunc destroy_notify);
+guint               gconf_listeners_add                 (GConfListeners *listeners,
+                                                         const gchar *listen_point,
+                                                         gpointer listener_data,
+                                                         GFreeFunc destroy_notify);
 void                gconf_listeners_remove              (GConfListeners *listeners,
-                                                         guint cnxn_id);
+                                                         guint cnxn_id);
 void                gconf_listeners_notify              (GConfListeners *listeners,
-                                                         const gchar *all_above,
+                                                         const gchar *all_above,
                                                          GConfListenersCallback callback,
-                                                         gpointer user_data);
-guint               gconf_listeners_count               (GConfListeners *listeners);
+                                                         gpointer user_data);
+guint               gconf_listeners_count               (GConfListeners *listeners);
 void                gconf_listeners_foreach             (GConfListeners *listeners,
                                                          GConfListenersForeach callback,
-                                                         gpointer user_data);
-gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
-                                                         guint cnxn_id,
-                                                         gpointer *listener_data_p,
-                                                         const gchar **location_p);
+                                                         gpointer user_data);
+gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
+                                                         guint cnxn_id,
+                                                         gpointer *listener_data_p,
+                                                         const gchar **location_p);
 void                gconf_listeners_remove_if           (GConfListeners *listeners,
                                                          GConfListenersPredicate predicate,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
    @@ -93,10 +93,10 @@

    GConfListenersCallback ()

    void                (*GConfListenersCallback)           (GConfListeners *listeners,
-                                                         const gchar *all_above_key,
-                                                         guint cnxn_id,
-                                                         gpointer listener_data,
-                                                         gpointer user_data);
    + const gchar *all_above_key, + guint cnxn_id, + gpointer listener_data, + gpointer user_data);

    This is the signature of a user function added with gconf_listeners_notify(). This function is called whenever the value of a key changes. @@ -160,10 +160,10 @@

    gconf_listeners_add ()

    -
    guint               gconf_listeners_add                 (GConfListeners *listeners,
-                                                         const gchar *listen_point,
-                                                         gpointer listener_data,
-                                                         GFreeFunc destroy_notify);
    +
    guint               gconf_listeners_add                 (GConfListeners *listeners,
+                                                         const gchar *listen_point,
+                                                         gpointer listener_data,
+                                                         GFreeFunc destroy_notify);

    Creates a new Listener with the next available connection id and inserts it into the listener table. The newly created listener listens for changes below and including the listen_point.Returns the newly @@ -190,7 +190,7 @@

    Returns :

    -the newly assigned connection id, a guint value. +the newly assigned connection id, a guint value.
    @@ -199,7 +199,7 @@

    gconf_listeners_remove ()

    void                gconf_listeners_remove              (GConfListeners *listeners,
-                                                         guint cnxn_id);
    + guint cnxn_id);

    Removes the listener from the listener table.

    @@ -221,9 +221,9 @@

    gconf_listeners_notify ()

    void                gconf_listeners_notify              (GConfListeners *listeners,
-                                                         const gchar *all_above,
+                                                         const gchar *all_above,
                                                          GConfListenersCallback callback,
-                                                         gpointer user_data);
    + gpointer user_data);

    Notifies all the associated listeners that a key has changed.

    @@ -252,7 +252,7 @@

    gconf_listeners_count ()

    -
    guint               gconf_listeners_count               (GConfListeners *listeners);
    +
    guint               gconf_listeners_count               (GConfListeners *listeners);

    Returns the number of alive listeners in the listener table.

    @@ -276,7 +276,7 @@

    gconf_listeners_foreach ()

    void                gconf_listeners_foreach             (GConfListeners *listeners,
                                                          GConfListenersForeach callback,
-                                                         gpointer user_data);
    + gpointer user_data);

    Execute a function for each of the GConfListeners.

    @@ -301,10 +301,10 @@

    gconf_listeners_get_data ()

    -
    gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
-                                                         guint cnxn_id,
-                                                         gpointer *listener_data_p,
-                                                         const gchar **location_p);
    +
    gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
+                                                         guint cnxn_id,
+                                                         gpointer *listener_data_p,
+                                                         const gchar **location_p);

    Obtains the data particular to a GConfListener.

    @@ -341,7 +341,7 @@

    gconf_listeners_remove_if ()

    void                gconf_listeners_remove_if           (GConfListeners *listeners,
                                                          GConfListenersPredicate predicate,
-                                                         gpointer user_data);
    + gpointer user_data);

    Remove the listener if a predicate is satisfied.

    @@ -358,7 +358,7 @@

    user_data :

    -a gpointer. +a gpointer.
    diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-locale.html gconf-3.2.4/doc/gconf/html/gconf-gconf-locale.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-locale.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-locale.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ gconf-locale - + @@ -41,13 +41,13 @@ GConfLocaleCache * gconf_locale_cache_new (void); void gconf_locale_cache_free (GConfLocaleCache *cache); void gconf_locale_cache_expire (GConfLocaleCache *cache, - guint max_age_exclusive_in_seconds); + guint max_age_exclusive_in_seconds); struct GConfLocaleList; void gconf_locale_list_ref (GConfLocaleList *list); void gconf_locale_list_unref (GConfLocaleList *list); GConfLocaleList * gconf_locale_cache_get_list (GConfLocaleCache *cache, - const gchar *locale); -gchar ** gconf_split_locale (const gchar *locale); + const gchar *locale); +gchar ** gconf_split_locale (const gchar *locale);
    @@ -81,7 +81,7 @@

    gconf_locale_cache_expire ()

    void                gconf_locale_cache_expire           (GConfLocaleCache *cache,
-                                                         guint max_age_exclusive_in_seconds);
    + guint max_age_exclusive_in_seconds);

    @@ -113,14 +113,14 @@

    gconf_locale_cache_get_list ()

    GConfLocaleList *   gconf_locale_cache_get_list         (GConfLocaleCache *cache,
-                                                         const gchar *locale);
    + const gchar *locale);

    gconf_split_locale ()

    -
    gchar **            gconf_split_locale                  (const gchar *locale);
    +
    gchar **            gconf_split_locale                  (const gchar *locale);

    diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-schema.html gconf-3.2.4/doc/gconf/html/gconf-gconf-schema.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-schema.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-schema.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GConfSchema - + @@ -53,13 +53,13 @@ void gconf_schema_set_type (GConfSchema *sc, GConfValueType type); void gconf_schema_set_locale (GConfSchema *sc, - const gchar *locale); + const gchar *locale); void gconf_schema_set_short_desc (GConfSchema *sc, - const gchar *desc); + const gchar *desc); void gconf_schema_set_long_desc (GConfSchema *sc, - const gchar *desc); + const gchar *desc); void gconf_schema_set_owner (GConfSchema *sc, - const gchar *owner); + const gchar *owner); void gconf_schema_set_default_value (GConfSchema *sc, const GConfValue *val); void gconf_schema_set_default_value_nocopy @@ -375,7 +375,7 @@

    gconf_schema_set_locale ()

    void                gconf_schema_set_locale             (GConfSchema *sc,
-                                                         const gchar *locale);
    + const gchar *locale);

    Sets the locale for a GConfSchema to locale. locale is copied.

    @@ -397,7 +397,7 @@

    gconf_schema_set_short_desc ()

    void                gconf_schema_set_short_desc         (GConfSchema *sc,
-                                                         const gchar *desc);
    + const gchar *desc);

    Sets the short description of a GConfSchema to desc. desc is copied.

    @@ -419,7 +419,7 @@

    gconf_schema_set_long_desc ()

    void                gconf_schema_set_long_desc          (GConfSchema *sc,
-                                                         const gchar *desc);
    + const gchar *desc);

    Sets the long description of a GConfSchema to desc. desc is copied.

    @@ -441,7 +441,7 @@

    gconf_schema_set_owner ()

    void                gconf_schema_set_owner              (GConfSchema *sc,
-                                                         const gchar *owner);
    + const gchar *owner);

    Sets the "owner" of the GConfSchema, where the owner is the name of the application that created the entry. diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-sources.html gconf-3.2.4/doc/gconf/html/gconf-gconf-sources.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-sources.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-sources.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ gconf-sources - + @@ -39,59 +39,59 @@

    Synopsis

    struct              GConfSource;
 enum                GConfSourceFlags;
-GConfSource *       gconf_resolve_address               (const gchar *address,
-                                                         GError **err);
+GConfSource *       gconf_resolve_address               (const gchar *address,
+                                                         GError **err);
 void                gconf_source_free                   (GConfSource *source);
 struct              GConfSources;
-GConfSources *      gconf_sources_new_from_addresses    (GSList *addresses,
-                                                         GError **err);
+GConfSources *      gconf_sources_new_from_addresses    (GSList *addresses,
+                                                         GError **err);
 GConfSources *      gconf_sources_new_from_source       (GConfSource *source);
 void                gconf_sources_free                  (GConfSources *sources);
 GConfValue *        gconf_sources_query_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean use_schema_default,
-                                                         gboolean *value_is_default,
-                                                         gboolean *value_is_writable,
-                                                         gchar **schema_name,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar **locales,
+                                                         gboolean use_schema_default,
+                                                         gboolean *value_is_default,
+                                                         gboolean *value_is_writable,
+                                                         gchar **schema_name,
+                                                         GError **err);
 void                gconf_sources_set_value             (GConfSources *sources,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          const GConfValue *value,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
+                                                         GError **err);
 void                gconf_sources_unset_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *locale,
+                                                         const gchar *key,
+                                                         const gchar *locale,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
-GSList *            gconf_sources_all_entries           (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         const gchar **locales,
-                                                         GError **err);
-GSList *            gconf_sources_all_dirs              (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
-gboolean            gconf_sources_dir_exists            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
+                                                         GError **err);
+GSList *            gconf_sources_all_entries           (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         const gchar **locales,
+                                                         GError **err);
+GSList *            gconf_sources_all_dirs              (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);
+gboolean            gconf_sources_dir_exists            (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);
 void                gconf_sources_remove_dir            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
+                                                         const gchar *dir,
+                                                         GError **err);
 void                gconf_sources_set_schema            (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
-gboolean            gconf_sources_sync_all              (GConfSources *sources,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar *schema_key,
+                                                         GError **err);
+gboolean            gconf_sources_sync_all              (GConfSources *sources,
+                                                         GError **err);
 GConfMetaInfo *     gconf_sources_query_metainfo        (GConfSources *sources,
-                                                         const gchar *key,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         GError **err);
 GConfValue *        gconf_sources_query_default_value   (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean *is_writable,
-                                                         GError **err);
+                                                         const gchar *key,
+                                                         const gchar **locales,
+                                                         gboolean *is_writable,
+                                                         GError **err);
    @@ -132,8 +132,8 @@

    gconf_resolve_address ()

    -
    GConfSource *       gconf_resolve_address               (const gchar *address,
-                                                         GError **err);
    +
    GConfSource *       gconf_resolve_address               (const gchar *address,
+                                                         GError **err);

    @@ -157,8 +157,8 @@

    gconf_sources_new_from_addresses ()

    -
    GConfSources *      gconf_sources_new_from_addresses    (GSList *addresses,
-                                                         GError **err);
    +
    GConfSources *      gconf_sources_new_from_addresses    (GSList *addresses,
+                                                         GError **err);

    @@ -180,13 +180,13 @@

    gconf_sources_query_value ()

    GConfValue *        gconf_sources_query_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean use_schema_default,
-                                                         gboolean *value_is_default,
-                                                         gboolean *value_is_writable,
-                                                         gchar **schema_name,
-                                                         GError **err);
    + const gchar *key, + const gchar **locales, + gboolean use_schema_default, + gboolean *value_is_default, + gboolean *value_is_writable, + gchar **schema_name, + GError **err);

    @@ -194,10 +194,10 @@

    gconf_sources_set_value ()

    void                gconf_sources_set_value             (GConfSources *sources,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          const GConfValue *value,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
    + GError **err);

    @@ -205,38 +205,38 @@

    gconf_sources_unset_value ()

    void                gconf_sources_unset_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *locale,
+                                                         const gchar *key,
+                                                         const gchar *locale,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
    + GError **err);

    gconf_sources_all_entries ()

    -
    GSList *            gconf_sources_all_entries           (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         const gchar **locales,
-                                                         GError **err);
    +
    GSList *            gconf_sources_all_entries           (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         const gchar **locales,
+                                                         GError **err);

    gconf_sources_all_dirs ()

    -
    GSList *            gconf_sources_all_dirs              (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
    +
    GSList *            gconf_sources_all_dirs              (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);

    gconf_sources_dir_exists ()

    -
    gboolean            gconf_sources_dir_exists            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
    +
    gboolean            gconf_sources_dir_exists            (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);

    @@ -244,8 +244,8 @@

    gconf_sources_remove_dir ()

    void                gconf_sources_remove_dir            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
    + const gchar *dir, + GError **err);

    @@ -253,17 +253,17 @@

    gconf_sources_set_schema ()

    void                gconf_sources_set_schema            (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
    + const gchar *key, + const gchar *schema_key, + GError **err);

    gconf_sources_sync_all ()

    -
    gboolean            gconf_sources_sync_all              (GConfSources *sources,
-                                                         GError **err);
    +
    gboolean            gconf_sources_sync_all              (GConfSources *sources,
+                                                         GError **err);

    @@ -271,8 +271,8 @@

    gconf_sources_query_metainfo ()

    GConfMetaInfo *     gconf_sources_query_metainfo        (GConfSources *sources,
-                                                         const gchar *key,
-                                                         GError **err);
    + const gchar *key, + GError **err);

    @@ -280,10 +280,10 @@

    gconf_sources_query_default_value ()

    GConfValue *        gconf_sources_query_default_value   (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean *is_writable,
-                                                         GError **err);
    + const gchar *key, + const gchar **locales, + gboolean *is_writable, + GError **err);

    diff -Nru gconf-3.2.3/doc/gconf/html/gconf-gconf-value.html gconf-3.2.4/doc/gconf/html/gconf-gconf-value.html --- gconf-3.2.3/doc/gconf/html/gconf-gconf-value.html 2011-10-31 15:33:37.000000000 +0000 +++ gconf-3.2.4/doc/gconf/html/gconf-gconf-value.html 2012-03-08 17:11:23.000000000 +0000 @@ -3,7 +3,7 @@ GConfValue, GConfEntry, GConfMetaInfo - + @@ -45,25 +45,25 @@ int gconf_value_get_int (const GConfValue *value); double gconf_value_get_float (const GConfValue *value); GConfValueType gconf_value_get_list_type (const GConfValue *value); -GSList * gconf_value_get_list (const GConfValue *value); +GSList * gconf_value_get_list (const GConfValue *value); GConfValue * gconf_value_get_car (const GConfValue *value); GConfValue * gconf_value_get_cdr (const GConfValue *value); -gboolean gconf_value_get_bool (const GConfValue *value); +gboolean gconf_value_get_bool (const GConfValue *value); GConfSchema * gconf_value_get_schema (const GConfValue *value); GConfValue * gconf_value_new (GConfValueType type); GConfValue * gconf_value_new_from_string (GConfValueType type, - const gchar *str, - GError **err); + const gchar *str, + GError **err); GConfValue * gconf_value_copy (const GConfValue *src); void gconf_value_free (GConfValue *value); void gconf_value_set_int (GConfValue *value, - gint the_int); + gint the_int); void gconf_value_set_string (GConfValue *value, - const gchar *the_str); + const gchar *the_str); void gconf_value_set_float (GConfValue *value, - gdouble the_float); + gdouble the_float); void gconf_value_set_bool (GConfValue *value, - gboolean the_bool); + gboolean the_bool); void gconf_value_set_schema (GConfValue *value, const GConfSchema *sc); void gconf_value_set_schema_nocopy (GConfValue *value, @@ -79,31 +79,31 @@ void gconf_value_set_list_type (GConfValue *value, GConfValueType type); void gconf_value_set_list_nocopy (GConfValue *value, - GSList *list); + GSList *list); void gconf_value_set_list (GConfValue *value, - GSList *list); -gchar * gconf_value_to_string (const GConfValue *value); + GSList *list); +gchar * gconf_value_to_string (const GConfValue *value); struct GConfMetaInfo; GConfMetaInfo * gconf_meta_info_new (void); void gconf_meta_info_free (GConfMetaInfo *gcmi); const char * gconf_meta_info_get_schema (GConfMetaInfo *gcmi); const char * gconf_meta_info_get_mod_user (GConfMetaInfo *gcmi); -GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); +GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); void gconf_meta_info_set_schema (GConfMetaInfo *gcmi, - const gchar *schema_name); + const gchar *schema_name); void gconf_meta_info_set_mod_user (GConfMetaInfo *gcmi, - const gchar *mod_user); + const gchar *mod_user); void gconf_meta_info_set_mod_time (GConfMetaInfo *gcmi, - GTime mod_time); + GTime mod_time); struct GConfEntry; const char * gconf_entry_get_key (const GConfEntry *entry); GConfValue * gconf_entry_get_value (const GConfEntry *entry); const char * gconf_entry_get_schema_name (const GConfEntry *entry); -gboolean gconf_entry_get_is_default (const GConfEntry *entry); -gboolean gconf_entry_get_is_writable (const GConfEntry *entry); -GConfEntry * gconf_entry_new (const gchar *key, +gboolean gconf_entry_get_is_default (const GConfEntry *entry); +gboolean gconf_entry_get_is_writable (const GConfEntry *entry); +GConfEntry * gconf_entry_new (const gchar *key, const GConfValue *val); -GConfEntry * gconf_entry_new_nocopy (gchar *key, +GConfEntry * gconf_entry_new_nocopy (gchar *key, GConfValue *val); GConfEntry * gconf_entry_copy (const GConfEntry *src); void gconf_entry_free (GConfEntry *entry); @@ -115,11 +115,11 @@ void gconf_entry_set_value_nocopy (GConfEntry *entry, GConfValue *val); void gconf_entry_set_schema_name (GConfEntry *entry, - const gchar *name); + const gchar *name); void gconf_entry_set_is_default (GConfEntry *entry, - gboolean is_default); + gboolean is_default); void gconf_entry_set_is_writable (GConfEntry *entry, - gboolean is_writable); + gboolean is_writable);
    @@ -175,22 +175,22 @@

    GCONF_VALUE_STRING

    -String value (gchar*). +String value (gchar*).

    GCONF_VALUE_INT

    -Integer value (gint). +Integer value (gint).

    GCONF_VALUE_FLOAT

    -Floating point value (gdouble). +Floating point value (gdouble).

    GCONF_VALUE_BOOL

    -Boolean value (gboolean). +Boolean value (gboolean). @@ -287,7 +287,7 @@

    gconf_value_get_int ()

    int                 gconf_value_get_int                 (const GConfValue *value);

    -Returns a gint for a GConfValue with type GCONF_VALUE_INT. +Returns a gint for a GConfValue with type GCONF_VALUE_INT.

    @@ -298,7 +298,7 @@ - +

    Returns :

    		a gint.a gint.
    @@ -308,7 +308,7 @@

    gconf_value_get_float ()

    double              gconf_value_get_float               (const GConfValue *value);

    -Returns a gdouble for a GConfValue with type GCONF_VALUE_FLOAT. +Returns a gdouble for a GConfValue with type GCONF_VALUE_FLOAT.

    @@ -319,7 +319,7 @@ - +

    Returns :

    		a gdouble.a gdouble.
    @@ -349,11 +349,11 @@

    gconf_value_get_list ()

    -
    GSList *            gconf_value_get_list                (const GConfValue *value);
    +
    GSList *            gconf_value_get_list                (const GConfValue *value);

    -Returns a GSList containing GConfValue objects. Each GConfValue in +Returns a GSList containing GConfValue objects. Each GConfValue in the returned list will have the type returned by -gconf_value_get_list_type(). Remember that the empty GSList is equal to +gconf_value_get_list_type(). Remember that the empty GSList is equal to NULL. The list is not a copy; it is "owned" by the GConfValue and will be destroyed when the GConfValue is destroyed.

    @@ -366,7 +366,7 @@

    Returns :

    -a GList. [element-type GConfValue][transfer none] +a GList. [element-type GConfValue][transfer none] @@ -429,9 +429,9 @@

    gconf_value_get_bool ()

    -
    gboolean            gconf_value_get_bool                (const GConfValue *value);
    +
    gboolean            gconf_value_get_bool                (const GConfValue *value);

    -Returns a gboolean for a GConfValue with type GCONF_VALUE_BOOL. +Returns a gboolean for a GConfValue with type GCONF_VALUE_BOOL.

    @@ -442,7 +442,7 @@ - +

    Returns :

    		a gboolean value.a gboolean value.
    @@ -504,8 +504,8 @@

    gconf_value_new_from_string ()

    GConfValue *        gconf_value_new_from_string         (GConfValueType type,
-                                                         const gchar *str,
-                                                         GError **err);
    + const gchar *str, + GError **err);

    Creates a new GConfValue with type type and value set to the string passed. Based on the value of type, this function does the appropriate conversion of the @@ -521,7 +521,7 @@

    str :

    -the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

    err :

    @@ -576,7 +576,7 @@

    gconf_value_set_int ()

    void                gconf_value_set_int                 (GConfValue *value,
-                                                         gint the_int);
    + gint the_int);

    Sets the value of a GConfValue with type GCONF_VALUE_INT.

    @@ -598,7 +598,7 @@

    gconf_value_set_string ()

    void                gconf_value_set_string              (GConfValue *value,
-                                                         const gchar *the_str);
    + const gchar *the_str);

    Sets the value of a GConfValue with type GCONF_VALUE_STRING. the_str is copied. @@ -621,7 +621,7 @@

    gconf_value_set_float ()

    void                gconf_value_set_float               (GConfValue *value,
-                                                         gdouble the_float);
    + gdouble the_float);

    Sets the value of a GConfValue with type GCONF_VALUE_FLOAT. @@ -644,7 +644,7 @@

    gconf_value_set_bool ()

    void                gconf_value_set_bool                (GConfValue *value,
-                                                         gboolean the_bool);
    + gboolean the_bool);

    Sets the value of a GConfValue with type GCONF_VALUE_BOOL. @@ -839,10 +839,10 @@

    gconf_value_set_list_nocopy ()

    void                gconf_value_set_list_nocopy         (GConfValue *value,
-                                                         GSList *list);
    + GSList *list);

    Sets the value of a GConfValue with type GCONF_VALUE_LIST. The -list argument should be a GSList of GConfValue. Each GConfValue in +list argument should be a GSList of GConfValue. Each GConfValue in the list must have the same type, and this type must be specified in advance with gconf_value_set_list_type(). This function does not copy the list; the GConfValue will take @@ -859,7 +859,7 @@

    list :

    -the GSList of GConfValue to set as the list value. +the GSList of GConfValue to set as the list value.
    @@ -868,10 +868,10 @@

    gconf_value_set_list ()

    void                gconf_value_set_list                (GConfValue *value,
-                                                         GSList *list);
    + GSList *list);

    Sets the value of a GConfValue with type GCONF_VALUE_LIST. The -list argument should be a GSList of GConfValue. Each GConfValue in +list argument should be a GSList of GConfValue. Each GConfValue in the list must have the same type, and this type must be specified in advance with gconf_value_set_list_type(). This function copies the list; it will not modify the list argument. @@ -885,7 +885,7 @@

    list :

    -the GSList of GConfValue to set as the list value. +the GSList of GConfValue to set as the list value.
    @@ -893,7 +893,7 @@

    gconf_value_to_string ()

    -
    gchar *             gconf_value_to_string               (const GConfValue *value);
    +
    gchar *             gconf_value_to_string               (const GConfValue *value);

    Creates a human-readable string representation of a GConfValue. This is intended for debugging and the like; the string representation is @@ -901,7 +901,7 @@ this function to save a value to a file or anything like that). The exact nature of the string representation may change in future versions. The returned string is newly-allocated and must be freed -with g_free(). +with g_free().

    @@ -1003,7 +1003,7 @@

    gconf_meta_info_mod_time ()

    -
    GTime               gconf_meta_info_mod_time            (GConfMetaInfo *gcmi);
    +
    GTime               gconf_meta_info_mod_time            (GConfMetaInfo *gcmi);

    Returns the last modification time of the key.

    @@ -1016,7 +1016,7 @@
    - +

    Returns :

    		the mod_time, a GTime value.the mod_time, a GTime value.
    @@ -1025,7 +1025,7 @@

    gconf_meta_info_set_schema ()

    void                gconf_meta_info_set_schema          (GConfMetaInfo *gcmi,
-                                                         const gchar *schema_name);
    + const gchar *schema_name);

    Sets the schema_name field of the GConfMetaInfo to the name passed.

    @@ -1047,7 +1047,7 @@

    gconf_meta_info_set_mod_user ()

    void                gconf_meta_info_set_mod_user        (GConfMetaInfo *gcmi,
-                                                         const gchar *mod_user);
    + const gchar *mod_user);

    Sets the mod_user field of the GConfMetaInfo to the user name passed.

    @@ -1069,7 +1069,7 @@

    gconf_meta_info_set_mod_time ()

    void                gconf_meta_info_set_mod_time        (GConfMetaInfo *gcmi,
-                                                         GTime mod_time);
    + GTime mod_time);

    Sets the mod_last field of the GConfMetaInfo to the mod_time passed.

    @@ -1082,7 +1082,7 @@

    mod_time :

    -a GTime. +a GTime.
    @@ -1193,7 +1193,7 @@

    gconf_entry_get_is_default ()

    -
    gboolean            gconf_entry_get_is_default          (const GConfEntry *entry);
    +
    gboolean            gconf_entry_get_is_default          (const GConfEntry *entry);

    Returns the is_default field of the GConfEntry , a gboolean value.

    @@ -1206,7 +1206,7 @@

    Returns :

    -a gboolean value. +a gboolean value.
    @@ -1214,7 +1214,7 @@

    gconf_entry_get_is_writable ()

    -
    gboolean            gconf_entry_get_is_writable         (const GConfEntry *entry);
    +
    gboolean            gconf_entry_get_is_writable         (const GConfEntry *entry);

    Returns the is_writable field of the GConfEntry, a gboolean value.

    @@ -1227,7 +1227,7 @@

    Returns :

    -a gboolean value. +a gboolean value.
    @@ -1235,7 +1235,7 @@

    gconf_entry_new ()

    -
    GConfEntry *        gconf_entry_new                     (const gchar *key,
+
    GConfEntry *        gconf_entry_new                     (const gchar *key,
                                                          const GConfValue *val);
    
 
    
 Creates a new GConfEntry with key key and value val calling gconf_entry_new_nocopy().
@@ -1261,13 +1261,13 @@
 
    
 
    
 
    gconf_entry_new_nocopy ()
    
-
    GConfEntry *        gconf_entry_new_nocopy              (gchar *key,
+
    GConfEntry *        gconf_entry_new_nocopy              (gchar *key,
                                                          GConfValue *val);
    
 
    
 Creates a new GConfEntry with key key and value val. key should be a full
 path to the key, starting with '/'. Neither the key nor the value is copied;
 both are freed when the GConfEntry is freed. The string will be freed with
-g_free() so should be allocated with a GLib function, not malloc().
+g_free() so should be allocated with a GLib function, not malloc().
 
    
 
    @@ -1436,7 +1436,7 @@
 
    
 
    gconf_entry_set_schema_name ()
    
 
    void                gconf_entry_set_schema_name         (GConfEntry *entry,
-                                                         const gchar *name);
    
+                                                         const gchar *name);
 
    
 Sets the schema_name field of the GConfEntry to the name passed after freeing
 the already existing name.
@@ -1459,7 +1459,7 @@
 
    
 
    gconf_entry_set_is_default ()
    
 
    void                gconf_entry_set_is_default          (GConfEntry *entry,
-                                                         gboolean is_default);
    
+                                                         gboolean is_default);
 
    
 Sets the is_default field of the GConfEntry to the boolean value passed.
 
    
@@ -1481,7 +1481,7 @@
 
    
 
    gconf_entry_set_is_writable ()
    
 
    void                gconf_entry_set_is_writable         (GConfEntry *entry,
-                                                         gboolean is_writable);
    
+                                                         gboolean is_writable);
 
    
 Sets the is_writable field of the GConfEntry to the boolean value passed.
 
    
Binary files /tmp/XVMi6_KYgA/gconf-3.2.3/doc/gconf/html/home.png and /tmp/_BHXWtlj8n/gconf-3.2.4/doc/gconf/html/home.png differ
diff -Nru gconf-3.2.3/doc/gconf/html/index.html gconf-3.2.4/doc/gconf/html/index.html
--- gconf-3.2.3/doc/gconf/html/index.html	2011-10-31 15:33:37.000000000 +0000
+++ gconf-3.2.4/doc/gconf/html/index.html	2012-03-08 17:11:23.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 GConf Reference Manual
-
+
 
 
 
Binary files /tmp/XVMi6_KYgA/gconf-3.2.3/doc/gconf/html/left.png and /tmp/_BHXWtlj8n/gconf-3.2.4/doc/gconf/html/left.png differ
Binary files /tmp/XVMi6_KYgA/gconf-3.2.3/doc/gconf/html/right.png and /tmp/_BHXWtlj8n/gconf-3.2.4/doc/gconf/html/right.png differ
Binary files /tmp/XVMi6_KYgA/gconf-3.2.3/doc/gconf/html/up.png and /tmp/_BHXWtlj8n/gconf-3.2.4/doc/gconf/html/up.png differ
diff -Nru gconf-3.2.3/doc/gconf/Makefile.in gconf-3.2.4/doc/gconf/Makefile.in
--- gconf-3.2.3/doc/gconf/Makefile.in	2011-10-31 15:30:46.000000000 +0000
+++ gconf-3.2.4/doc/gconf/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -50,11 +50,11 @@
 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 = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -138,6 +138,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -232,6 +236,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@
@@ -365,6 +371,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
@@ -434,10 +441,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:
diff -Nru gconf-3.2.3/doc/Makefile.in gconf-3.2.4/doc/Makefile.in
--- gconf-3.2.3/doc/Makefile.in	2011-10-31 15:30:46.000000000 +0000
+++ gconf-3.2.4/doc/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -44,11 +44,11 @@
 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 = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -80,6 +80,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)$(SchemasDTDdir)"
 NROFF = nroff
@@ -198,6 +204,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -292,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@
@@ -396,9 +408,7 @@
 	  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-SchemasDTDDATA: $(SchemasDTD_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(SchemasDTDdir)" || $(MKDIR_P) "$(DESTDIR)$(SchemasDTDdir)"
@@ -416,9 +426,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(SchemasDTD_DATA)'; test -n "$(SchemasDTDdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(SchemasDTDdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(SchemasDTDdir)" && rm -f $$files
+	dir='$(DESTDIR)$(SchemasDTDdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -644,10 +652,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:
diff -Nru gconf-3.2.3/examples/Makefile.in gconf-3.2.4/examples/Makefile.in
--- gconf-3.2.3/examples/Makefile.in	2011-10-31 15:30:47.000000000 +0000
+++ gconf-3.2.4/examples/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -57,8 +57,8 @@
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
 	$(am__DEPENDENCIES_1)
 basic_gconf_app_DEPENDENCIES = $(am__DEPENDENCIES_2)
-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_complex_gconf_app_OBJECTS = basic-gconf-app.$(OBJEXT)
 complex_gconf_app_OBJECTS = $(am_complex_gconf_app_OBJECTS)
@@ -79,21 +79,21 @@
 	$(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 = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 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 = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 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 = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 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 = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(basic_gconf_app_SOURCES) $(complex_gconf_app_SOURCES) \
 	$(simple_controller_SOURCES) $(simple_view_SOURCES)
@@ -181,6 +181,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -275,6 +279,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@
@@ -356,16 +362,16 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-basic-gconf-app$(EXEEXT): $(basic_gconf_app_OBJECTS) $(basic_gconf_app_DEPENDENCIES) 
+basic-gconf-app$(EXEEXT): $(basic_gconf_app_OBJECTS) $(basic_gconf_app_DEPENDENCIES) $(EXTRA_basic_gconf_app_DEPENDENCIES) 
 	@rm -f basic-gconf-app$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(basic_gconf_app_OBJECTS) $(basic_gconf_app_LDADD) $(LIBS)
-complex-gconf-app$(EXEEXT): $(complex_gconf_app_OBJECTS) $(complex_gconf_app_DEPENDENCIES) 
+complex-gconf-app$(EXEEXT): $(complex_gconf_app_OBJECTS) $(complex_gconf_app_DEPENDENCIES) $(EXTRA_complex_gconf_app_DEPENDENCIES) 
 	@rm -f complex-gconf-app$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(complex_gconf_app_OBJECTS) $(complex_gconf_app_LDADD) $(LIBS)
-simple-controller$(EXEEXT): $(simple_controller_OBJECTS) $(simple_controller_DEPENDENCIES) 
+simple-controller$(EXEEXT): $(simple_controller_OBJECTS) $(simple_controller_DEPENDENCIES) $(EXTRA_simple_controller_DEPENDENCIES) 
 	@rm -f simple-controller$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(simple_controller_OBJECTS) $(simple_controller_LDADD) $(LIBS)
-simple-view$(EXEEXT): $(simple_view_OBJECTS) $(simple_view_DEPENDENCIES) 
+simple-view$(EXEEXT): $(simple_view_OBJECTS) $(simple_view_DEPENDENCIES) $(EXTRA_simple_view_DEPENDENCIES) 
 	@rm -f simple-view$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(simple_view_OBJECTS) $(simple_view_LDADD) $(LIBS)
 
@@ -382,26 +388,23 @@
 .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 $<
 
 .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 `$(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 $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -505,10 +508,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:
diff -Nru gconf-3.2.3/gconf/gconf-backend.c gconf-3.2.4/gconf/gconf-backend.c
--- gconf-3.2.3/gconf/gconf-backend.c	2011-07-01 13:01:20.000000000 +0000
+++ gconf-3.2.4/gconf/gconf-backend.c	2012-03-07 18:08:55.000000000 +0000
@@ -21,6 +21,7 @@
 #include 
 #include "gconf-backend.h"
 #include "gconf-internals.h"
+#include 
 #include 
 #include 
 #include 
@@ -171,6 +172,7 @@
   gchar* back;
   gchar* file;
   gchar* retval;
+  const gchar* backenddir;
 
   g_return_val_if_fail(address != NULL, NULL);
 
@@ -179,9 +181,13 @@
   if (back == NULL)
     return NULL;
 
+  backenddir = g_getenv("GCONF_BACKEND_DIR");
+  if (backenddir == NULL)
+    backenddir = GCONF_BACKEND_DIR;
+
   file = g_strconcat("gconfbackend-", back, NULL);
   
-  retval = g_module_build_path(GCONF_BACKEND_DIR, file);
+  retval = g_module_build_path(backenddir, file);
 
   g_free(back);
 
diff -Nru gconf-3.2.3/gconf/gconf-dbus.c gconf-3.2.4/gconf/gconf-dbus.c
--- gconf-3.2.3/gconf/gconf-dbus.c	2011-10-26 15:42:49.000000000 +0000
+++ gconf-3.2.4/gconf/gconf-dbus.c	2012-03-07 18:08:55.000000000 +0000
@@ -76,8 +76,6 @@
 
   gpointer owner;
   int owner_use_count;
-  
-  guint is_default : 1;
 
   /* If TRUE, this is a local engine (and therefore
    * has no ctable and no notifications)
@@ -299,7 +297,6 @@
       
       conf->local_sources = NULL;
       conf->is_local = FALSE;
-      conf->is_default = TRUE;
     }
   else
     {
@@ -308,7 +305,6 @@
       conf->notify_dirs = NULL;
       conf->local_sources = NULL;
       conf->is_local = TRUE;
-      conf->is_default = FALSE;
     }
   
   return conf;
@@ -512,8 +508,8 @@
   
   if (conf->database != NULL)
     return TRUE;
-  
-  if (conf->is_default)
+
+  if (conf->addresses == NULL)
     {
       message = dbus_message_new_method_call (GCONF_DBUS_SERVICE,
 					      GCONF_DBUS_SERVER_OBJECT,
@@ -811,7 +807,9 @@
 gconf_engine_get_default (void)
 {
   GConfEngine* conf = NULL;
-  
+  const gchar* source_path;
+  GError* err = NULL;
+
   if (default_engine)
     conf = default_engine;
   
@@ -819,9 +817,21 @@
     {
       conf = gconf_engine_blank (TRUE);
 
-      conf->is_default = TRUE;
-
       default_engine = conf;
+
+      source_path = g_getenv ("GCONF_DEFAULT_SOURCE_PATH");
+      if (source_path != NULL)
+       {
+         conf->addresses = gconf_load_source_path (source_path, &err);
+         if (err)
+           {
+             g_warning ("Could not parse GCONF_DEFAULT_SOURCE_PATH: %s",
+                        err->message);
+             g_error_free (err);
+           }
+       }
+      else
+       conf->addresses = NULL;
     }
   else
     conf->refcount += 1;
@@ -843,7 +853,6 @@
     {
       conf = gconf_engine_blank (TRUE);
 
-      conf->is_default = FALSE;
       conf->addresses = addresses;
 
       if (!ensure_database (conf, TRUE, err))
@@ -877,7 +886,6 @@
 
       conf = gconf_engine_blank (TRUE);
 
-      conf->is_default = FALSE;
       conf->addresses = NULL;
 
       tmp = addresses;
@@ -2021,6 +2029,7 @@
   if (db == NULL)
     {
       g_return_if_fail (err == NULL || *err != NULL);
+      return;
     }
   
   message = dbus_message_new_method_call (GCONF_DBUS_SERVICE,
diff -Nru gconf-3.2.3/gconf/gconfd.c gconf-3.2.4/gconf/gconfd.c
--- gconf-3.2.3/gconf/gconfd.c	2011-10-23 20:08:35.000000000 +0000
+++ gconf-3.2.4/gconf/gconfd.c	2012-03-07 18:08:55.000000000 +0000
@@ -65,6 +65,8 @@
 
 #include 
 
+static void logfile_remove (void);
+
 #ifdef G_OS_WIN32
 #include 
 #include 
@@ -174,6 +176,12 @@
  */
 static gboolean need_db_reload = FALSE;
 
+/*
+ * Flag indicating whether to prepare for respawn or logout
+ * when exiting
+ */
+static gboolean clean_shutdown_requested = FALSE;
+
 #ifdef HAVE_CORBA
 /* 
  * CORBA goo
@@ -346,6 +354,7 @@
   
   gconf_log(GCL_DEBUG, _("Shutdown request received"));
 
+  clean_shutdown_requested = TRUE;
   gconfd_main_quit();
 }
 #endif /* HAVE_CORBA */
@@ -488,6 +497,8 @@
      */
     enter_shutdown ();
 
+    clean_shutdown_requested = FALSE;
+
     /* let the fatal signals interrupt us */
     --in_fatal;
     
@@ -499,6 +510,8 @@
   case SIGTERM:
     enter_shutdown ();
 
+    clean_shutdown_requested = TRUE;
+
     /* let the fatal signals interrupt us */
     --in_fatal;
     
@@ -525,6 +538,7 @@
 #endif
     
   default:
+    clean_shutdown_requested = FALSE;
 #ifndef HAVE_SIGACTION
     signal (signo, signal_handler);
 #endif
@@ -573,6 +587,10 @@
                               DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
+      /* Since the log file is per-session, we should make sure it's
+       * removed when the session is over.
+       */
+      clean_shutdown_requested = TRUE;
       gconfd_main_quit ();
       return DBUS_HANDLER_RESULT_HANDLED;
     }
@@ -991,9 +1009,13 @@
 
 #ifdef HAVE_CORBA
   /* Save current state in logfile (may compress the logfile a good
-   * bit)
+   * bit) if we're exiting but may respawn.  Clean up the logfile, if
+   * the session is going away.
    */
-  logfile_save ();
+  if (clean_shutdown_requested)
+    logfile_remove ();
+  else
+    logfile_save ();
 #endif
   
   shutdown_databases ();
@@ -1637,6 +1659,30 @@
  * Logging
  */
 
+static const char *
+get_session_guid (void)
+{
+  const char *session_bus_address;
+  const char *guid;
+
+  /* FIXME: we may want to use dbus-address.h functions here
+   */
+  session_bus_address = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
+
+  if (session_bus_address == NULL)
+    return NULL;
+
+  guid = g_strrstr (session_bus_address, "guid=");
+
+  if (guid == NULL)
+    return NULL;
+
+  if (guid[0] == '\0')
+    return NULL;
+
+  return guid + strlen ("guid=");
+}
+
 /*
    The log file records the current listeners we have registered,
    so we can restore them if we exit and restart.
@@ -1665,14 +1711,23 @@
 static void
 get_log_names (gchar **logdir, gchar **logfile)
 {
-#ifndef G_OS_WIN32
-      const char *home = g_get_home_dir ();
-#else
-      const char *home = _gconf_win32_get_home_dir ();
-#endif
+  const char *session_guid;
+  char *state_file;
+
+  *logdir = gconf_get_daemon_dir ();
 
-  *logdir = g_build_filename (home, ".gconfd", NULL);
-  *logfile = g_build_filename (*logdir, "saved_state", NULL);
+  /* We make the state file per-session so multiple gconfds
+   * don't stomp over each other.
+   */
+  session_guid = get_session_guid ();
+
+  if (session_guid != NULL)
+    state_file = g_strdup_printf ("saved_state_%s", session_guid);
+  else
+    state_file = g_strdup ("saved_state");
+
+  *logfile = g_build_filename (*logdir, state_file, NULL);
+  g_free (state_file);
 }
 
 static void close_append_handle (void);
@@ -1895,6 +1950,21 @@
     close (fd);
 }
 
+static void
+logfile_remove (void)
+{
+  gchar *logdir = NULL;
+  gchar *logfile = NULL;
+
+  get_log_names (&logdir, &logfile);
+
+  g_unlink (logfile);
+
+  g_free (logdir);
+  g_free (logfile);
+}
+
+
 typedef struct _ListenerLogEntry ListenerLogEntry;
 
 struct _ListenerLogEntry
diff -Nru gconf-3.2.3/gconf/gconf-internals.c gconf-3.2.4/gconf/gconf-internals.c
--- gconf-3.2.3/gconf/gconf-internals.c	2011-07-04 13:33:10.000000000 +0000
+++ gconf-3.2.4/gconf/gconf-internals.c	2012-03-07 18:08:55.000000000 +0000
@@ -2796,13 +2796,18 @@
       const char *tmpdir;
 
       subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
-      
-      if (g_getenv ("GCONF_TMPDIR")) {
-	tmpdir = g_getenv ("GCONF_TMPDIR");
-      } else {
-	tmpdir = g_get_tmp_dir ();
-      }
-      
+
+      if (g_getenv ("GCONF_TMPDIR"))
+        tmpdir = g_getenv ("GCONF_TMPDIR");
+      else if (g_getenv ("XDG_RUNTIME_DIR"))
+        {
+          g_free (subdir);
+          subdir = g_strdup ("gconfd");
+          tmpdir = g_getenv ("XDG_RUNTIME_DIR");
+        }
+      else
+        tmpdir = g_get_tmp_dir ();
+
       s = g_build_filename (tmpdir, subdir, NULL);
 
       g_free (subdir);
diff -Nru gconf-3.2.3/gconf/gconf-sources.c gconf-3.2.4/gconf/gconf-sources.c
--- gconf-3.2.3/gconf/gconf-sources.c	2011-07-01 13:01:20.000000000 +0000
+++ gconf-3.2.4/gconf/gconf-sources.c	2012-03-07 20:06:01.000000000 +0000
@@ -398,9 +398,7 @@
   {
     GList *tmp;
     int i;
-    gboolean some_writable;
 
-    some_writable = FALSE;
     i = 0;
     tmp = sources->sources;
     while (tmp != NULL)
@@ -409,7 +407,6 @@
 
         if (source->flags & GCONF_SOURCE_ALL_WRITEABLE)
           {
-            some_writable = TRUE;
             gconf_log (GCL_DEBUG,
                        _("Resolved address \"%s\" to a writable configuration source at position %d"),
                        source->address, i);
@@ -422,7 +419,6 @@
           }
         else
           {
-            some_writable = TRUE;
             gconf_log (GCL_DEBUG,
                        _("Resolved address \"%s\" to a partially writable configuration source at position %d"),
                        source->address, i);
@@ -431,9 +427,6 @@
         ++i;
         tmp = tmp->next;
       }
-
-    if (!some_writable)
-      gconf_log (GCL_WARNING, _("None of the resolved addresses are writable; saving configuration settings will not be possible"));
   }
   
   return sources;
diff -Nru gconf-3.2.3/gconf/Makefile.in gconf-3.2.4/gconf/Makefile.in
--- gconf-3.2.3/gconf/Makefile.in	2011-10-31 15:30:47.000000000 +0000
+++ gconf-3.2.4/gconf/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -86,6 +86,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; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(girdir)" \
 	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(typelibsdir)" \
@@ -112,8 +118,8 @@
 	gconf-value.lo gconf.lo gconf-client.lo gconf-enum-types.lo \
 	$(am__objects_1) $(am__objects_3) $(am__objects_4)
 libgconf_2_la_OBJECTS = $(am_libgconf_2_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
 libgconf_2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -155,21 +161,21 @@
 	$(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 = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 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 = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 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 = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 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 = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgconf_2_la_SOURCES) $(gconf_sanity_check_2_SOURCES) \
 	$(gconfd_2_SOURCES) $(gconftool_2_SOURCES)
@@ -260,6 +266,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -354,6 +364,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@
@@ -534,7 +546,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgconf-2.la: $(libgconf_2_la_OBJECTS) $(libgconf_2_la_DEPENDENCIES) 
+libgconf-2.la: $(libgconf_2_la_OBJECTS) $(libgconf_2_la_DEPENDENCIES) $(EXTRA_libgconf_2_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgconf_2_la_LINK) -rpath $(libdir) $(libgconf_2_la_OBJECTS) $(libgconf_2_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -622,13 +634,13 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) 
+gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) $(EXTRA_gconf_sanity_check_2_DEPENDENCIES) 
 	@rm -f gconf-sanity-check-2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
-gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) 
+gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) $(EXTRA_gconfd_2_DEPENDENCIES) 
 	@rm -f gconfd-2$(EXEEXT)
 	$(AM_V_CCLD)$(gconfd_2_LINK) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
-gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) 
+gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) $(EXTRA_gconftool_2_DEPENDENCIES) 
 	@rm -f gconftool-2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
 
@@ -666,90 +678,79 @@
 .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 $<
 
 .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 `$(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 $@ $<
 
 gconfd_2-gconf-database.o: gconf-database.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconf-database.o -MD -MP -MF $(DEPDIR)/gconfd_2-gconf-database.Tpo -c -o gconfd_2-gconf-database.o `test -f 'gconf-database.c' || echo '$(srcdir)/'`gconf-database.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconf-database.Tpo $(DEPDIR)/gconfd_2-gconf-database.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-database.c' object='gconfd_2-gconf-database.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconf-database.c' object='gconfd_2-gconf-database.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database.o `test -f 'gconf-database.c' || echo '$(srcdir)/'`gconf-database.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database.o `test -f 'gconf-database.c' || echo '$(srcdir)/'`gconf-database.c
 
 gconfd_2-gconf-database.obj: gconf-database.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconf-database.obj -MD -MP -MF $(DEPDIR)/gconfd_2-gconf-database.Tpo -c -o gconfd_2-gconf-database.obj `if test -f 'gconf-database.c'; then $(CYGPATH_W) 'gconf-database.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconf-database.Tpo $(DEPDIR)/gconfd_2-gconf-database.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-database.c' object='gconfd_2-gconf-database.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconf-database.c' object='gconfd_2-gconf-database.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database.obj `if test -f 'gconf-database.c'; then $(CYGPATH_W) 'gconf-database.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database.obj `if test -f 'gconf-database.c'; then $(CYGPATH_W) 'gconf-database.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database.c'; fi`
 
 gconfd_2-gconfd.o: gconfd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconfd.o -MD -MP -MF $(DEPDIR)/gconfd_2-gconfd.Tpo -c -o gconfd_2-gconfd.o `test -f 'gconfd.c' || echo '$(srcdir)/'`gconfd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconfd.Tpo $(DEPDIR)/gconfd_2-gconfd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfd.c' object='gconfd_2-gconfd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfd.c' object='gconfd_2-gconfd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd.o `test -f 'gconfd.c' || echo '$(srcdir)/'`gconfd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd.o `test -f 'gconfd.c' || echo '$(srcdir)/'`gconfd.c
 
 gconfd_2-gconfd.obj: gconfd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconfd.obj -MD -MP -MF $(DEPDIR)/gconfd_2-gconfd.Tpo -c -o gconfd_2-gconfd.obj `if test -f 'gconfd.c'; then $(CYGPATH_W) 'gconfd.c'; else $(CYGPATH_W) '$(srcdir)/gconfd.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconfd.Tpo $(DEPDIR)/gconfd_2-gconfd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfd.c' object='gconfd_2-gconfd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfd.c' object='gconfd_2-gconfd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd.obj `if test -f 'gconfd.c'; then $(CYGPATH_W) 'gconfd.c'; else $(CYGPATH_W) '$(srcdir)/gconfd.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd.obj `if test -f 'gconfd.c'; then $(CYGPATH_W) 'gconfd.c'; else $(CYGPATH_W) '$(srcdir)/gconfd.c'; fi`
 
 gconfd_2-gconfd-dbus.o: gconfd-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconfd-dbus.o -MD -MP -MF $(DEPDIR)/gconfd_2-gconfd-dbus.Tpo -c -o gconfd_2-gconfd-dbus.o `test -f 'gconfd-dbus.c' || echo '$(srcdir)/'`gconfd-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconfd-dbus.Tpo $(DEPDIR)/gconfd_2-gconfd-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfd-dbus.c' object='gconfd_2-gconfd-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfd-dbus.c' object='gconfd_2-gconfd-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd-dbus.o `test -f 'gconfd-dbus.c' || echo '$(srcdir)/'`gconfd-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd-dbus.o `test -f 'gconfd-dbus.c' || echo '$(srcdir)/'`gconfd-dbus.c
 
 gconfd_2-gconfd-dbus.obj: gconfd-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconfd-dbus.obj -MD -MP -MF $(DEPDIR)/gconfd_2-gconfd-dbus.Tpo -c -o gconfd_2-gconfd-dbus.obj `if test -f 'gconfd-dbus.c'; then $(CYGPATH_W) 'gconfd-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconfd-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconfd-dbus.Tpo $(DEPDIR)/gconfd_2-gconfd-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfd-dbus.c' object='gconfd_2-gconfd-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfd-dbus.c' object='gconfd_2-gconfd-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd-dbus.obj `if test -f 'gconfd-dbus.c'; then $(CYGPATH_W) 'gconfd-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconfd-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconfd-dbus.obj `if test -f 'gconfd-dbus.c'; then $(CYGPATH_W) 'gconfd-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconfd-dbus.c'; fi`
 
 gconfd_2-gconf-database-dbus.o: gconf-database-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconf-database-dbus.o -MD -MP -MF $(DEPDIR)/gconfd_2-gconf-database-dbus.Tpo -c -o gconfd_2-gconf-database-dbus.o `test -f 'gconf-database-dbus.c' || echo '$(srcdir)/'`gconf-database-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconf-database-dbus.Tpo $(DEPDIR)/gconfd_2-gconf-database-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-database-dbus.c' object='gconfd_2-gconf-database-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconf-database-dbus.c' object='gconfd_2-gconf-database-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database-dbus.o `test -f 'gconf-database-dbus.c' || echo '$(srcdir)/'`gconf-database-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database-dbus.o `test -f 'gconf-database-dbus.c' || echo '$(srcdir)/'`gconf-database-dbus.c
 
 gconfd_2-gconf-database-dbus.obj: gconf-database-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -MT gconfd_2-gconf-database-dbus.obj -MD -MP -MF $(DEPDIR)/gconfd_2-gconf-database-dbus.Tpo -c -o gconfd_2-gconf-database-dbus.obj `if test -f 'gconf-database-dbus.c'; then $(CYGPATH_W) 'gconf-database-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gconfd_2-gconf-database-dbus.Tpo $(DEPDIR)/gconfd_2-gconf-database-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-database-dbus.c' object='gconfd_2-gconf-database-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconf-database-dbus.c' object='gconfd_2-gconf-database-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database-dbus.obj `if test -f 'gconf-database-dbus.c'; then $(CYGPATH_W) 'gconf-database-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gconfd_2_CFLAGS) $(CFLAGS) -c -o gconfd_2-gconf-database-dbus.obj `if test -f 'gconf-database-dbus.c'; then $(CYGPATH_W) 'gconf-database-dbus.c'; else $(CYGPATH_W) '$(srcdir)/gconf-database-dbus.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -773,9 +774,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(girdir)" && rm -f $$files
+	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
@@ -793,9 +792,7 @@
 	@$(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-typelibsDATA: $(typelibs_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)"
@@ -813,9 +810,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir)
 install-gconfincludeHEADERS: $(gconfinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(gconfincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gconfincludedir)"
@@ -833,9 +828,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gconfinclude_HEADERS)'; test -n "$(gconfincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(gconfincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gconfincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(gconfincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -943,10 +936,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:
diff -Nru gconf-3.2.3/gsettings/gsettings-data-convert.1 gconf-3.2.4/gsettings/gsettings-data-convert.1
--- gconf-3.2.3/gsettings/gsettings-data-convert.1	2011-10-31 15:32:53.000000000 +0000
+++ gconf-3.2.4/gsettings/gsettings-data-convert.1	2012-03-08 17:11:22.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: gsettings-data-convert
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 
-.\"      Date: 10/31/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 
+.\"      Date: 03/08/2012
 .\"    Manual: User Commands
 .\"    Source: User Commands
 .\"  Language: English
 .\"
-.TH "GSETTINGS\-DATA\-CON" "1" "10/31/2011" "User Commands" "User Commands"
+.TH "GSETTINGS\-DATA\-CON" "1" "03/08/2012" "User Commands" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru gconf-3.2.3/gsettings/gsettings-data-convert.c gconf-3.2.4/gsettings/gsettings-data-convert.c
--- gconf-3.2.3/gsettings/gsettings-data-convert.c	2011-10-23 19:15:55.000000000 +0000
+++ gconf-3.2.4/gsettings/gsettings-data-convert.c	2012-03-08 16:21:31.000000000 +0000
@@ -27,13 +27,74 @@
 
 #include 
 #include 
+#define GCONF_ENABLE_INTERNALS
+#include 
 #include 
 
 static gboolean changed = FALSE;
 static gboolean verbose = FALSE;
 static gboolean dry_run = FALSE;
 
-extern const gchar *gconf_value_type_to_string (int type);
+/* We only want to migrate settings that were in writable databases (in
+ * order to avoid 'lifting' system defaults into the user's database).
+ *
+ * We also want to perform the access to those readwrite databases
+ * readonly, since we're not making any changes.
+ *
+ * For that reason, we compile our own source list by scanning the
+ * default list.  We take all :readwrite: sources, changing them to
+ * :readonly: as we do so.
+ */
+static GSList *
+get_writable_source_path (void)
+{
+  GSList *result = NULL;
+  gchar *config_file;
+  GSList *addresses;
+  GSList *node;
+
+  config_file = g_strconcat (GCONF_CONFDIR, "/path", NULL);
+  addresses = gconf_load_source_path (config_file, NULL);
+  g_free (config_file);
+
+  for (node = addresses; node; node = node->next)
+    {
+      const gchar *address = node->data;
+      const gchar *match;
+
+      match = strstr (address, ":readwrite:");
+
+      if (match)
+        {
+          gchar *copy;
+
+          copy = g_malloc (strlen (match) - 1 + 1);
+          memcpy (copy, address, match - address);
+          memcpy (copy + (match - address), ":readonly:", 10);
+          strcpy (copy + (match - address) + 10, match + 11);
+          result = g_slist_prepend (result, copy);
+        }
+    }
+
+  result = g_slist_reverse (result);
+
+  gconf_address_list_free (addresses);
+
+  return result;
+}
+
+static GConfClient *
+get_writable_client (void)
+{
+  GConfEngine *engine;
+  GSList *addresses;
+
+  addresses = get_writable_source_path ();
+  engine = gconf_engine_get_local_for_addresses (addresses, NULL);
+  gconf_address_list_free (addresses);
+
+  return gconf_client_get_for_engine (engine);
+}
 
 static gboolean
 type_uint32 (GSettings   *settings,
@@ -65,6 +126,8 @@
   gchar *str;
   gint ii;
   GSList *list, *l;
+  GSettingsSchemaSource *source;
+  GSettingsSchema *schema;
   GSettings *settings;
   GError *error;
 
@@ -82,7 +145,8 @@
       return FALSE;
     }
 
-  client = gconf_client_get_default ();
+  client = get_writable_client ();
+  source = g_settings_schema_source_get_default ();
 
   groups = g_key_file_get_groups (keyfile, NULL);
   for (i = 0; groups[i]; i++)
@@ -91,9 +155,23 @@
 
       schema_path = g_strsplit (groups[i], ":", 2);
 
+      schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
+      if (schema == NULL)
+        {
+          if (verbose)
+            {
+              g_print ("Schema '%s' not found, skipping\n", schema_path[0]);
+            }
+
+          g_strfreev (schema_path);
+          continue;
+        }
+
+      g_settings_schema_unref (schema);
+
       if (verbose)
         {
-          g_print ("collecting settings for schema '%s'\n", schema_path[0]);
+          g_print ("Collecting settings for schema '%s'\n", schema_path[0]);
           if (schema_path[1])
             g_print ("for storage at '%s'\n", schema_path[1]);
         }
@@ -157,7 +235,7 @@
             {
             case GCONF_VALUE_STRING:
               if (dry_run)
-                g_print ("set key '%s' to string '%s'\n", keys[j],
+                g_print ("Set key '%s' to string '%s'\n", keys[j],
                          gconf_value_get_string (value));
               else
                 g_settings_set (settings, keys[j], "s",
@@ -166,7 +244,7 @@
 
             case GCONF_VALUE_INT:
               if (dry_run)
-                g_print ("set key '%s' to integer '%d'\n",
+                g_print ("Set key '%s' to integer '%d'\n",
                          keys[j], gconf_value_get_int (value));
               else
                 {
@@ -193,7 +271,7 @@
 
             case GCONF_VALUE_BOOL:
               if (dry_run)
-                g_print ("set key '%s' to boolean '%d'\n",
+                g_print ("Set key '%s' to boolean '%d'\n",
                          keys[j], gconf_value_get_bool (value));
               else
                 g_settings_set (settings, keys[j], "b",
@@ -202,7 +280,7 @@
 
             case GCONF_VALUE_FLOAT:
               if (dry_run)
-                g_print ("set key '%s' to double '%g'\n",
+                g_print ("Set key '%s' to double '%g'\n",
                          keys[j], gconf_value_get_float (value));
               else
                 g_settings_set (settings, keys[j], "d",
@@ -232,7 +310,7 @@
                   if (dry_run)
                     {
                       str = g_variant_print (v, FALSE);
-                      g_print ("set key '%s' to a list of strings: %s\n",
+                      g_print ("Set key '%s' to a list of strings: %s\n",
                                keys[j], str);
                       g_free (str);
                     }
@@ -263,7 +341,7 @@
                   if (dry_run)
                     {
                       str = g_variant_print (v, FALSE);
-                      g_print ("set key '%s' to a list of integers: %s\n",
+                      g_print ("Set key '%s' to a list of integers: %s\n",
                                keys[j], str);
                       g_free (str);
                     }
diff -Nru gconf-3.2.3/gsettings/gsettings-schema-convert.1 gconf-3.2.4/gsettings/gsettings-schema-convert.1
--- gconf-3.2.3/gsettings/gsettings-schema-convert.1	2011-10-31 15:32:53.000000000 +0000
+++ gconf-3.2.4/gsettings/gsettings-schema-convert.1	2012-03-08 17:11:22.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: gsettings-schema-convert
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 
-.\"      Date: 10/31/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 
+.\"      Date: 03/08/2012
 .\"    Manual: User Commands
 .\"    Source: User Commands
 .\"  Language: English
 .\"
-.TH "GSETTINGS\-SCHEMA\-C" "1" "10/31/2011" "User Commands" "User Commands"
+.TH "GSETTINGS\-SCHEMA\-C" "1" "03/08/2012" "User Commands" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru gconf-3.2.3/gsettings/Makefile.am gconf-3.2.4/gsettings/Makefile.am
--- gconf-3.2.3/gsettings/Makefile.am	2011-07-01 13:01:20.000000000 +0000
+++ gconf-3.2.4/gsettings/Makefile.am	2012-03-08 17:01:28.000000000 +0000
@@ -29,6 +29,8 @@
 	-I$(top_srcdir)         \
 	-I$(top_builddir)       \
 	-DDATADIR=\"$(datadir)\" \
+	-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \
+	$(DEPENDENT_ORBIT_CFLAGS) \
 	$(GSETTINGS_CFLAGS)
 
 gsettings_data_convert_SOURCES = gsettings-data-convert.c
@@ -42,10 +44,14 @@
 autostart_in_files = gsettings-data-convert.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
-man_MANS =                       \
+man_MANS =
+
+if ENABLE_DOCUMENTATION
+man_MANS +=			\
 	gsettings-schema-convert.1 \
 	gsettings-data-convert.1 \
 	$(NULL)
+endif
 
 %.1 : %.xml
 	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -63,4 +69,9 @@
 		$(GIO_QUERYMODULES) $(GIO_MODULE_DIR) ;                                         \
 	fi
 
+uninstall-hook:
+	if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then                         \
+		$(GIO_QUERYMODULES) $(GIO_MODULE_DIR) ;                                         \
+	fi
+
 CLEANFILES = $(autostart_DATA)
diff -Nru gconf-3.2.3/gsettings/Makefile.in gconf-3.2.4/gsettings/Makefile.in
--- gconf-3.2.3/gsettings/Makefile.in	2011-10-31 15:30:47.000000000 +0000
+++ gconf-3.2.4/gsettings/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -38,6 +38,11 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = gsettings-data-convert$(EXEEXT)
+@ENABLE_DOCUMENTATION_TRUE@am__append_1 = \
+@ENABLE_DOCUMENTATION_TRUE@	gsettings-schema-convert.1 \
+@ENABLE_DOCUMENTATION_TRUE@	gsettings-data-convert.1 \
+@ENABLE_DOCUMENTATION_TRUE@	$(NULL)
+
 subdir = gsettings
 DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -70,6 +75,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; }; \
+  }
 am__installdirs = "$(DESTDIR)$(giomoduledir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(autostartdir)"
@@ -82,8 +93,8 @@
 	libgsettingsgconfbackend_la-gconfsettingsbackend.lo
 libgsettingsgconfbackend_la_OBJECTS =  \
 	$(am_libgsettingsgconfbackend_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
 libgsettingsgconfbackend_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -105,21 +116,21 @@
 	$(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 = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 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 = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 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 = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 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 = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgsettingsgconfbackend_la_SOURCES) \
 	$(gsettings_data_convert_SOURCES)
@@ -211,6 +222,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -305,6 +320,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@
@@ -353,6 +370,8 @@
 	-I$(top_srcdir)         \
 	-I$(top_builddir)       \
 	-DDATADIR=\"$(datadir)\" \
+	-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \
+	$(DEPENDENT_ORBIT_CFLAGS) \
 	$(GSETTINGS_CFLAGS)
 
 gsettings_data_convert_SOURCES = gsettings-data-convert.c
@@ -364,11 +383,7 @@
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gsettings-data-convert.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-man_MANS = \
-	gsettings-schema-convert.1 \
-	gsettings-data-convert.1 \
-	$(NULL)
-
+man_MANS = $(am__append_1)
 EXTRA_DIST = gsettings-data-convert.xml gsettings-schema-convert.xml gsettings-data-convert.1 gsettings-schema-convert.1 gsettings-data-convert.desktop.in
 CLEANFILES = $(autostart_DATA)
 all: all-am
@@ -436,7 +451,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgsettingsgconfbackend.la: $(libgsettingsgconfbackend_la_OBJECTS) $(libgsettingsgconfbackend_la_DEPENDENCIES) 
+libgsettingsgconfbackend.la: $(libgsettingsgconfbackend_la_OBJECTS) $(libgsettingsgconfbackend_la_DEPENDENCIES) $(EXTRA_libgsettingsgconfbackend_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgsettingsgconfbackend_la_LINK) -rpath $(giomoduledir) $(libgsettingsgconfbackend_la_OBJECTS) $(libgsettingsgconfbackend_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -481,7 +496,7 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gsettings-data-convert$(EXEEXT): $(gsettings_data_convert_OBJECTS) $(gsettings_data_convert_DEPENDENCIES) 
+gsettings-data-convert$(EXEEXT): $(gsettings_data_convert_OBJECTS) $(gsettings_data_convert_DEPENDENCIES) $(EXTRA_gsettings_data_convert_DEPENDENCIES) 
 	@rm -f gsettings-data-convert$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gsettings_data_convert_OBJECTS) $(gsettings_data_convert_LDADD) $(LIBS)
 install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
@@ -515,9 +530,7 @@
 	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -532,42 +545,37 @@
 .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 $<
 
 .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 `$(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 $@ $<
 
 libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo: gconfsettingsbackend-module.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -MT libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo -MD -MP -MF $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend-module.Tpo -c -o libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo `test -f 'gconfsettingsbackend-module.c' || echo '$(srcdir)/'`gconfsettingsbackend-module.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend-module.Tpo $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend-module.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfsettingsbackend-module.c' object='libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfsettingsbackend-module.c' object='libgsettingsgconfbackend_la-gconfsettingsbackend-module.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -c -o libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo `test -f 'gconfsettingsbackend-module.c' || echo '$(srcdir)/'`gconfsettingsbackend-module.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -c -o libgsettingsgconfbackend_la-gconfsettingsbackend-module.lo `test -f 'gconfsettingsbackend-module.c' || echo '$(srcdir)/'`gconfsettingsbackend-module.c
 
 libgsettingsgconfbackend_la-gconfsettingsbackend.lo: gconfsettingsbackend.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -MT libgsettingsgconfbackend_la-gconfsettingsbackend.lo -MD -MP -MF $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend.Tpo -c -o libgsettingsgconfbackend_la-gconfsettingsbackend.lo `test -f 'gconfsettingsbackend.c' || echo '$(srcdir)/'`gconfsettingsbackend.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend.Tpo $(DEPDIR)/libgsettingsgconfbackend_la-gconfsettingsbackend.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconfsettingsbackend.c' object='libgsettingsgconfbackend_la-gconfsettingsbackend.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gconfsettingsbackend.c' object='libgsettingsgconfbackend_la-gconfsettingsbackend.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -c -o libgsettingsgconfbackend_la-gconfsettingsbackend.lo `test -f 'gconfsettingsbackend.c' || echo '$(srcdir)/'`gconfsettingsbackend.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsettingsgconfbackend_la_CFLAGS) $(CFLAGS) -c -o libgsettingsgconfbackend_la-gconfsettingsbackend.lo `test -f 'gconfsettingsbackend.c' || echo '$(srcdir)/'`gconfsettingsbackend.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -609,9 +617,7 @@
 	  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-autostartDATA: $(autostart_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
@@ -629,9 +635,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
+	dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -745,10 +749,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:
@@ -835,10 +844,11 @@
 uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
 	uninstall-dist_binSCRIPTS uninstall-giomoduleLTLIBRARIES \
 	uninstall-man
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-data-am install-strip
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-giomoduleLTLIBRARIES clean-libtool ctags \
@@ -857,7 +867,7 @@
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-autostartDATA uninstall-binPROGRAMS \
 	uninstall-dist_binSCRIPTS uninstall-giomoduleLTLIBRARIES \
-	uninstall-man uninstall-man1
+	uninstall-hook uninstall-man uninstall-man1
 
 
 @INTLTOOL_DESKTOP_RULE@
@@ -876,6 +886,11 @@
 		$(GIO_QUERYMODULES) $(GIO_MODULE_DIR) ;                                         \
 	fi
 
+uninstall-hook:
+	if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then                         \
+		$(GIO_QUERYMODULES) $(GIO_MODULE_DIR) ;                                         \
+	fi
+
 # 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.
 .NOEXPORT:
diff -Nru gconf-3.2.3/INSTALL gconf-3.2.4/INSTALL
--- gconf-3.2.3/INSTALL	2011-10-31 15:30:47.000000000 +0000
+++ gconf-3.2.4/INSTALL	2012-03-08 17:10:54.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-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -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
diff -Nru gconf-3.2.3/install-sh gconf-3.2.4/install-sh
--- gconf-3.2.3/install-sh	2011-10-31 15:30:46.000000000 +0000
+++ gconf-3.2.4/install-sh	2012-03-08 17:10:54.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -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
 
@@ -200,7 +208,11 @@
 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.
@@ -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 gconf-3.2.3/ltmain.sh gconf-3.2.4/ltmain.sh
--- gconf-3.2.3/ltmain.sh	2011-10-31 15:30:40.000000000 +0000
+++ gconf-3.2.4/ltmain.sh	2012-03-08 17:10:50.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 Debian-2.4-4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-4"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
 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"
@@ -6150,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"
@@ -6834,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
@@ -7319,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
@@ -7438,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"
@@ -8026,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=
@@ -8056,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
@@ -8064,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.
@@ -9158,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"
@@ -9267,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 gconf-3.2.3/Makefile.in gconf-3.2.4/Makefile.in
--- gconf-3.2.3/Makefile.in	2011-10-31 15:30:47.000000000 +0000
+++ gconf-3.2.4/Makefile.in	2012-03-08 17:10:54.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -53,11 +53,11 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = gconf-2.m4 gconf-zip gconf-2.0.pc
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+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_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -89,6 +89,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; }; \
+  }
 am__installdirs = "$(DESTDIR)$(aclocaldir)" \
 	"$(DESTDIR)$(pkgconfigdir)"
 DATA = $(aclocal_DATA) $(pkgconfig_DATA)
@@ -103,9 +109,11 @@
 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__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -134,6 +142,8 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.bz2
 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@
@@ -214,6 +224,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@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -308,6 +322,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@
@@ -353,7 +369,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -389,10 +405,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -436,9 +450,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(aclocaldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(aclocaldir)" && rm -f $$files
+	dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -456,9 +468,7 @@
 	@$(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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -669,7 +679,11 @@
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -677,7 +691,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -694,7 +708,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -708,6 +722,8 @@
 	  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*) \
@@ -727,6 +743,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -755,8 +772,16 @@
 	  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)"; \
@@ -790,10 +815,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:
@@ -883,11 +913,11 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool 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 distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-aclocalDATA install-am install-data \
+	dist-gzip dist-hook dist-lzip dist-lzma 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-aclocalDATA 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-man install-pdf \
diff -Nru gconf-3.2.3/missing gconf-3.2.4/missing
--- gconf-3.2.3/missing	2011-10-31 15:30:46.000000000 +0000
+++ gconf-3.2.4/missing	2012-03-08 17:10:54.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard , 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   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]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # 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
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     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.
diff -Nru gconf-3.2.3/NEWS gconf-3.2.4/NEWS
--- gconf-3.2.3/NEWS	2011-10-31 15:30:02.000000000 +0000
+++ gconf-3.2.4/NEWS	2012-03-08 17:09:44.000000000 +0000
@@ -1,3 +1,20 @@
+3.2.4
+=====
+
+Fixes:
+
+    * 671581 - don't migrate vendor settings to the user's dconf database
+
+    * 652289 - store daemon data in XDG_RUNTIME_DIR
+
+    * 670033 - don't crash during sync if gconfd shutting down
+
+    * 664031 - D-Bus backend: Add GCONF_DEFAULT_SOURCE_PATH support
+
+    * don't attempt to migrate settings with non-existent schemas
+
+    * update the GIO cache after 'make uninstall' (fixes 'make distcheck')
+
 3.2.3
 =====
 
diff -Nru gconf-3.2.3/po/be.po gconf-3.2.4/po/be.po
--- gconf-3.2.3/po/be.po	2011-07-01 13:01:20.000000000 +0000
+++ gconf-3.2.4/po/be.po	2012-03-07 18:08:55.000000000 +0000
@@ -1,109 +1,104 @@
-# Belarusian translation of gconf.
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-# Vital Khilko , 2003
-# 
+# Vital Khilko , 2003.
+# Kasia Bondarava , 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: gconf HEAD\n"
+"Project-Id-Version: gconf master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 12:08-0300\n"
-"PO-Revision-Date: 2005-11-17 13:08+0200\n"
-"Last-Translator: Ales Nyakhaychyk \n"
-"Language-Team: Belarusian \n"
+"POT-Creation-Date: 2012-02-26 01:14+0300\n"
+"PO-Revision-Date: 2012-02-26 01:14+0300\n"
+"Last-Translator: Kasia Bondarava \n"
+"Language-Team: Belarusian \n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
-# gconf/gconftool.c:629
-#: backends/evoldap-backend.c:158
+#: ../backends/evoldap-backend.c:162
 #, c-format
 msgid "Failed to get configuration file path from '%s'"
-msgstr "Збой атрыманьня канфігурацыйнага файла з \"%s\""
+msgstr "Не ўдалося атрымаць файлавую сцежку канфігурацыі з \"%s\""
 
-#: backends/evoldap-backend.c:169
+#: ../backends/evoldap-backend.c:173
 #, c-format
 msgid "Created Evolution/LDAP source using configuration file '%s'"
 msgstr ""
-"Створаная крыніца Evolution/LDAP карыстаецца канфігурацыйным файлам '%s'"
+"Створаная крыніца Evolution/LDAP выкарыстоўвае файл канфігурацыі \"%s\""
 
-# backends/xml-dir.c:421
-#: backends/evoldap-backend.c:444
+#: ../backends/evoldap-backend.c:447
 #, c-format
 msgid "Unable to parse XML file '%s'"
-msgstr "Немагчыма разабраць файл XML \"%s\""
+msgstr "Не ўдалося разабраць XML-файл \"%s\""
 
-# gconf/gconftool.c:2312
-#: backends/evoldap-backend.c:453
+#: ../backends/evoldap-backend.c:456
 #, c-format
 msgid "Config file '%s' is empty"
 msgstr "Файл канфігурацыі \"%s\" пусты"
 
-#: backends/evoldap-backend.c:464
+#: ../backends/evoldap-backend.c:467
 #, c-format
 msgid "Root node of '%s' must be , not <%s>"
-msgstr "Каранёвы вузел '%s' мусіць быць , але не <%s>"
+msgstr "Каранёвы вузел \"%s\" мусіць быць , а не <%s>"
 
-#: backends/evoldap-backend.c:502
+#: ../backends/evoldap-backend.c:505
 #, c-format
 msgid "No