Ubuntu
gsettings-desktop-schemas package

Merge lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_4_release into lp:ubuntu/natty/gsettings-desktop-schemas

  1. Natty (11.04)
  2. 0_1_4_release
  3. Merge into natty
Proposed by Rodrigo Moya
Status: Rejected
Rejected by: Artur Rona
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_4_release
Merge into: lp:ubuntu/natty/gsettings-desktop-schemas
Diff against target: 2494 lines (+891/-823)
10 files modified
NEWS (+6/-0)
aclocal.m4 (+710/-709)
configure (+133/-109)
configure.ac (+1/-1)
debian/changelog (+6/-0)
schemas/Makefile.am (+2/-1)
schemas/Makefile.in (+2/-1)
schemas/gsettings-desktop-schemas.convert (+4/-0)
schemas/org.gnome.desktop.background.gschema.xml.in (+2/-2)
schemas/org.gnome.desktop.thumbnailers.gschema.xml (+25/-0)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_4_release
Reviewer Review Type Date Requested Status
Artur Rona (community) Disapprove
Review via email: mp+45715@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Artur Rona (ari-tczew) wrote :

0.1.4 is synced from Debian experimental. In future please file rather a sync request.
https://wiki.ubuntu.com/SyncRequestProcess

review: Disapprove

Unmerged revisions

8. By Rodrigo Moya

New upstream release.

7. By Rodrigo Moya

blah

6. By Rodrigo Moya

New upstream release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-12-23 12:40:25 +0000
3+++ NEWS 2011-01-10 17:05:40 +0000
4@@ -1,3 +1,9 @@
5+Major changes in 0.1.4
6+======================
7+
8+* Add thumbnailer schemas
9+* Don't show icons on the desktop by default
10+
11 Major changes in 0.1.3
12 ======================
13
14
15=== modified file 'aclocal.m4'
16--- aclocal.m4 2010-12-23 12:40:25 +0000
17+++ aclocal.m4 2011-01-10 17:05:40 +0000
18@@ -13,12 +13,720 @@
19
20 m4_ifndef([AC_AUTOCONF_VERSION],
21 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
22-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
23-[m4_warning([this file was generated for autoconf 2.67.
24+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
25+[m4_warning([this file was generated for autoconf 2.68.
26 You have another version of autoconf. It may work, but is not guaranteed to.
27 If you have problems, you may need to regenerate the build system entirely.
28 To do so, use the procedure documented by the package, typically `autoreconf'.])])
29
30+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
31+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
32+#
33+# This file is free software, distributed under the terms of the GNU
34+# General Public License. As a special exception to the GNU General
35+# Public License, this file may be distributed as part of a program
36+# that contains a configuration script generated by Autoconf, under
37+# the same distribution terms as the rest of that program.
38+#
39+# This file can be copied and used freely without restrictions. It can
40+# be used in projects which are not available under the GNU Public License
41+# but which still want to provide support for the GNU gettext functionality.
42+#
43+# Macro to add for using GNU gettext.
44+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
45+#
46+# Modified to never use included libintl.
47+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
48+#
49+# Major rework to remove unused code
50+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
51+#
52+# Added better handling of ALL_LINGUAS from GNU gettext version
53+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
54+#
55+# Modified to require ngettext
56+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
57+#
58+# We need this here as well, since someone might use autoconf-2.5x
59+# to configure GLib then an older version to configure a package
60+# using AM_GLIB_GNU_GETTEXT
61+AC_PREREQ(2.53)
62+
63+dnl
64+dnl We go to great lengths to make sure that aclocal won't
65+dnl try to pull in the installed version of these macros
66+dnl when running aclocal in the glib directory.
67+dnl
68+m4_copy([AC_DEFUN],[glib_DEFUN])
69+m4_copy([AC_REQUIRE],[glib_REQUIRE])
70+dnl
71+dnl At the end, if we're not within glib, we'll define the public
72+dnl definitions in terms of our private definitions.
73+dnl
74+
75+# GLIB_LC_MESSAGES
76+#--------------------
77+glib_DEFUN([GLIB_LC_MESSAGES],
78+ [AC_CHECK_HEADERS([locale.h])
79+ if test $ac_cv_header_locale_h = yes; then
80+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
81+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
82+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
83+ if test $am_cv_val_LC_MESSAGES = yes; then
84+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
85+ [Define if your <locale.h> file defines LC_MESSAGES.])
86+ fi
87+ fi])
88+
89+# GLIB_PATH_PROG_WITH_TEST
90+#----------------------------
91+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
92+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
93+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
94+[# Extract the first word of "$2", so it can be a program name with args.
95+set dummy $2; ac_word=[$]2
96+AC_MSG_CHECKING([for $ac_word])
97+AC_CACHE_VAL(ac_cv_path_$1,
98+[case "[$]$1" in
99+ /*)
100+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
101+ ;;
102+ *)
103+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
104+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
105+ test -z "$ac_dir" && ac_dir=.
106+ if test -f $ac_dir/$ac_word; then
107+ if [$3]; then
108+ ac_cv_path_$1="$ac_dir/$ac_word"
109+ break
110+ fi
111+ fi
112+ done
113+ IFS="$ac_save_ifs"
114+dnl If no 4th arg is given, leave the cache variable unset,
115+dnl so AC_PATH_PROGS will keep looking.
116+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
117+])dnl
118+ ;;
119+esac])dnl
120+$1="$ac_cv_path_$1"
121+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
122+ AC_MSG_RESULT([$]$1)
123+else
124+ AC_MSG_RESULT(no)
125+fi
126+AC_SUBST($1)dnl
127+])
128+
129+# GLIB_WITH_NLS
130+#-----------------
131+glib_DEFUN([GLIB_WITH_NLS],
132+ dnl NLS is obligatory
133+ [USE_NLS=yes
134+ AC_SUBST(USE_NLS)
135+
136+ gt_cv_have_gettext=no
137+
138+ CATOBJEXT=NONE
139+ XGETTEXT=:
140+ INTLLIBS=
141+
142+ AC_CHECK_HEADER(libintl.h,
143+ [gt_cv_func_dgettext_libintl="no"
144+ libintl_extra_libs=""
145+
146+ #
147+ # First check in libc
148+ #
149+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
150+ [AC_TRY_LINK([
151+#include <libintl.h>
152+],
153+ [return !ngettext ("","", 1)],
154+ gt_cv_func_ngettext_libc=yes,
155+ gt_cv_func_ngettext_libc=no)
156+ ])
157+
158+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
159+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
160+ [AC_TRY_LINK([
161+#include <libintl.h>
162+],
163+ [return !dgettext ("","")],
164+ gt_cv_func_dgettext_libc=yes,
165+ gt_cv_func_dgettext_libc=no)
166+ ])
167+ fi
168+
169+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
170+ AC_CHECK_FUNCS(bind_textdomain_codeset)
171+ fi
172+
173+ #
174+ # If we don't have everything we want, check in libintl
175+ #
176+ if test "$gt_cv_func_dgettext_libc" != "yes" \
177+ || test "$gt_cv_func_ngettext_libc" != "yes" \
178+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
179+
180+ AC_CHECK_LIB(intl, bindtextdomain,
181+ [AC_CHECK_LIB(intl, ngettext,
182+ [AC_CHECK_LIB(intl, dgettext,
183+ gt_cv_func_dgettext_libintl=yes)])])
184+
185+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
186+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
187+ AC_MSG_RESULT([])
188+ AC_CHECK_LIB(intl, ngettext,
189+ [AC_CHECK_LIB(intl, dcgettext,
190+ [gt_cv_func_dgettext_libintl=yes
191+ libintl_extra_libs=-liconv],
192+ :,-liconv)],
193+ :,-liconv)
194+ fi
195+
196+ #
197+ # If we found libintl, then check in it for bind_textdomain_codeset();
198+ # we'll prefer libc if neither have bind_textdomain_codeset(),
199+ # and both have dgettext and ngettext
200+ #
201+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
202+ glib_save_LIBS="$LIBS"
203+ LIBS="$LIBS -lintl $libintl_extra_libs"
204+ unset ac_cv_func_bind_textdomain_codeset
205+ AC_CHECK_FUNCS(bind_textdomain_codeset)
206+ LIBS="$glib_save_LIBS"
207+
208+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
209+ gt_cv_func_dgettext_libc=no
210+ else
211+ if test "$gt_cv_func_dgettext_libc" = "yes" \
212+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
213+ gt_cv_func_dgettext_libintl=no
214+ fi
215+ fi
216+ fi
217+ fi
218+
219+ if test "$gt_cv_func_dgettext_libc" = "yes" \
220+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
221+ gt_cv_have_gettext=yes
222+ fi
223+
224+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
225+ INTLLIBS="-lintl $libintl_extra_libs"
226+ fi
227+
228+ if test "$gt_cv_have_gettext" = "yes"; then
229+ AC_DEFINE(HAVE_GETTEXT,1,
230+ [Define if the GNU gettext() function is already present or preinstalled.])
231+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
232+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
233+ if test "$MSGFMT" != "no"; then
234+ glib_save_LIBS="$LIBS"
235+ LIBS="$LIBS $INTLLIBS"
236+ AC_CHECK_FUNCS(dcgettext)
237+ MSGFMT_OPTS=
238+ AC_MSG_CHECKING([if msgfmt accepts -c])
239+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
240+msgid ""
241+msgstr ""
242+"Content-Type: text/plain; charset=UTF-8\n"
243+"Project-Id-Version: test 1.0\n"
244+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
245+"Last-Translator: test <foo@bar.xx>\n"
246+"Language-Team: C <LL@li.org>\n"
247+"MIME-Version: 1.0\n"
248+"Content-Transfer-Encoding: 8bit\n"
249+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
250+ AC_SUBST(MSGFMT_OPTS)
251+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
252+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
253+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
254+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
255+ return _nl_msg_cat_cntr],
256+ [CATOBJEXT=.gmo
257+ DATADIRNAME=share],
258+ [case $host in
259+ *-*-solaris*)
260+ dnl On Solaris, if bind_textdomain_codeset is in libc,
261+ dnl GNU format message catalog is always supported,
262+ dnl since both are added to the libc all together.
263+ dnl Hence, we'd like to go with DATADIRNAME=share and
264+ dnl and CATOBJEXT=.gmo in this case.
265+ AC_CHECK_FUNC(bind_textdomain_codeset,
266+ [CATOBJEXT=.gmo
267+ DATADIRNAME=share],
268+ [CATOBJEXT=.mo
269+ DATADIRNAME=lib])
270+ ;;
271+ *)
272+ CATOBJEXT=.mo
273+ DATADIRNAME=lib
274+ ;;
275+ esac])
276+ LIBS="$glib_save_LIBS"
277+ INSTOBJEXT=.mo
278+ else
279+ gt_cv_have_gettext=no
280+ fi
281+ fi
282+ ])
283+
284+ if test "$gt_cv_have_gettext" = "yes" ; then
285+ AC_DEFINE(ENABLE_NLS, 1,
286+ [always defined to indicate that i18n is enabled])
287+ fi
288+
289+ dnl Test whether we really found GNU xgettext.
290+ if test "$XGETTEXT" != ":"; then
291+ dnl If it is not GNU xgettext we define it as : so that the
292+ dnl Makefiles still can work.
293+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
294+ : ;
295+ else
296+ AC_MSG_RESULT(
297+ [found xgettext program is not GNU xgettext; ignore it])
298+ XGETTEXT=":"
299+ fi
300+ fi
301+
302+ # We need to process the po/ directory.
303+ POSUB=po
304+
305+ AC_OUTPUT_COMMANDS(
306+ [case "$CONFIG_FILES" in *po/Makefile.in*)
307+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
308+ esac])
309+
310+ dnl These rules are solely for the distribution goal. While doing this
311+ dnl we only have to keep exactly one list of the available catalogs
312+ dnl in configure.ac.
313+ for lang in $ALL_LINGUAS; do
314+ GMOFILES="$GMOFILES $lang.gmo"
315+ POFILES="$POFILES $lang.po"
316+ done
317+
318+ dnl Make all variables we use known to autoconf.
319+ AC_SUBST(CATALOGS)
320+ AC_SUBST(CATOBJEXT)
321+ AC_SUBST(DATADIRNAME)
322+ AC_SUBST(GMOFILES)
323+ AC_SUBST(INSTOBJEXT)
324+ AC_SUBST(INTLLIBS)
325+ AC_SUBST(PO_IN_DATADIR_TRUE)
326+ AC_SUBST(PO_IN_DATADIR_FALSE)
327+ AC_SUBST(POFILES)
328+ AC_SUBST(POSUB)
329+ ])
330+
331+# AM_GLIB_GNU_GETTEXT
332+# -------------------
333+# Do checks necessary for use of gettext. If a suitable implementation
334+# of gettext is found in either in libintl or in the C library,
335+# it will set INTLLIBS to the libraries needed for use of gettext
336+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
337+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
338+# on various variables needed by the Makefile.in.in installed by
339+# glib-gettextize.
340+dnl
341+glib_DEFUN([GLIB_GNU_GETTEXT],
342+ [AC_REQUIRE([AC_PROG_CC])dnl
343+ AC_REQUIRE([AC_HEADER_STDC])dnl
344+
345+ GLIB_LC_MESSAGES
346+ GLIB_WITH_NLS
347+
348+ if test "$gt_cv_have_gettext" = "yes"; then
349+ if test "x$ALL_LINGUAS" = "x"; then
350+ LINGUAS=
351+ else
352+ AC_MSG_CHECKING(for catalogs to be installed)
353+ NEW_LINGUAS=
354+ for presentlang in $ALL_LINGUAS; do
355+ useit=no
356+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
357+ desiredlanguages="$LINGUAS"
358+ else
359+ desiredlanguages="$ALL_LINGUAS"
360+ fi
361+ for desiredlang in $desiredlanguages; do
362+ # Use the presentlang catalog if desiredlang is
363+ # a. equal to presentlang, or
364+ # b. a variant of presentlang (because in this case,
365+ # presentlang can be used as a fallback for messages
366+ # which are not translated in the desiredlang catalog).
367+ case "$desiredlang" in
368+ "$presentlang"*) useit=yes;;
369+ esac
370+ done
371+ if test $useit = yes; then
372+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
373+ fi
374+ done
375+ LINGUAS=$NEW_LINGUAS
376+ AC_MSG_RESULT($LINGUAS)
377+ fi
378+
379+ dnl Construct list of names of catalog files to be constructed.
380+ if test -n "$LINGUAS"; then
381+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
382+ fi
383+ fi
384+
385+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
386+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
387+ dnl Try to locate is.
388+ MKINSTALLDIRS=
389+ if test -n "$ac_aux_dir"; then
390+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
391+ fi
392+ if test -z "$MKINSTALLDIRS"; then
393+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
394+ fi
395+ AC_SUBST(MKINSTALLDIRS)
396+
397+ dnl Generate list of files to be processed by xgettext which will
398+ dnl be included in po/Makefile.
399+ test -d po || mkdir po
400+ if test "x$srcdir" != "x."; then
401+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
402+ posrcprefix="$srcdir/"
403+ else
404+ posrcprefix="../$srcdir/"
405+ fi
406+ else
407+ posrcprefix="../"
408+ fi
409+ rm -f po/POTFILES
410+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
411+ < $srcdir/po/POTFILES.in > po/POTFILES
412+ ])
413+
414+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
415+# -------------------------------
416+# Define VARIABLE to the location where catalog files will
417+# be installed by po/Makefile.
418+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
419+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
420+glib_save_prefix="$prefix"
421+glib_save_exec_prefix="$exec_prefix"
422+glib_save_datarootdir="$datarootdir"
423+test "x$prefix" = xNONE && prefix=$ac_default_prefix
424+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
425+datarootdir=`eval echo "${datarootdir}"`
426+if test "x$CATOBJEXT" = "x.mo" ; then
427+ localedir=`eval echo "${libdir}/locale"`
428+else
429+ localedir=`eval echo "${datadir}/locale"`
430+fi
431+prefix="$glib_save_prefix"
432+exec_prefix="$glib_save_exec_prefix"
433+datarootdir="$glib_save_datarootdir"
434+AC_DEFINE_UNQUOTED($1, "$localedir",
435+ [Define the location where the catalogs will be installed])
436+])
437+
438+dnl
439+dnl Now the definitions that aclocal will find
440+dnl
441+ifdef(glib_configure_ac,[],[
442+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
443+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
444+])dnl
445+
446+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
447+#
448+# Create a temporary file with TEST-FILE as its contents and pass the
449+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
450+# 0 and perform ACTION-IF-FAIL for any other exit status.
451+AC_DEFUN([GLIB_RUN_PROG],
452+[cat >conftest.foo <<_ACEOF
453+$2
454+_ACEOF
455+if AC_RUN_LOG([$1 conftest.foo]); then
456+ m4_ifval([$3], [$3], [:])
457+m4_ifvaln([$4], [else $4])dnl
458+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
459+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
460+fi])
461+
462+
463+dnl GLIB_GSETTINGS
464+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
465+dnl the schema should be compiled
466+dnl
467+
468+AC_DEFUN([GLIB_GSETTINGS],
469+[
470+ m4_pattern_allow([AM_V_GEN])
471+ AC_ARG_ENABLE(schemas-compile,
472+ AC_HELP_STRING([--disable-schemas-compile],
473+ [Disable regeneration of gschemas.compiled on install]),
474+ [case ${enableval} in
475+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
476+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
477+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
478+ esac])
479+ AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
480+ PKG_PROG_PKG_CONFIG([0.16])
481+ AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
482+ if test x$cross_compiling != xyes; then
483+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
484+ else
485+ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
486+ fi
487+ AC_SUBST(GLIB_COMPILE_SCHEMAS)
488+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
489+ ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
490+ else
491+ ifelse([$1],,[:],[$1])
492+ fi
493+
494+ GSETTINGS_RULES='
495+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
496+
497+mostlyclean-am: clean-gsettings-schemas
498+
499+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
500+
501+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
502+ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
503+
504+all-am: $(gsettings_SCHEMAS:.xml=.valid)
505+uninstall-am: uninstall-gsettings-schemas
506+install-data-am: install-gsettings-schemas
507+
508+.SECONDARY: $(gsettings_SCHEMAS)
509+
510+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
511+ @$(NORMAL_INSTALL)
512+ if test -n "$^"; then \
513+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
514+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
515+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
516+ fi
517+
518+uninstall-gsettings-schemas:
519+ @$(NORMAL_UNINSTALL)
520+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
521+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
522+ test -n "$$files" || exit 0; \
523+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
524+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
525+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
526+
527+clean-gsettings-schemas:
528+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
529+
530+ifdef gsettings_ENUM_NAMESPACE
531+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
532+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
533+endif
534+'
535+ _GSETTINGS_SUBST(GSETTINGS_RULES)
536+])
537+
538+dnl _GSETTINGS_SUBST(VARIABLE)
539+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
540+AC_DEFUN([_GSETTINGS_SUBST],
541+[
542+AC_SUBST([$1])
543+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
544+]
545+)
546+
547+# nls.m4 serial 5 (gettext-0.18)
548+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
549+dnl Inc.
550+dnl This file is free software; the Free Software Foundation
551+dnl gives unlimited permission to copy and/or distribute it,
552+dnl with or without modifications, as long as this notice is preserved.
553+dnl
554+dnl This file can can be used in projects which are not available under
555+dnl the GNU General Public License or the GNU Library General Public
556+dnl License but which still want to provide support for the GNU gettext
557+dnl functionality.
558+dnl Please note that the actual code of the GNU gettext library is covered
559+dnl by the GNU Library General Public License, and the rest of the GNU
560+dnl gettext package package is covered by the GNU General Public License.
561+dnl They are *not* in the public domain.
562+
563+dnl Authors:
564+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
565+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
566+
567+AC_PREREQ([2.50])
568+
569+AC_DEFUN([AM_NLS],
570+[
571+ AC_MSG_CHECKING([whether NLS is requested])
572+ dnl Default is enabled NLS
573+ AC_ARG_ENABLE([nls],
574+ [ --disable-nls do not use Native Language Support],
575+ USE_NLS=$enableval, USE_NLS=yes)
576+ AC_MSG_RESULT([$USE_NLS])
577+ AC_SUBST([USE_NLS])
578+])
579+
580+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
581+# serial 1 (pkg-config-0.24)
582+#
583+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
584+#
585+# This program is free software; you can redistribute it and/or modify
586+# it under the terms of the GNU General Public License as published by
587+# the Free Software Foundation; either version 2 of the License, or
588+# (at your option) any later version.
589+#
590+# This program is distributed in the hope that it will be useful, but
591+# WITHOUT ANY WARRANTY; without even the implied warranty of
592+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
593+# General Public License for more details.
594+#
595+# You should have received a copy of the GNU General Public License
596+# along with this program; if not, write to the Free Software
597+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
598+#
599+# As a special exception to the GNU General Public License, if you
600+# distribute this file as part of a program that contains a
601+# configuration script generated by Autoconf, you may include it under
602+# the same distribution terms that you use for the rest of that program.
603+
604+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
605+# ----------------------------------
606+AC_DEFUN([PKG_PROG_PKG_CONFIG],
607+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
608+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
609+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
610+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
611+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
612+
613+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
614+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
615+fi
616+if test -n "$PKG_CONFIG"; then
617+ _pkg_min_version=m4_default([$1], [0.9.0])
618+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
619+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
620+ AC_MSG_RESULT([yes])
621+ else
622+ AC_MSG_RESULT([no])
623+ PKG_CONFIG=""
624+ fi
625+fi[]dnl
626+])# PKG_PROG_PKG_CONFIG
627+
628+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
629+#
630+# Check to see whether a particular set of modules exists. Similar
631+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
632+#
633+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
634+# only at the first occurence in configure.ac, so if the first place
635+# it's called might be skipped (such as if it is within an "if", you
636+# have to call PKG_CHECK_EXISTS manually
637+# --------------------------------------------------------------
638+AC_DEFUN([PKG_CHECK_EXISTS],
639+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
640+if test -n "$PKG_CONFIG" && \
641+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
642+ m4_default([$2], [:])
643+m4_ifvaln([$3], [else
644+ $3])dnl
645+fi])
646+
647+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
648+# ---------------------------------------------
649+m4_define([_PKG_CONFIG],
650+[if test -n "$$1"; then
651+ pkg_cv_[]$1="$$1"
652+ elif test -n "$PKG_CONFIG"; then
653+ PKG_CHECK_EXISTS([$3],
654+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
655+ [pkg_failed=yes])
656+ else
657+ pkg_failed=untried
658+fi[]dnl
659+])# _PKG_CONFIG
660+
661+# _PKG_SHORT_ERRORS_SUPPORTED
662+# -----------------------------
663+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
664+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
665+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
666+ _pkg_short_errors_supported=yes
667+else
668+ _pkg_short_errors_supported=no
669+fi[]dnl
670+])# _PKG_SHORT_ERRORS_SUPPORTED
671+
672+
673+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
674+# [ACTION-IF-NOT-FOUND])
675+#
676+#
677+# Note that if there is a possibility the first call to
678+# PKG_CHECK_MODULES might not happen, you should be sure to include an
679+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
680+#
681+#
682+# --------------------------------------------------------------
683+AC_DEFUN([PKG_CHECK_MODULES],
684+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
685+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
686+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
687+
688+pkg_failed=no
689+AC_MSG_CHECKING([for $1])
690+
691+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
692+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
693+
694+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
695+and $1[]_LIBS to avoid the need to call pkg-config.
696+See the pkg-config man page for more details.])
697+
698+if test $pkg_failed = yes; then
699+ AC_MSG_RESULT([no])
700+ _PKG_SHORT_ERRORS_SUPPORTED
701+ if test $_pkg_short_errors_supported = yes; then
702+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
703+ else
704+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
705+ fi
706+ # Put the nasty error message in config.log where it belongs
707+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
708+
709+ m4_default([$4], [AC_MSG_ERROR(
710+[Package requirements ($2) were not met:
711+
712+$$1_PKG_ERRORS
713+
714+Consider adjusting the PKG_CONFIG_PATH environment variable if you
715+installed software in a non-standard prefix.
716+
717+_PKG_TEXT])
718+ ])
719+elif test $pkg_failed = untried; then
720+ AC_MSG_RESULT([no])
721+ m4_default([$4], [AC_MSG_FAILURE(
722+[The pkg-config script could not be found or is too old. Make sure it
723+is in your PATH or set the PKG_CONFIG environment variable to the full
724+path to pkg-config.
725+
726+_PKG_TEXT
727+
728+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
729+ ])
730+else
731+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
732+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
733+ AC_MSG_RESULT([yes])
734+ $3
735+fi[]dnl
736+])# PKG_CHECK_MODULES
737+
738 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
739 #
740 # This file is free software; the Free Software Foundation
741@@ -1016,711 +1724,4 @@
742 AC_SUBST([am__untar])
743 ]) # _AM_PROG_TAR
744
745-# nls.m4 serial 3 (gettext-0.15)
746-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
747-dnl This file is free software; the Free Software Foundation
748-dnl gives unlimited permission to copy and/or distribute it,
749-dnl with or without modifications, as long as this notice is preserved.
750-dnl
751-dnl This file can can be used in projects which are not available under
752-dnl the GNU General Public License or the GNU Library General Public
753-dnl License but which still want to provide support for the GNU gettext
754-dnl functionality.
755-dnl Please note that the actual code of the GNU gettext library is covered
756-dnl by the GNU Library General Public License, and the rest of the GNU
757-dnl gettext package package is covered by the GNU General Public License.
758-dnl They are *not* in the public domain.
759-
760-dnl Authors:
761-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
762-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
763-
764-AC_PREREQ(2.50)
765-
766-AC_DEFUN([AM_NLS],
767-[
768- AC_MSG_CHECKING([whether NLS is requested])
769- dnl Default is enabled NLS
770- AC_ARG_ENABLE(nls,
771- [ --disable-nls do not use Native Language Support],
772- USE_NLS=$enableval, USE_NLS=yes)
773- AC_MSG_RESULT($USE_NLS)
774- AC_SUBST(USE_NLS)
775-])
776-
777-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
778-# serial 1 (pkg-config-0.24)
779-#
780-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
781-#
782-# This program is free software; you can redistribute it and/or modify
783-# it under the terms of the GNU General Public License as published by
784-# the Free Software Foundation; either version 2 of the License, or
785-# (at your option) any later version.
786-#
787-# This program is distributed in the hope that it will be useful, but
788-# WITHOUT ANY WARRANTY; without even the implied warranty of
789-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
790-# General Public License for more details.
791-#
792-# You should have received a copy of the GNU General Public License
793-# along with this program; if not, write to the Free Software
794-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
795-#
796-# As a special exception to the GNU General Public License, if you
797-# distribute this file as part of a program that contains a
798-# configuration script generated by Autoconf, you may include it under
799-# the same distribution terms that you use for the rest of that program.
800-
801-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
802-# ----------------------------------
803-AC_DEFUN([PKG_PROG_PKG_CONFIG],
804-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
805-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
806-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
807-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
808-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
809-
810-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
811- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
812-fi
813-if test -n "$PKG_CONFIG"; then
814- _pkg_min_version=m4_default([$1], [0.9.0])
815- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
816- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
817- AC_MSG_RESULT([yes])
818- else
819- AC_MSG_RESULT([no])
820- PKG_CONFIG=""
821- fi
822-fi[]dnl
823-])# PKG_PROG_PKG_CONFIG
824-
825-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
826-#
827-# Check to see whether a particular set of modules exists. Similar
828-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
829-#
830-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
831-# only at the first occurence in configure.ac, so if the first place
832-# it's called might be skipped (such as if it is within an "if", you
833-# have to call PKG_CHECK_EXISTS manually
834-# --------------------------------------------------------------
835-AC_DEFUN([PKG_CHECK_EXISTS],
836-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
837-if test -n "$PKG_CONFIG" && \
838- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
839- m4_default([$2], [:])
840-m4_ifvaln([$3], [else
841- $3])dnl
842-fi])
843-
844-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
845-# ---------------------------------------------
846-m4_define([_PKG_CONFIG],
847-[if test -n "$$1"; then
848- pkg_cv_[]$1="$$1"
849- elif test -n "$PKG_CONFIG"; then
850- PKG_CHECK_EXISTS([$3],
851- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
852- [pkg_failed=yes])
853- else
854- pkg_failed=untried
855-fi[]dnl
856-])# _PKG_CONFIG
857-
858-# _PKG_SHORT_ERRORS_SUPPORTED
859-# -----------------------------
860-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
861-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
862-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
863- _pkg_short_errors_supported=yes
864-else
865- _pkg_short_errors_supported=no
866-fi[]dnl
867-])# _PKG_SHORT_ERRORS_SUPPORTED
868-
869-
870-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
871-# [ACTION-IF-NOT-FOUND])
872-#
873-#
874-# Note that if there is a possibility the first call to
875-# PKG_CHECK_MODULES might not happen, you should be sure to include an
876-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
877-#
878-#
879-# --------------------------------------------------------------
880-AC_DEFUN([PKG_CHECK_MODULES],
881-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
882-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
883-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
884-
885-pkg_failed=no
886-AC_MSG_CHECKING([for $1])
887-
888-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
889-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
890-
891-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
892-and $1[]_LIBS to avoid the need to call pkg-config.
893-See the pkg-config man page for more details.])
894-
895-if test $pkg_failed = yes; then
896- AC_MSG_RESULT([no])
897- _PKG_SHORT_ERRORS_SUPPORTED
898- if test $_pkg_short_errors_supported = yes; then
899- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
900- else
901- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
902- fi
903- # Put the nasty error message in config.log where it belongs
904- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
905-
906- m4_default([$4], [AC_MSG_ERROR(
907-[Package requirements ($2) were not met:
908-
909-$$1_PKG_ERRORS
910-
911-Consider adjusting the PKG_CONFIG_PATH environment variable if you
912-installed software in a non-standard prefix.
913-
914-_PKG_TEXT])[]dnl
915- ])
916-elif test $pkg_failed = untried; then
917- AC_MSG_RESULT([no])
918- m4_default([$4], [AC_MSG_FAILURE(
919-[The pkg-config script could not be found or is too old. Make sure it
920-is in your PATH or set the PKG_CONFIG environment variable to the full
921-path to pkg-config.
922-
923-_PKG_TEXT
924-
925-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
926- ])
927-else
928- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
929- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
930- AC_MSG_RESULT([yes])
931- $3
932-fi[]dnl
933-])# PKG_CHECK_MODULES
934-
935-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
936-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
937-#
938-# This file is free software, distributed under the terms of the GNU
939-# General Public License. As a special exception to the GNU General
940-# Public License, this file may be distributed as part of a program
941-# that contains a configuration script generated by Autoconf, under
942-# the same distribution terms as the rest of that program.
943-#
944-# This file can be copied and used freely without restrictions. It can
945-# be used in projects which are not available under the GNU Public License
946-# but which still want to provide support for the GNU gettext functionality.
947-#
948-# Macro to add for using GNU gettext.
949-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
950-#
951-# Modified to never use included libintl.
952-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
953-#
954-# Major rework to remove unused code
955-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
956-#
957-# Added better handling of ALL_LINGUAS from GNU gettext version
958-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
959-#
960-# Modified to require ngettext
961-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
962-#
963-# We need this here as well, since someone might use autoconf-2.5x
964-# to configure GLib then an older version to configure a package
965-# using AM_GLIB_GNU_GETTEXT
966-AC_PREREQ(2.53)
967-
968-dnl
969-dnl We go to great lengths to make sure that aclocal won't
970-dnl try to pull in the installed version of these macros
971-dnl when running aclocal in the glib directory.
972-dnl
973-m4_copy([AC_DEFUN],[glib_DEFUN])
974-m4_copy([AC_REQUIRE],[glib_REQUIRE])
975-dnl
976-dnl At the end, if we're not within glib, we'll define the public
977-dnl definitions in terms of our private definitions.
978-dnl
979-
980-# GLIB_LC_MESSAGES
981-#--------------------
982-glib_DEFUN([GLIB_LC_MESSAGES],
983- [AC_CHECK_HEADERS([locale.h])
984- if test $ac_cv_header_locale_h = yes; then
985- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
986- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
987- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
988- if test $am_cv_val_LC_MESSAGES = yes; then
989- AC_DEFINE(HAVE_LC_MESSAGES, 1,
990- [Define if your <locale.h> file defines LC_MESSAGES.])
991- fi
992- fi])
993-
994-# GLIB_PATH_PROG_WITH_TEST
995-#----------------------------
996-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
997-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
998-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
999-[# Extract the first word of "$2", so it can be a program name with args.
1000-set dummy $2; ac_word=[$]2
1001-AC_MSG_CHECKING([for $ac_word])
1002-AC_CACHE_VAL(ac_cv_path_$1,
1003-[case "[$]$1" in
1004- /*)
1005- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1006- ;;
1007- *)
1008- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1009- for ac_dir in ifelse([$5], , $PATH, [$5]); do
1010- test -z "$ac_dir" && ac_dir=.
1011- if test -f $ac_dir/$ac_word; then
1012- if [$3]; then
1013- ac_cv_path_$1="$ac_dir/$ac_word"
1014- break
1015- fi
1016- fi
1017- done
1018- IFS="$ac_save_ifs"
1019-dnl If no 4th arg is given, leave the cache variable unset,
1020-dnl so AC_PATH_PROGS will keep looking.
1021-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1022-])dnl
1023- ;;
1024-esac])dnl
1025-$1="$ac_cv_path_$1"
1026-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1027- AC_MSG_RESULT([$]$1)
1028-else
1029- AC_MSG_RESULT(no)
1030-fi
1031-AC_SUBST($1)dnl
1032-])
1033-
1034-# GLIB_WITH_NLS
1035-#-----------------
1036-glib_DEFUN([GLIB_WITH_NLS],
1037- dnl NLS is obligatory
1038- [USE_NLS=yes
1039- AC_SUBST(USE_NLS)
1040-
1041- gt_cv_have_gettext=no
1042-
1043- CATOBJEXT=NONE
1044- XGETTEXT=:
1045- INTLLIBS=
1046-
1047- AC_CHECK_HEADER(libintl.h,
1048- [gt_cv_func_dgettext_libintl="no"
1049- libintl_extra_libs=""
1050-
1051- #
1052- # First check in libc
1053- #
1054- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
1055- [AC_TRY_LINK([
1056-#include <libintl.h>
1057-],
1058- [return !ngettext ("","", 1)],
1059- gt_cv_func_ngettext_libc=yes,
1060- gt_cv_func_ngettext_libc=no)
1061- ])
1062-
1063- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1064- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
1065- [AC_TRY_LINK([
1066-#include <libintl.h>
1067-],
1068- [return !dgettext ("","")],
1069- gt_cv_func_dgettext_libc=yes,
1070- gt_cv_func_dgettext_libc=no)
1071- ])
1072- fi
1073-
1074- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1075- AC_CHECK_FUNCS(bind_textdomain_codeset)
1076- fi
1077-
1078- #
1079- # If we don't have everything we want, check in libintl
1080- #
1081- if test "$gt_cv_func_dgettext_libc" != "yes" \
1082- || test "$gt_cv_func_ngettext_libc" != "yes" \
1083- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1084-
1085- AC_CHECK_LIB(intl, bindtextdomain,
1086- [AC_CHECK_LIB(intl, ngettext,
1087- [AC_CHECK_LIB(intl, dgettext,
1088- gt_cv_func_dgettext_libintl=yes)])])
1089-
1090- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1091- AC_MSG_CHECKING([if -liconv is needed to use gettext])
1092- AC_MSG_RESULT([])
1093- AC_CHECK_LIB(intl, ngettext,
1094- [AC_CHECK_LIB(intl, dcgettext,
1095- [gt_cv_func_dgettext_libintl=yes
1096- libintl_extra_libs=-liconv],
1097- :,-liconv)],
1098- :,-liconv)
1099- fi
1100-
1101- #
1102- # If we found libintl, then check in it for bind_textdomain_codeset();
1103- # we'll prefer libc if neither have bind_textdomain_codeset(),
1104- # and both have dgettext and ngettext
1105- #
1106- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1107- glib_save_LIBS="$LIBS"
1108- LIBS="$LIBS -lintl $libintl_extra_libs"
1109- unset ac_cv_func_bind_textdomain_codeset
1110- AC_CHECK_FUNCS(bind_textdomain_codeset)
1111- LIBS="$glib_save_LIBS"
1112-
1113- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1114- gt_cv_func_dgettext_libc=no
1115- else
1116- if test "$gt_cv_func_dgettext_libc" = "yes" \
1117- && test "$gt_cv_func_ngettext_libc" = "yes"; then
1118- gt_cv_func_dgettext_libintl=no
1119- fi
1120- fi
1121- fi
1122- fi
1123-
1124- if test "$gt_cv_func_dgettext_libc" = "yes" \
1125- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1126- gt_cv_have_gettext=yes
1127- fi
1128-
1129- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1130- INTLLIBS="-lintl $libintl_extra_libs"
1131- fi
1132-
1133- if test "$gt_cv_have_gettext" = "yes"; then
1134- AC_DEFINE(HAVE_GETTEXT,1,
1135- [Define if the GNU gettext() function is already present or preinstalled.])
1136- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1137- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1138- if test "$MSGFMT" != "no"; then
1139- glib_save_LIBS="$LIBS"
1140- LIBS="$LIBS $INTLLIBS"
1141- AC_CHECK_FUNCS(dcgettext)
1142- MSGFMT_OPTS=
1143- AC_MSG_CHECKING([if msgfmt accepts -c])
1144- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1145-msgid ""
1146-msgstr ""
1147-"Content-Type: text/plain; charset=UTF-8\n"
1148-"Project-Id-Version: test 1.0\n"
1149-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1150-"Last-Translator: test <foo@bar.xx>\n"
1151-"Language-Team: C <LL@li.org>\n"
1152-"MIME-Version: 1.0\n"
1153-"Content-Transfer-Encoding: 8bit\n"
1154-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1155- AC_SUBST(MSGFMT_OPTS)
1156- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1157- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1158- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1159- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1160- return _nl_msg_cat_cntr],
1161- [CATOBJEXT=.gmo
1162- DATADIRNAME=share],
1163- [case $host in
1164- *-*-solaris*)
1165- dnl On Solaris, if bind_textdomain_codeset is in libc,
1166- dnl GNU format message catalog is always supported,
1167- dnl since both are added to the libc all together.
1168- dnl Hence, we'd like to go with DATADIRNAME=share and
1169- dnl and CATOBJEXT=.gmo in this case.
1170- AC_CHECK_FUNC(bind_textdomain_codeset,
1171- [CATOBJEXT=.gmo
1172- DATADIRNAME=share],
1173- [CATOBJEXT=.mo
1174- DATADIRNAME=lib])
1175- ;;
1176- *)
1177- CATOBJEXT=.mo
1178- DATADIRNAME=lib
1179- ;;
1180- esac])
1181- LIBS="$glib_save_LIBS"
1182- INSTOBJEXT=.mo
1183- else
1184- gt_cv_have_gettext=no
1185- fi
1186- fi
1187- ])
1188-
1189- if test "$gt_cv_have_gettext" = "yes" ; then
1190- AC_DEFINE(ENABLE_NLS, 1,
1191- [always defined to indicate that i18n is enabled])
1192- fi
1193-
1194- dnl Test whether we really found GNU xgettext.
1195- if test "$XGETTEXT" != ":"; then
1196- dnl If it is not GNU xgettext we define it as : so that the
1197- dnl Makefiles still can work.
1198- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1199- : ;
1200- else
1201- AC_MSG_RESULT(
1202- [found xgettext program is not GNU xgettext; ignore it])
1203- XGETTEXT=":"
1204- fi
1205- fi
1206-
1207- # We need to process the po/ directory.
1208- POSUB=po
1209-
1210- AC_OUTPUT_COMMANDS(
1211- [case "$CONFIG_FILES" in *po/Makefile.in*)
1212- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
1213- esac])
1214-
1215- dnl These rules are solely for the distribution goal. While doing this
1216- dnl we only have to keep exactly one list of the available catalogs
1217- dnl in configure.ac.
1218- for lang in $ALL_LINGUAS; do
1219- GMOFILES="$GMOFILES $lang.gmo"
1220- POFILES="$POFILES $lang.po"
1221- done
1222-
1223- dnl Make all variables we use known to autoconf.
1224- AC_SUBST(CATALOGS)
1225- AC_SUBST(CATOBJEXT)
1226- AC_SUBST(DATADIRNAME)
1227- AC_SUBST(GMOFILES)
1228- AC_SUBST(INSTOBJEXT)
1229- AC_SUBST(INTLLIBS)
1230- AC_SUBST(PO_IN_DATADIR_TRUE)
1231- AC_SUBST(PO_IN_DATADIR_FALSE)
1232- AC_SUBST(POFILES)
1233- AC_SUBST(POSUB)
1234- ])
1235-
1236-# AM_GLIB_GNU_GETTEXT
1237-# -------------------
1238-# Do checks necessary for use of gettext. If a suitable implementation
1239-# of gettext is found in either in libintl or in the C library,
1240-# it will set INTLLIBS to the libraries needed for use of gettext
1241-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
1242-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
1243-# on various variables needed by the Makefile.in.in installed by
1244-# glib-gettextize.
1245-dnl
1246-glib_DEFUN([GLIB_GNU_GETTEXT],
1247- [AC_REQUIRE([AC_PROG_CC])dnl
1248- AC_REQUIRE([AC_HEADER_STDC])dnl
1249-
1250- GLIB_LC_MESSAGES
1251- GLIB_WITH_NLS
1252-
1253- if test "$gt_cv_have_gettext" = "yes"; then
1254- if test "x$ALL_LINGUAS" = "x"; then
1255- LINGUAS=
1256- else
1257- AC_MSG_CHECKING(for catalogs to be installed)
1258- NEW_LINGUAS=
1259- for presentlang in $ALL_LINGUAS; do
1260- useit=no
1261- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
1262- desiredlanguages="$LINGUAS"
1263- else
1264- desiredlanguages="$ALL_LINGUAS"
1265- fi
1266- for desiredlang in $desiredlanguages; do
1267- # Use the presentlang catalog if desiredlang is
1268- # a. equal to presentlang, or
1269- # b. a variant of presentlang (because in this case,
1270- # presentlang can be used as a fallback for messages
1271- # which are not translated in the desiredlang catalog).
1272- case "$desiredlang" in
1273- "$presentlang"*) useit=yes;;
1274- esac
1275- done
1276- if test $useit = yes; then
1277- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
1278- fi
1279- done
1280- LINGUAS=$NEW_LINGUAS
1281- AC_MSG_RESULT($LINGUAS)
1282- fi
1283-
1284- dnl Construct list of names of catalog files to be constructed.
1285- if test -n "$LINGUAS"; then
1286- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1287- fi
1288- fi
1289-
1290- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1291- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1292- dnl Try to locate is.
1293- MKINSTALLDIRS=
1294- if test -n "$ac_aux_dir"; then
1295- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1296- fi
1297- if test -z "$MKINSTALLDIRS"; then
1298- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1299- fi
1300- AC_SUBST(MKINSTALLDIRS)
1301-
1302- dnl Generate list of files to be processed by xgettext which will
1303- dnl be included in po/Makefile.
1304- test -d po || mkdir po
1305- if test "x$srcdir" != "x."; then
1306- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1307- posrcprefix="$srcdir/"
1308- else
1309- posrcprefix="../$srcdir/"
1310- fi
1311- else
1312- posrcprefix="../"
1313- fi
1314- rm -f po/POTFILES
1315- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1316- < $srcdir/po/POTFILES.in > po/POTFILES
1317- ])
1318-
1319-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
1320-# -------------------------------
1321-# Define VARIABLE to the location where catalog files will
1322-# be installed by po/Makefile.
1323-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
1324-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1325-glib_save_prefix="$prefix"
1326-glib_save_exec_prefix="$exec_prefix"
1327-glib_save_datarootdir="$datarootdir"
1328-test "x$prefix" = xNONE && prefix=$ac_default_prefix
1329-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1330-datarootdir=`eval echo "${datarootdir}"`
1331-if test "x$CATOBJEXT" = "x.mo" ; then
1332- localedir=`eval echo "${libdir}/locale"`
1333-else
1334- localedir=`eval echo "${datadir}/locale"`
1335-fi
1336-prefix="$glib_save_prefix"
1337-exec_prefix="$glib_save_exec_prefix"
1338-datarootdir="$glib_save_datarootdir"
1339-AC_DEFINE_UNQUOTED($1, "$localedir",
1340- [Define the location where the catalogs will be installed])
1341-])
1342-
1343-dnl
1344-dnl Now the definitions that aclocal will find
1345-dnl
1346-ifdef(glib_configure_ac,[],[
1347-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
1348-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1349-])dnl
1350-
1351-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1352-#
1353-# Create a temporary file with TEST-FILE as its contents and pass the
1354-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1355-# 0 and perform ACTION-IF-FAIL for any other exit status.
1356-AC_DEFUN([GLIB_RUN_PROG],
1357-[cat >conftest.foo <<_ACEOF
1358-$2
1359-_ACEOF
1360-if AC_RUN_LOG([$1 conftest.foo]); then
1361- m4_ifval([$3], [$3], [:])
1362-m4_ifvaln([$4], [else $4])dnl
1363-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1364-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1365-fi])
1366-
1367-
1368-dnl GLIB_GSETTINGS
1369-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
1370-dnl the schema should be compiled
1371-dnl
1372-
1373-AC_DEFUN([GLIB_GSETTINGS],
1374-[
1375- m4_pattern_allow([AM_V_GEN])
1376- AC_ARG_ENABLE(schemas-compile,
1377- AC_HELP_STRING([--disable-schemas-compile],
1378- [Disable regeneration of gschemas.compiled on install]),
1379- [case ${enableval} in
1380- yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
1381- no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
1382- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
1383- esac])
1384- AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
1385- PKG_PROG_PKG_CONFIG([0.16])
1386- AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
1387- if test x$cross_compiling != xyes; then
1388- GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
1389- else
1390- AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
1391- fi
1392- AC_SUBST(GLIB_COMPILE_SCHEMAS)
1393- if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
1394- ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
1395- else
1396- ifelse([$1],,[:],[$1])
1397- fi
1398-
1399- GSETTINGS_RULES='
1400-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
1401-
1402-mostlyclean-am: clean-gsettings-schemas
1403-
1404-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
1405-
1406-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
1407- $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
1408-
1409-all-am: $(gsettings_SCHEMAS:.xml=.valid)
1410-uninstall-am: uninstall-gsettings-schemas
1411-install-data-am: install-gsettings-schemas
1412-
1413-.SECONDARY: $(gsettings_SCHEMAS)
1414-
1415-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
1416- @$(NORMAL_INSTALL)
1417- if test -n "$^"; then \
1418- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
1419- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
1420- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
1421- fi
1422-
1423-uninstall-gsettings-schemas:
1424- @$(NORMAL_UNINSTALL)
1425- @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
1426- files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
1427- test -n "$$files" || exit 0; \
1428- echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
1429- cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
1430- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
1431-
1432-clean-gsettings-schemas:
1433- rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
1434-
1435-ifdef gsettings_ENUM_NAMESPACE
1436-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
1437- $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
1438-endif
1439-'
1440- _GSETTINGS_SUBST(GSETTINGS_RULES)
1441-])
1442-
1443-dnl _GSETTINGS_SUBST(VARIABLE)
1444-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1445-AC_DEFUN([_GSETTINGS_SUBST],
1446-[
1447-AC_SUBST([$1])
1448-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1449-]
1450-)
1451-
1452 m4_include([m4/intltool.m4])
1453
1454=== modified file 'configure'
1455--- configure 2010-12-23 12:40:25 +0000
1456+++ configure 2011-01-10 17:05:40 +0000
1457@@ -1,6 +1,6 @@
1458 #! /bin/sh
1459 # Guess values for system-dependent variables and create Makefiles.
1460-# Generated by GNU Autoconf 2.67 for gsettings-desktop-schemas 0.1.3.
1461+# Generated by GNU Autoconf 2.68 for gsettings-desktop-schemas 0.1.4.
1462 #
1463 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas>.
1464 #
1465@@ -91,6 +91,7 @@
1466 IFS=" "" $as_nl"
1467
1468 # Find who we are. Look in the path if we contain no directory separator.
1469+as_myself=
1470 case $0 in #((
1471 *[\\/]* ) as_myself=$0 ;;
1472 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1473@@ -216,11 +217,18 @@
1474 # We cannot yet assume a decent shell, so we have to provide a
1475 # neutralization value for shells without unset; and this also
1476 # works around shells that cannot unset nonexistent variables.
1477+ # Preserve -v and -x to the replacement shell.
1478 BASH_ENV=/dev/null
1479 ENV=/dev/null
1480 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1481 export CONFIG_SHELL
1482- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1483+ case $- in # ((((
1484+ *v*x* | *x*v* ) as_opts=-vx ;;
1485+ *v* ) as_opts=-v ;;
1486+ *x* ) as_opts=-x ;;
1487+ * ) as_opts= ;;
1488+ esac
1489+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
1490 fi
1491
1492 if test x$as_have_required = xno; then :
1493@@ -553,8 +561,8 @@
1494 # Identity of this package.
1495 PACKAGE_NAME='gsettings-desktop-schemas'
1496 PACKAGE_TARNAME='gsettings-desktop-schemas'
1497-PACKAGE_VERSION='0.1.3'
1498-PACKAGE_STRING='gsettings-desktop-schemas 0.1.3'
1499+PACKAGE_VERSION='0.1.4'
1500+PACKAGE_STRING='gsettings-desktop-schemas 0.1.4'
1501 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'
1502 PACKAGE_URL=''
1503
1504@@ -755,7 +763,8 @@
1505 LDFLAGS
1506 LIBS
1507 CPPFLAGS
1508-CPP'
1509+CPP
1510+CPPFLAGS'
1511
1512
1513 # Initialize some variables set by options.
1514@@ -1160,7 +1169,7 @@
1515 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1516 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1517 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1518- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1519+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1520 ;;
1521
1522 esac
1523@@ -1298,7 +1307,7 @@
1524 # Omit some internal or obsolete options to make the list less imposing.
1525 # This message is too long to be a string in the A/UX 3.1 sh.
1526 cat <<_ACEOF
1527-\`configure' configures gsettings-desktop-schemas 0.1.3 to adapt to many kinds of systems.
1528+\`configure' configures gsettings-desktop-schemas 0.1.4 to adapt to many kinds of systems.
1529
1530 Usage: $0 [OPTION]... [VAR=VALUE]...
1531
1532@@ -1365,7 +1374,7 @@
1533
1534 if test -n "$ac_init_help"; then
1535 case $ac_init_help in
1536- short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.3:";;
1537+ short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.4:";;
1538 esac
1539 cat <<\_ACEOF
1540
1541@@ -1464,8 +1473,8 @@
1542 test -n "$ac_init_help" && exit $ac_status
1543 if $ac_init_version; then
1544 cat <<\_ACEOF
1545-gsettings-desktop-schemas configure 0.1.3
1546-generated by GNU Autoconf 2.67
1547+gsettings-desktop-schemas configure 0.1.4
1548+generated by GNU Autoconf 2.68
1549
1550 Copyright (C) 2010 Free Software Foundation, Inc.
1551 This configure script is free software; the Free Software Foundation
1552@@ -1511,7 +1520,7 @@
1553
1554 ac_retval=1
1555 fi
1556- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1557+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1558 as_fn_set_status $ac_retval
1559
1560 } # ac_fn_c_try_compile
1561@@ -1548,7 +1557,7 @@
1562
1563 ac_retval=1
1564 fi
1565- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1566+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1567 as_fn_set_status $ac_retval
1568
1569 } # ac_fn_c_try_cpp
1570@@ -1590,7 +1599,7 @@
1571 ac_retval=$ac_status
1572 fi
1573 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1574- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1575+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1576 as_fn_set_status $ac_retval
1577
1578 } # ac_fn_c_try_run
1579@@ -1603,10 +1612,10 @@
1580 ac_fn_c_check_header_mongrel ()
1581 {
1582 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1583- if eval "test \"\${$3+set}\"" = set; then :
1584+ if eval \${$3+:} false; then :
1585 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1586 $as_echo_n "checking for $2... " >&6; }
1587-if eval "test \"\${$3+set}\"" = set; then :
1588+if eval \${$3+:} false; then :
1589 $as_echo_n "(cached) " >&6
1590 fi
1591 eval ac_res=\$$3
1592@@ -1667,13 +1676,13 @@
1593 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1594 ( $as_echo "## ---------------------------------------------------------------------------------------- ##
1595 ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas ##
1596-## ---------------------------------------------------------------------------------------- ##"[]
1597+## ---------------------------------------------------------------------------------------- ##"
1598 ) | sed "s/^/$as_me: WARNING: /" >&2
1599 ;;
1600 esac
1601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1602 $as_echo_n "checking for $2... " >&6; }
1603-if eval "test \"\${$3+set}\"" = set; then :
1604+if eval \${$3+:} false; then :
1605 $as_echo_n "(cached) " >&6
1606 else
1607 eval "$3=\$ac_header_compiler"
1608@@ -1682,7 +1691,7 @@
1609 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1610 $as_echo "$ac_res" >&6; }
1611 fi
1612- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1613+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1614
1615 } # ac_fn_c_check_header_mongrel
1616
1617@@ -1695,7 +1704,7 @@
1618 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1619 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1620 $as_echo_n "checking for $2... " >&6; }
1621-if eval "test \"\${$3+set}\"" = set; then :
1622+if eval \${$3+:} false; then :
1623 $as_echo_n "(cached) " >&6
1624 else
1625 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1626@@ -1713,7 +1722,7 @@
1627 eval ac_res=\$$3
1628 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1629 $as_echo "$ac_res" >&6; }
1630- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1631+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1632
1633 } # ac_fn_c_check_header_compile
1634
1635@@ -1758,7 +1767,7 @@
1636 # interfere with the next link command; also delete a directory that is
1637 # left behind by Apple's compiler. We do this before executing the actions.
1638 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1639- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1640+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1641 as_fn_set_status $ac_retval
1642
1643 } # ac_fn_c_try_link
1644@@ -1771,7 +1780,7 @@
1645 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1647 $as_echo_n "checking for $2... " >&6; }
1648-if eval "test \"\${$3+set}\"" = set; then :
1649+if eval \${$3+:} false; then :
1650 $as_echo_n "(cached) " >&6
1651 else
1652 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1653@@ -1826,15 +1835,15 @@
1654 eval ac_res=\$$3
1655 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1656 $as_echo "$ac_res" >&6; }
1657- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1658+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1659
1660 } # ac_fn_c_check_func
1661 cat >config.log <<_ACEOF
1662 This file contains any messages produced by compilers while
1663 running configure, to aid debugging if configure makes a mistake.
1664
1665-It was created by gsettings-desktop-schemas $as_me 0.1.3, which was
1666-generated by GNU Autoconf 2.67. Invocation command line was
1667+It was created by gsettings-desktop-schemas $as_me 0.1.4, which was
1668+generated by GNU Autoconf 2.68. Invocation command line was
1669
1670 $ $0 $@
1671
1672@@ -1946,7 +1955,7 @@
1673
1674 $as_echo "## ---------------- ##
1675 ## Cache variables. ##
1676-## ---------------- ##"[]
1677+## ---------------- ##"
1678 echo
1679 # The following way of writing the cache mishandles newlines in values,
1680 (
1681@@ -1982,7 +1991,7 @@
1682
1683 $as_echo "## ----------------- ##
1684 ## Output variables. ##
1685-## ----------------- ##"[]
1686+## ----------------- ##"
1687 echo
1688 for ac_var in $ac_subst_vars
1689 do
1690@@ -1997,7 +2006,7 @@
1691 if test -n "$ac_subst_files"; then
1692 $as_echo "## ------------------- ##
1693 ## File substitutions. ##
1694-## ------------------- ##"[]
1695+## ------------------- ##"
1696 echo
1697 for ac_var in $ac_subst_files
1698 do
1699@@ -2013,7 +2022,7 @@
1700 if test -s confdefs.h; then
1701 $as_echo "## ----------- ##
1702 ## confdefs.h. ##
1703-## ----------- ##"[]
1704+## ----------- ##"
1705 echo
1706 cat confdefs.h
1707 echo
1708@@ -2230,7 +2239,7 @@
1709 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1710 $as_echo_n "checking for a BSD-compatible install... " >&6; }
1711 if test -z "$INSTALL"; then
1712-if test "${ac_cv_path_install+set}" = set; then :
1713+if ${ac_cv_path_install+:} false; then :
1714 $as_echo_n "(cached) " >&6
1715 else
1716 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1717@@ -2407,7 +2416,7 @@
1718 set dummy ${ac_tool_prefix}strip; ac_word=$2
1719 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1720 $as_echo_n "checking for $ac_word... " >&6; }
1721-if test "${ac_cv_prog_STRIP+set}" = set; then :
1722+if ${ac_cv_prog_STRIP+:} false; then :
1723 $as_echo_n "(cached) " >&6
1724 else
1725 if test -n "$STRIP"; then
1726@@ -2447,7 +2456,7 @@
1727 set dummy strip; ac_word=$2
1728 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1729 $as_echo_n "checking for $ac_word... " >&6; }
1730-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1731+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1732 $as_echo_n "(cached) " >&6
1733 else
1734 if test -n "$ac_ct_STRIP"; then
1735@@ -2500,7 +2509,7 @@
1736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
1737 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1738 if test -z "$MKDIR_P"; then
1739- if test "${ac_cv_path_mkdir+set}" = set; then :
1740+ if ${ac_cv_path_mkdir+:} false; then :
1741 $as_echo_n "(cached) " >&6
1742 else
1743 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1744@@ -2551,7 +2560,7 @@
1745 set dummy $ac_prog; ac_word=$2
1746 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1747 $as_echo_n "checking for $ac_word... " >&6; }
1748-if test "${ac_cv_prog_AWK+set}" = set; then :
1749+if ${ac_cv_prog_AWK+:} false; then :
1750 $as_echo_n "(cached) " >&6
1751 else
1752 if test -n "$AWK"; then
1753@@ -2591,7 +2600,7 @@
1754 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1755 set x ${MAKE-make}
1756 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1757-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
1758+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
1759 $as_echo_n "(cached) " >&6
1760 else
1761 cat >conftest.make <<\_ACEOF
1762@@ -2649,7 +2658,7 @@
1763
1764 # Define the identity of the package.
1765 PACKAGE='gsettings-desktop-schemas'
1766- VERSION='0.1.3'
1767+ VERSION='0.1.4'
1768
1769
1770 cat >>confdefs.h <<_ACEOF
1771@@ -2732,7 +2741,7 @@
1772
1773 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1774 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
1775-if test "${ac_cv_path_SED+set}" = set; then :
1776+if ${ac_cv_path_SED+:} false; then :
1777 $as_echo_n "(cached) " >&6
1778 else
1779 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
1780@@ -2824,7 +2833,7 @@
1781 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
1782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1783 $as_echo_n "checking for $ac_word... " >&6; }
1784-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
1785+if ${ac_cv_path_PKG_CONFIG+:} false; then :
1786 $as_echo_n "(cached) " >&6
1787 else
1788 case $PKG_CONFIG in
1789@@ -2867,7 +2876,7 @@
1790 set dummy pkg-config; ac_word=$2
1791 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1792 $as_echo_n "checking for $ac_word... " >&6; }
1793-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
1794+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
1795 $as_echo_n "(cached) " >&6
1796 else
1797 case $ac_pt_PKG_CONFIG in
1798@@ -2940,7 +2949,7 @@
1799 set dummy glib-compile-schemas; ac_word=$2
1800 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1801 $as_echo_n "checking for $ac_word... " >&6; }
1802-if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :
1803+if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
1804 $as_echo_n "(cached) " >&6
1805 else
1806 case $GLIB_COMPILE_SCHEMAS in
1807@@ -3106,7 +3115,7 @@
1808 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1809 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1810 $as_echo_n "checking for $ac_word... " >&6; }
1811-if test "${ac_cv_prog_CC+set}" = set; then :
1812+if ${ac_cv_prog_CC+:} false; then :
1813 $as_echo_n "(cached) " >&6
1814 else
1815 if test -n "$CC"; then
1816@@ -3146,7 +3155,7 @@
1817 set dummy gcc; ac_word=$2
1818 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1819 $as_echo_n "checking for $ac_word... " >&6; }
1820-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1821+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1822 $as_echo_n "(cached) " >&6
1823 else
1824 if test -n "$ac_ct_CC"; then
1825@@ -3199,7 +3208,7 @@
1826 set dummy ${ac_tool_prefix}cc; ac_word=$2
1827 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1828 $as_echo_n "checking for $ac_word... " >&6; }
1829-if test "${ac_cv_prog_CC+set}" = set; then :
1830+if ${ac_cv_prog_CC+:} false; then :
1831 $as_echo_n "(cached) " >&6
1832 else
1833 if test -n "$CC"; then
1834@@ -3239,7 +3248,7 @@
1835 set dummy cc; ac_word=$2
1836 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1837 $as_echo_n "checking for $ac_word... " >&6; }
1838-if test "${ac_cv_prog_CC+set}" = set; then :
1839+if ${ac_cv_prog_CC+:} false; then :
1840 $as_echo_n "(cached) " >&6
1841 else
1842 if test -n "$CC"; then
1843@@ -3298,7 +3307,7 @@
1844 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1845 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1846 $as_echo_n "checking for $ac_word... " >&6; }
1847-if test "${ac_cv_prog_CC+set}" = set; then :
1848+if ${ac_cv_prog_CC+:} false; then :
1849 $as_echo_n "(cached) " >&6
1850 else
1851 if test -n "$CC"; then
1852@@ -3342,7 +3351,7 @@
1853 set dummy $ac_prog; ac_word=$2
1854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1855 $as_echo_n "checking for $ac_word... " >&6; }
1856-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1857+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1858 $as_echo_n "(cached) " >&6
1859 else
1860 if test -n "$ac_ct_CC"; then
1861@@ -3625,7 +3634,7 @@
1862 ac_clean_files=$ac_clean_files_save
1863 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
1864 $as_echo_n "checking for suffix of object files... " >&6; }
1865-if test "${ac_cv_objext+set}" = set; then :
1866+if ${ac_cv_objext+:} false; then :
1867 $as_echo_n "(cached) " >&6
1868 else
1869 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1870@@ -3676,7 +3685,7 @@
1871 ac_objext=$OBJEXT
1872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1873 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1874-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1875+if ${ac_cv_c_compiler_gnu+:} false; then :
1876 $as_echo_n "(cached) " >&6
1877 else
1878 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1879@@ -3713,7 +3722,7 @@
1880 ac_save_CFLAGS=$CFLAGS
1881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1882 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1883-if test "${ac_cv_prog_cc_g+set}" = set; then :
1884+if ${ac_cv_prog_cc_g+:} false; then :
1885 $as_echo_n "(cached) " >&6
1886 else
1887 ac_save_c_werror_flag=$ac_c_werror_flag
1888@@ -3791,7 +3800,7 @@
1889 fi
1890 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1891 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1892-if test "${ac_cv_prog_cc_c89+set}" = set; then :
1893+if ${ac_cv_prog_cc_c89+:} false; then :
1894 $as_echo_n "(cached) " >&6
1895 else
1896 ac_cv_prog_cc_c89=no
1897@@ -3890,7 +3899,7 @@
1898
1899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1900 $as_echo_n "checking dependency style of $depcc... " >&6; }
1901-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
1902+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
1903 $as_echo_n "(cached) " >&6
1904 else
1905 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1906@@ -4026,7 +4035,7 @@
1907 CPP=
1908 fi
1909 if test -z "$CPP"; then
1910- if test "${ac_cv_prog_CPP+set}" = set; then :
1911+ if ${ac_cv_prog_CPP+:} false; then :
1912 $as_echo_n "(cached) " >&6
1913 else
1914 # Double quotes because CPP needs to be expanded
1915@@ -4154,7 +4163,7 @@
1916
1917 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1918 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1919-if test "${ac_cv_path_GREP+set}" = set; then :
1920+if ${ac_cv_path_GREP+:} false; then :
1921 $as_echo_n "(cached) " >&6
1922 else
1923 if test -z "$GREP"; then
1924@@ -4217,7 +4226,7 @@
1925
1926 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1927 $as_echo_n "checking for egrep... " >&6; }
1928-if test "${ac_cv_path_EGREP+set}" = set; then :
1929+if ${ac_cv_path_EGREP+:} false; then :
1930 $as_echo_n "(cached) " >&6
1931 else
1932 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1933@@ -4284,7 +4293,7 @@
1934
1935 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1936 $as_echo_n "checking for ANSI C header files... " >&6; }
1937-if test "${ac_cv_header_stdc+set}" = set; then :
1938+if ${ac_cv_header_stdc+:} false; then :
1939 $as_echo_n "(cached) " >&6
1940 else
1941 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1942@@ -4415,7 +4424,7 @@
1943 for ac_header in locale.h
1944 do :
1945 ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
1946-if test "x$ac_cv_header_locale_h" = x""yes; then :
1947+if test "x$ac_cv_header_locale_h" = xyes; then :
1948 cat >>confdefs.h <<_ACEOF
1949 #define HAVE_LOCALE_H 1
1950 _ACEOF
1951@@ -4427,7 +4436,7 @@
1952 if test $ac_cv_header_locale_h = yes; then
1953 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
1954 $as_echo_n "checking for LC_MESSAGES... " >&6; }
1955-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
1956+if ${am_cv_val_LC_MESSAGES+:} false; then :
1957 $as_echo_n "(cached) " >&6
1958 else
1959 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1960@@ -4467,7 +4476,7 @@
1961 INTLLIBS=
1962
1963 ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
1964-if test "x$ac_cv_header_libintl_h" = x""yes; then :
1965+if test "x$ac_cv_header_libintl_h" = xyes; then :
1966 gt_cv_func_dgettext_libintl="no"
1967 libintl_extra_libs=""
1968
1969@@ -4476,7 +4485,7 @@
1970 #
1971 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
1972 $as_echo_n "checking for ngettext in libc... " >&6; }
1973-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
1974+if ${gt_cv_func_ngettext_libc+:} false; then :
1975 $as_echo_n "(cached) " >&6
1976 else
1977 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1978@@ -4507,7 +4516,7 @@
1979 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1980 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
1981 $as_echo_n "checking for dgettext in libc... " >&6; }
1982-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
1983+if ${gt_cv_func_dgettext_libc+:} false; then :
1984 $as_echo_n "(cached) " >&6
1985 else
1986 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1987@@ -4540,7 +4549,7 @@
1988 for ac_func in bind_textdomain_codeset
1989 do :
1990 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
1991-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
1992+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
1993 cat >>confdefs.h <<_ACEOF
1994 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
1995 _ACEOF
1996@@ -4559,7 +4568,7 @@
1997
1998 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
1999 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
2000-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
2001+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
2002 $as_echo_n "(cached) " >&6
2003 else
2004 ac_check_lib_save_LIBS=$LIBS
2005@@ -4593,10 +4602,10 @@
2006 fi
2007 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
2008 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
2009-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
2010+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
2011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
2012 $as_echo_n "checking for ngettext in -lintl... " >&6; }
2013-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
2014+if ${ac_cv_lib_intl_ngettext+:} false; then :
2015 $as_echo_n "(cached) " >&6
2016 else
2017 ac_check_lib_save_LIBS=$LIBS
2018@@ -4630,10 +4639,10 @@
2019 fi
2020 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
2021 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
2022-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
2023+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
2024 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
2025 $as_echo_n "checking for dgettext in -lintl... " >&6; }
2026-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
2027+if ${ac_cv_lib_intl_dgettext+:} false; then :
2028 $as_echo_n "(cached) " >&6
2029 else
2030 ac_check_lib_save_LIBS=$LIBS
2031@@ -4667,7 +4676,7 @@
2032 fi
2033 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
2034 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
2035-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
2036+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
2037 gt_cv_func_dgettext_libintl=yes
2038 fi
2039
2040@@ -4683,7 +4692,7 @@
2041 $as_echo "" >&6; }
2042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
2043 $as_echo_n "checking for ngettext in -lintl... " >&6; }
2044-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
2045+if ${ac_cv_lib_intl_ngettext+:} false; then :
2046 $as_echo_n "(cached) " >&6
2047 else
2048 ac_check_lib_save_LIBS=$LIBS
2049@@ -4717,10 +4726,10 @@
2050 fi
2051 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
2052 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
2053-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
2054+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
2055 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
2056 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
2057-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
2058+if ${ac_cv_lib_intl_dcgettext+:} false; then :
2059 $as_echo_n "(cached) " >&6
2060 else
2061 ac_check_lib_save_LIBS=$LIBS
2062@@ -4754,7 +4763,7 @@
2063 fi
2064 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
2065 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
2066-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
2067+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
2068 gt_cv_func_dgettext_libintl=yes
2069 libintl_extra_libs=-liconv
2070 else
2071@@ -4779,7 +4788,7 @@
2072 for ac_func in bind_textdomain_codeset
2073 do :
2074 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2075-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2076+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2077 cat >>confdefs.h <<_ACEOF
2078 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
2079 _ACEOF
2080@@ -4817,7 +4826,7 @@
2081 set dummy msgfmt; ac_word=$2
2082 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2083 $as_echo_n "checking for $ac_word... " >&6; }
2084-if test "${ac_cv_path_MSGFMT+set}" = set; then :
2085+if ${ac_cv_path_MSGFMT+:} false; then :
2086 $as_echo_n "(cached) " >&6
2087 else
2088 case "$MSGFMT" in
2089@@ -4854,7 +4863,7 @@
2090 for ac_func in dcgettext
2091 do :
2092 ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
2093-if test "x$ac_cv_func_dcgettext" = x""yes; then :
2094+if test "x$ac_cv_func_dcgettext" = xyes; then :
2095 cat >>confdefs.h <<_ACEOF
2096 #define HAVE_DCGETTEXT 1
2097 _ACEOF
2098@@ -4895,7 +4904,7 @@
2099 set dummy gmsgfmt; ac_word=$2
2100 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2101 $as_echo_n "checking for $ac_word... " >&6; }
2102-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
2103+if ${ac_cv_path_GMSGFMT+:} false; then :
2104 $as_echo_n "(cached) " >&6
2105 else
2106 case $GMSGFMT in
2107@@ -4936,7 +4945,7 @@
2108 set dummy xgettext; ac_word=$2
2109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2110 $as_echo_n "checking for $ac_word... " >&6; }
2111-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
2112+if ${ac_cv_path_XGETTEXT+:} false; then :
2113 $as_echo_n "(cached) " >&6
2114 else
2115 case "$XGETTEXT" in
2116@@ -4987,7 +4996,7 @@
2117 case $host in
2118 *-*-solaris*)
2119 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2120-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2121+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2122 CATOBJEXT=.gmo
2123 DATADIRNAME=share
2124 else
2125@@ -5157,7 +5166,7 @@
2126 set dummy intltool-update; ac_word=$2
2127 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2128 $as_echo_n "checking for $ac_word... " >&6; }
2129-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
2130+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
2131 $as_echo_n "(cached) " >&6
2132 else
2133 case $INTLTOOL_UPDATE in
2134@@ -5197,7 +5206,7 @@
2135 set dummy intltool-merge; ac_word=$2
2136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2137 $as_echo_n "checking for $ac_word... " >&6; }
2138-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
2139+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
2140 $as_echo_n "(cached) " >&6
2141 else
2142 case $INTLTOOL_MERGE in
2143@@ -5237,7 +5246,7 @@
2144 set dummy intltool-extract; ac_word=$2
2145 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2146 $as_echo_n "checking for $ac_word... " >&6; }
2147-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
2148+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
2149 $as_echo_n "(cached) " >&6
2150 else
2151 case $INTLTOOL_EXTRACT in
2152@@ -5398,7 +5407,7 @@
2153 set dummy xgettext; ac_word=$2
2154 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2155 $as_echo_n "checking for $ac_word... " >&6; }
2156-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
2157+if ${ac_cv_path_XGETTEXT+:} false; then :
2158 $as_echo_n "(cached) " >&6
2159 else
2160 case $XGETTEXT in
2161@@ -5438,7 +5447,7 @@
2162 set dummy msgmerge; ac_word=$2
2163 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2164 $as_echo_n "checking for $ac_word... " >&6; }
2165-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
2166+if ${ac_cv_path_MSGMERGE+:} false; then :
2167 $as_echo_n "(cached) " >&6
2168 else
2169 case $MSGMERGE in
2170@@ -5478,7 +5487,7 @@
2171 set dummy msgfmt; ac_word=$2
2172 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2173 $as_echo_n "checking for $ac_word... " >&6; }
2174-if test "${ac_cv_path_MSGFMT+set}" = set; then :
2175+if ${ac_cv_path_MSGFMT+:} false; then :
2176 $as_echo_n "(cached) " >&6
2177 else
2178 case $MSGFMT in
2179@@ -5518,7 +5527,7 @@
2180 set dummy gmsgfmt; ac_word=$2
2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2182 $as_echo_n "checking for $ac_word... " >&6; }
2183-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
2184+if ${ac_cv_path_GMSGFMT+:} false; then :
2185 $as_echo_n "(cached) " >&6
2186 else
2187 case $GMSGFMT in
2188@@ -5569,7 +5578,7 @@
2189 set dummy perl; ac_word=$2
2190 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2191 $as_echo_n "checking for $ac_word... " >&6; }
2192-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
2193+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
2194 $as_echo_n "(cached) " >&6
2195 else
2196 case $INTLTOOL_PERL in
2197@@ -5653,7 +5662,7 @@
2198 case $host in
2199 *-*-solaris*)
2200 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2201-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2202+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2203 DATADIRNAME=share
2204 else
2205 DATADIRNAME=lib
2206@@ -5740,10 +5749,21 @@
2207 :end' >>confcache
2208 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
2209 if test -w "$cache_file"; then
2210- test "x$cache_file" != "x/dev/null" &&
2211+ if test "x$cache_file" != "x/dev/null"; then
2212 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
2213 $as_echo "$as_me: updating cache $cache_file" >&6;}
2214- cat confcache >$cache_file
2215+ if test ! -f "$cache_file" || test -h "$cache_file"; then
2216+ cat confcache >"$cache_file"
2217+ else
2218+ case $cache_file in #(
2219+ */* | ?:*)
2220+ mv -f confcache "$cache_file"$$ &&
2221+ mv -f "$cache_file"$$ "$cache_file" ;; #(
2222+ *)
2223+ mv -f confcache "$cache_file" ;;
2224+ esac
2225+ fi
2226+ fi
2227 else
2228 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
2229 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
2230@@ -5835,7 +5855,7 @@
2231
2232
2233
2234-: ${CONFIG_STATUS=./config.status}
2235+: "${CONFIG_STATUS=./config.status}"
2236 ac_write_fail=0
2237 ac_clean_files_save=$ac_clean_files
2238 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
2239@@ -5936,6 +5956,7 @@
2240 IFS=" "" $as_nl"
2241
2242 # Find who we are. Look in the path if we contain no directory separator.
2243+as_myself=
2244 case $0 in #((
2245 *[\\/]* ) as_myself=$0 ;;
2246 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2247@@ -6242,8 +6263,8 @@
2248 # report actual input values of CONFIG_FILES etc. instead of their
2249 # values after options handling.
2250 ac_log="
2251-This file was extended by gsettings-desktop-schemas $as_me 0.1.3, which was
2252-generated by GNU Autoconf 2.67. Invocation command line was
2253+This file was extended by gsettings-desktop-schemas $as_me 0.1.4, which was
2254+generated by GNU Autoconf 2.68. Invocation command line was
2255
2256 CONFIG_FILES = $CONFIG_FILES
2257 CONFIG_HEADERS = $CONFIG_HEADERS
2258@@ -6299,8 +6320,8 @@
2259 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2260 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2261 ac_cs_version="\\
2262-gsettings-desktop-schemas config.status 0.1.3
2263-configured by $0, generated by GNU Autoconf 2.67,
2264+gsettings-desktop-schemas config.status 0.1.4
2265+configured by $0, generated by GNU Autoconf 2.68,
2266 with options \\"\$ac_cs_config\\"
2267
2268 Copyright (C) 2010 Free Software Foundation, Inc.
2269@@ -6449,9 +6470,10 @@
2270 # after its creation but before its name has been assigned to `$tmp'.
2271 $debug ||
2272 {
2273- tmp=
2274+ tmp= ac_tmp=
2275 trap 'exit_status=$?
2276- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
2277+ : "${ac_tmp:=$tmp}"
2278+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
2279 ' 0
2280 trap 'as_fn_exit 1' 1 2 13 15
2281 }
2282@@ -6459,12 +6481,13 @@
2283
2284 {
2285 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
2286- test -n "$tmp" && test -d "$tmp"
2287+ test -d "$tmp"
2288 } ||
2289 {
2290 tmp=./conf$$-$RANDOM
2291 (umask 077 && mkdir "$tmp")
2292 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
2293+ac_tmp=$tmp
2294
2295 # Set up the scripts for CONFIG_FILES section.
2296 # No need to generate them if there are no CONFIG_FILES.
2297@@ -6486,7 +6509,7 @@
2298 ac_cs_awk_cr=$ac_cr
2299 fi
2300
2301-echo 'BEGIN {' >"$tmp/subs1.awk" &&
2302+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
2303 _ACEOF
2304
2305
2306@@ -6514,7 +6537,7 @@
2307 rm -f conf$$subs.sh
2308
2309 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2310-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
2311+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
2312 _ACEOF
2313 sed -n '
2314 h
2315@@ -6562,7 +6585,7 @@
2316 rm -f conf$$subs.awk
2317 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2318 _ACAWK
2319-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
2320+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
2321 for (key in S) S_is_set[key] = 1
2322 FS = ""
2323
2324@@ -6594,7 +6617,7 @@
2325 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
2326 else
2327 cat
2328-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
2329+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
2330 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
2331 _ACEOF
2332
2333@@ -6653,7 +6676,7 @@
2334 for ac_f
2335 do
2336 case $ac_f in
2337- -) ac_f="$tmp/stdin";;
2338+ -) ac_f="$ac_tmp/stdin";;
2339 *) # Look for the file first in the build tree, then in the source tree
2340 # (if the path is not absolute). The absolute path cannot be DOS-style,
2341 # because $ac_f cannot contain `:'.
2342@@ -6688,7 +6711,7 @@
2343 esac
2344
2345 case $ac_tag in
2346- *:-:* | *:-) cat >"$tmp/stdin" \
2347+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
2348 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
2349 esac
2350 ;;
2351@@ -6825,21 +6848,22 @@
2352 s&@MKDIR_P@&$ac_MKDIR_P&;t t
2353 $ac_datarootdir_hack
2354 "
2355-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
2356- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2357+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
2358+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2359
2360 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
2361- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
2362- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
2363+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
2364+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
2365+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
2366 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2367 which seems to be undefined. Please make sure it is defined" >&5
2368 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2369 which seems to be undefined. Please make sure it is defined" >&2;}
2370
2371- rm -f "$tmp/stdin"
2372+ rm -f "$ac_tmp/stdin"
2373 case $ac_file in
2374- -) cat "$tmp/out" && rm -f "$tmp/out";;
2375- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
2376+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
2377+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
2378 esac \
2379 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2380 ;;
2381
2382=== modified file 'configure.ac'
2383--- configure.ac 2010-12-23 12:40:25 +0000
2384+++ configure.ac 2011-01-10 17:05:40 +0000
2385@@ -1,5 +1,5 @@
2386 AC_PREREQ(2.53)
2387-AC_INIT([gsettings-desktop-schemas], [0.1.3],
2388+AC_INIT([gsettings-desktop-schemas], [0.1.4],
2389 [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])
2390 AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml)
2391 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
2392
2393=== modified file 'debian/changelog'
2394--- debian/changelog 2010-12-23 12:40:25 +0000
2395+++ debian/changelog 2011-01-10 17:05:40 +0000
2396@@ -1,3 +1,9 @@
2397+gsettings-desktop-schemas (0.1.4-1) UNRELEASED; urgency=low
2398+
2399+ * New upstream release.
2400+
2401+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 10 Jan 2011 18:01:17 +0100
2402+
2403 gsettings-desktop-schemas (0.1.3-1) experimental; urgency=low
2404
2405 * New upstream release.
2406
2407=== modified file 'schemas/Makefile.am'
2408--- schemas/Makefile.am 2010-11-30 10:25:03 +0000
2409+++ schemas/Makefile.am 2011-01-10 17:05:40 +0000
2410@@ -7,7 +7,8 @@
2411 org.gnome.desktop.thumbnail-cache.gschema.xml \
2412 org.gnome.desktop.a11y.keyboard.gschema.xml \
2413 org.gnome.desktop.a11y.applications.gschema.xml \
2414- org.gnome.desktop.a11y.mouse.gschema.xml
2415+ org.gnome.desktop.a11y.mouse.gschema.xml \
2416+ org.gnome.desktop.thumbnailers.gschema.xml
2417
2418 desktop_gschemas_in = \
2419 org.gnome.desktop.background.gschema.xml.in \
2420
2421=== modified file 'schemas/Makefile.in'
2422--- schemas/Makefile.in 2010-11-30 10:25:03 +0000
2423+++ schemas/Makefile.in 2011-01-10 17:05:40 +0000
2424@@ -202,7 +202,8 @@
2425 org.gnome.desktop.thumbnail-cache.gschema.xml \
2426 org.gnome.desktop.a11y.keyboard.gschema.xml \
2427 org.gnome.desktop.a11y.applications.gschema.xml \
2428- org.gnome.desktop.a11y.mouse.gschema.xml
2429+ org.gnome.desktop.a11y.mouse.gschema.xml \
2430+ org.gnome.desktop.thumbnailers.gschema.xml
2431
2432 desktop_gschemas_in = \
2433 org.gnome.desktop.background.gschema.xml.in \
2434
2435=== modified file 'schemas/gsettings-desktop-schemas.convert'
2436--- schemas/gsettings-desktop-schemas.convert 2010-12-23 12:40:25 +0000
2437+++ schemas/gsettings-desktop-schemas.convert 2011-01-10 17:05:40 +0000
2438@@ -170,3 +170,7 @@
2439 dwell-click-enabled = /desktop/gnome/accessibility/mouse/dwell_enable
2440 secondary-click-enabled = /desktop/gnome/accessibility/mouse/delay_enable
2441 secondary-click-time = /desktop/gnome/accessibility/mouse/delay_time
2442+
2443+# From org.gnome.desktop.thumbnailers
2444+[org.gnome.desktop.thumbnailers]
2445+disable-all = /desktop/gnome/thumbnailers/disable_all
2446
2447=== modified file 'schemas/org.gnome.desktop.background.gschema.xml.in'
2448--- schemas/org.gnome.desktop.background.gschema.xml.in 2010-12-23 12:40:25 +0000
2449+++ schemas/org.gnome.desktop.background.gschema.xml.in 2011-01-10 17:05:40 +0000
2450@@ -47,12 +47,12 @@
2451 <default>'solid'</default>
2452 <summary>Color Shading Type</summary>
2453 <description>
2454- How to shade the background color. Possible values are "horizontal",
2455+ How to shade the background color. Possible values are "horizontal",
2456 "vertical", and "solid".
2457 </description>
2458 </key>
2459 <key name="show-desktop-icons" type="b">
2460- <default>true</default>
2461+ <default>false</default>
2462 <summary>Have file manager handle the desktop</summary>
2463 <description>
2464 If set to true, then file manager will draw the icons on the desktop.
2465
2466=== added file 'schemas/org.gnome.desktop.thumbnailers.gschema.xml'
2467--- schemas/org.gnome.desktop.thumbnailers.gschema.xml 1970-01-01 00:00:00 +0000
2468+++ schemas/org.gnome.desktop.thumbnailers.gschema.xml 2011-01-10 17:05:40 +0000
2469@@ -0,0 +1,25 @@
2470+<?xml version="1.0"?>
2471+<schemalist>
2472+ <schema id="org.gnome.desktop.thumbnailers" path="/desktop/gnome/thumbnailers/">
2473+ <key name="disable-all" type="b">
2474+ <default>false</default>
2475+ <summary>Disable all external thumbnailers</summary>
2476+ <description>
2477+ Set to true to disable all external thumbnailer programs,
2478+ independent on whether they are independently disabled/enabled.
2479+ </description>
2480+ </key>
2481+
2482+ <key name="disable" type="as">
2483+ <default>[]</default>
2484+ <summary>
2485+ List of mime-types for which external thumbnailer
2486+ programs will be disabled
2487+ </summary>
2488+ <description>
2489+ Thumbnails will not be created for files whose mime-type is
2490+ contained in the list.
2491+ </description>
2492+ </key>
2493+ </schema>
2494+</schemalist>

Subscribers

People subscribed via source and target branches

to all changes: