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
=== modified file 'NEWS'
--- NEWS 2010-12-23 12:40:25 +0000
+++ NEWS 2011-01-10 17:05:40 +0000
@@ -1,3 +1,9 @@
1Major changes in 0.1.4
2======================
3
4* Add thumbnailer schemas
5* Don't show icons on the desktop by default
6
1Major changes in 0.1.37Major changes in 0.1.3
2======================8======================
39
410
=== modified file 'aclocal.m4'
--- aclocal.m4 2010-12-23 12:40:25 +0000
+++ aclocal.m4 2011-01-10 17:05:40 +0000
@@ -13,12 +13,720 @@
1313
14m4_ifndef([AC_AUTOCONF_VERSION],14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17[m4_warning([this file was generated for autoconf 2.67.17[m4_warning([this file was generated for autoconf 2.68.
18You have another version of autoconf. It may work, but is not guaranteed to.18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely.19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])])20To do so, use the procedure documented by the package, typically `autoreconf'.])])
2121
22# Copyright (C) 1995-2002 Free Software Foundation, Inc.
23# Copyright (C) 2001-2003,2004 Red Hat, Inc.
24#
25# This file is free software, distributed under the terms of the GNU
26# General Public License. As a special exception to the GNU General
27# Public License, this file may be distributed as part of a program
28# that contains a configuration script generated by Autoconf, under
29# the same distribution terms as the rest of that program.
30#
31# This file can be copied and used freely without restrictions. It can
32# be used in projects which are not available under the GNU Public License
33# but which still want to provide support for the GNU gettext functionality.
34#
35# Macro to add for using GNU gettext.
36# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
37#
38# Modified to never use included libintl.
39# Owen Taylor <otaylor@redhat.com>, 12/15/1998
40#
41# Major rework to remove unused code
42# Owen Taylor <otaylor@redhat.com>, 12/11/2002
43#
44# Added better handling of ALL_LINGUAS from GNU gettext version
45# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
46#
47# Modified to require ngettext
48# Matthias Clasen <mclasen@redhat.com> 08/06/2004
49#
50# We need this here as well, since someone might use autoconf-2.5x
51# to configure GLib then an older version to configure a package
52# using AM_GLIB_GNU_GETTEXT
53AC_PREREQ(2.53)
54
55dnl
56dnl We go to great lengths to make sure that aclocal won't
57dnl try to pull in the installed version of these macros
58dnl when running aclocal in the glib directory.
59dnl
60m4_copy([AC_DEFUN],[glib_DEFUN])
61m4_copy([AC_REQUIRE],[glib_REQUIRE])
62dnl
63dnl At the end, if we're not within glib, we'll define the public
64dnl definitions in terms of our private definitions.
65dnl
66
67# GLIB_LC_MESSAGES
68#--------------------
69glib_DEFUN([GLIB_LC_MESSAGES],
70 [AC_CHECK_HEADERS([locale.h])
71 if test $ac_cv_header_locale_h = yes; then
72 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
73 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
74 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
75 if test $am_cv_val_LC_MESSAGES = yes; then
76 AC_DEFINE(HAVE_LC_MESSAGES, 1,
77 [Define if your <locale.h> file defines LC_MESSAGES.])
78 fi
79 fi])
80
81# GLIB_PATH_PROG_WITH_TEST
82#----------------------------
83dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
84dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
85glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
86[# Extract the first word of "$2", so it can be a program name with args.
87set dummy $2; ac_word=[$]2
88AC_MSG_CHECKING([for $ac_word])
89AC_CACHE_VAL(ac_cv_path_$1,
90[case "[$]$1" in
91 /*)
92 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
93 ;;
94 *)
95 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
96 for ac_dir in ifelse([$5], , $PATH, [$5]); do
97 test -z "$ac_dir" && ac_dir=.
98 if test -f $ac_dir/$ac_word; then
99 if [$3]; then
100 ac_cv_path_$1="$ac_dir/$ac_word"
101 break
102 fi
103 fi
104 done
105 IFS="$ac_save_ifs"
106dnl If no 4th arg is given, leave the cache variable unset,
107dnl so AC_PATH_PROGS will keep looking.
108ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
109])dnl
110 ;;
111esac])dnl
112$1="$ac_cv_path_$1"
113if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
114 AC_MSG_RESULT([$]$1)
115else
116 AC_MSG_RESULT(no)
117fi
118AC_SUBST($1)dnl
119])
120
121# GLIB_WITH_NLS
122#-----------------
123glib_DEFUN([GLIB_WITH_NLS],
124 dnl NLS is obligatory
125 [USE_NLS=yes
126 AC_SUBST(USE_NLS)
127
128 gt_cv_have_gettext=no
129
130 CATOBJEXT=NONE
131 XGETTEXT=:
132 INTLLIBS=
133
134 AC_CHECK_HEADER(libintl.h,
135 [gt_cv_func_dgettext_libintl="no"
136 libintl_extra_libs=""
137
138 #
139 # First check in libc
140 #
141 AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
142 [AC_TRY_LINK([
143#include <libintl.h>
144],
145 [return !ngettext ("","", 1)],
146 gt_cv_func_ngettext_libc=yes,
147 gt_cv_func_ngettext_libc=no)
148 ])
149
150 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
151 AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
152 [AC_TRY_LINK([
153#include <libintl.h>
154],
155 [return !dgettext ("","")],
156 gt_cv_func_dgettext_libc=yes,
157 gt_cv_func_dgettext_libc=no)
158 ])
159 fi
160
161 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
162 AC_CHECK_FUNCS(bind_textdomain_codeset)
163 fi
164
165 #
166 # If we don't have everything we want, check in libintl
167 #
168 if test "$gt_cv_func_dgettext_libc" != "yes" \
169 || test "$gt_cv_func_ngettext_libc" != "yes" \
170 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
171
172 AC_CHECK_LIB(intl, bindtextdomain,
173 [AC_CHECK_LIB(intl, ngettext,
174 [AC_CHECK_LIB(intl, dgettext,
175 gt_cv_func_dgettext_libintl=yes)])])
176
177 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
178 AC_MSG_CHECKING([if -liconv is needed to use gettext])
179 AC_MSG_RESULT([])
180 AC_CHECK_LIB(intl, ngettext,
181 [AC_CHECK_LIB(intl, dcgettext,
182 [gt_cv_func_dgettext_libintl=yes
183 libintl_extra_libs=-liconv],
184 :,-liconv)],
185 :,-liconv)
186 fi
187
188 #
189 # If we found libintl, then check in it for bind_textdomain_codeset();
190 # we'll prefer libc if neither have bind_textdomain_codeset(),
191 # and both have dgettext and ngettext
192 #
193 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
194 glib_save_LIBS="$LIBS"
195 LIBS="$LIBS -lintl $libintl_extra_libs"
196 unset ac_cv_func_bind_textdomain_codeset
197 AC_CHECK_FUNCS(bind_textdomain_codeset)
198 LIBS="$glib_save_LIBS"
199
200 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
201 gt_cv_func_dgettext_libc=no
202 else
203 if test "$gt_cv_func_dgettext_libc" = "yes" \
204 && test "$gt_cv_func_ngettext_libc" = "yes"; then
205 gt_cv_func_dgettext_libintl=no
206 fi
207 fi
208 fi
209 fi
210
211 if test "$gt_cv_func_dgettext_libc" = "yes" \
212 || test "$gt_cv_func_dgettext_libintl" = "yes"; then
213 gt_cv_have_gettext=yes
214 fi
215
216 if test "$gt_cv_func_dgettext_libintl" = "yes"; then
217 INTLLIBS="-lintl $libintl_extra_libs"
218 fi
219
220 if test "$gt_cv_have_gettext" = "yes"; then
221 AC_DEFINE(HAVE_GETTEXT,1,
222 [Define if the GNU gettext() function is already present or preinstalled.])
223 GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
224 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
225 if test "$MSGFMT" != "no"; then
226 glib_save_LIBS="$LIBS"
227 LIBS="$LIBS $INTLLIBS"
228 AC_CHECK_FUNCS(dcgettext)
229 MSGFMT_OPTS=
230 AC_MSG_CHECKING([if msgfmt accepts -c])
231 GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
232msgid ""
233msgstr ""
234"Content-Type: text/plain; charset=UTF-8\n"
235"Project-Id-Version: test 1.0\n"
236"PO-Revision-Date: 2007-02-15 12:01+0100\n"
237"Last-Translator: test <foo@bar.xx>\n"
238"Language-Team: C <LL@li.org>\n"
239"MIME-Version: 1.0\n"
240"Content-Transfer-Encoding: 8bit\n"
241], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
242 AC_SUBST(MSGFMT_OPTS)
243 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
244 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
245 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
246 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
247 return _nl_msg_cat_cntr],
248 [CATOBJEXT=.gmo
249 DATADIRNAME=share],
250 [case $host in
251 *-*-solaris*)
252 dnl On Solaris, if bind_textdomain_codeset is in libc,
253 dnl GNU format message catalog is always supported,
254 dnl since both are added to the libc all together.
255 dnl Hence, we'd like to go with DATADIRNAME=share and
256 dnl and CATOBJEXT=.gmo in this case.
257 AC_CHECK_FUNC(bind_textdomain_codeset,
258 [CATOBJEXT=.gmo
259 DATADIRNAME=share],
260 [CATOBJEXT=.mo
261 DATADIRNAME=lib])
262 ;;
263 *)
264 CATOBJEXT=.mo
265 DATADIRNAME=lib
266 ;;
267 esac])
268 LIBS="$glib_save_LIBS"
269 INSTOBJEXT=.mo
270 else
271 gt_cv_have_gettext=no
272 fi
273 fi
274 ])
275
276 if test "$gt_cv_have_gettext" = "yes" ; then
277 AC_DEFINE(ENABLE_NLS, 1,
278 [always defined to indicate that i18n is enabled])
279 fi
280
281 dnl Test whether we really found GNU xgettext.
282 if test "$XGETTEXT" != ":"; then
283 dnl If it is not GNU xgettext we define it as : so that the
284 dnl Makefiles still can work.
285 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
286 : ;
287 else
288 AC_MSG_RESULT(
289 [found xgettext program is not GNU xgettext; ignore it])
290 XGETTEXT=":"
291 fi
292 fi
293
294 # We need to process the po/ directory.
295 POSUB=po
296
297 AC_OUTPUT_COMMANDS(
298 [case "$CONFIG_FILES" in *po/Makefile.in*)
299 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
300 esac])
301
302 dnl These rules are solely for the distribution goal. While doing this
303 dnl we only have to keep exactly one list of the available catalogs
304 dnl in configure.ac.
305 for lang in $ALL_LINGUAS; do
306 GMOFILES="$GMOFILES $lang.gmo"
307 POFILES="$POFILES $lang.po"
308 done
309
310 dnl Make all variables we use known to autoconf.
311 AC_SUBST(CATALOGS)
312 AC_SUBST(CATOBJEXT)
313 AC_SUBST(DATADIRNAME)
314 AC_SUBST(GMOFILES)
315 AC_SUBST(INSTOBJEXT)
316 AC_SUBST(INTLLIBS)
317 AC_SUBST(PO_IN_DATADIR_TRUE)
318 AC_SUBST(PO_IN_DATADIR_FALSE)
319 AC_SUBST(POFILES)
320 AC_SUBST(POSUB)
321 ])
322
323# AM_GLIB_GNU_GETTEXT
324# -------------------
325# Do checks necessary for use of gettext. If a suitable implementation
326# of gettext is found in either in libintl or in the C library,
327# it will set INTLLIBS to the libraries needed for use of gettext
328# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
329# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
330# on various variables needed by the Makefile.in.in installed by
331# glib-gettextize.
332dnl
333glib_DEFUN([GLIB_GNU_GETTEXT],
334 [AC_REQUIRE([AC_PROG_CC])dnl
335 AC_REQUIRE([AC_HEADER_STDC])dnl
336
337 GLIB_LC_MESSAGES
338 GLIB_WITH_NLS
339
340 if test "$gt_cv_have_gettext" = "yes"; then
341 if test "x$ALL_LINGUAS" = "x"; then
342 LINGUAS=
343 else
344 AC_MSG_CHECKING(for catalogs to be installed)
345 NEW_LINGUAS=
346 for presentlang in $ALL_LINGUAS; do
347 useit=no
348 if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
349 desiredlanguages="$LINGUAS"
350 else
351 desiredlanguages="$ALL_LINGUAS"
352 fi
353 for desiredlang in $desiredlanguages; do
354 # Use the presentlang catalog if desiredlang is
355 # a. equal to presentlang, or
356 # b. a variant of presentlang (because in this case,
357 # presentlang can be used as a fallback for messages
358 # which are not translated in the desiredlang catalog).
359 case "$desiredlang" in
360 "$presentlang"*) useit=yes;;
361 esac
362 done
363 if test $useit = yes; then
364 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
365 fi
366 done
367 LINGUAS=$NEW_LINGUAS
368 AC_MSG_RESULT($LINGUAS)
369 fi
370
371 dnl Construct list of names of catalog files to be constructed.
372 if test -n "$LINGUAS"; then
373 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
374 fi
375 fi
376
377 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
378 dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
379 dnl Try to locate is.
380 MKINSTALLDIRS=
381 if test -n "$ac_aux_dir"; then
382 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
383 fi
384 if test -z "$MKINSTALLDIRS"; then
385 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
386 fi
387 AC_SUBST(MKINSTALLDIRS)
388
389 dnl Generate list of files to be processed by xgettext which will
390 dnl be included in po/Makefile.
391 test -d po || mkdir po
392 if test "x$srcdir" != "x."; then
393 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
394 posrcprefix="$srcdir/"
395 else
396 posrcprefix="../$srcdir/"
397 fi
398 else
399 posrcprefix="../"
400 fi
401 rm -f po/POTFILES
402 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
403 < $srcdir/po/POTFILES.in > po/POTFILES
404 ])
405
406# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
407# -------------------------------
408# Define VARIABLE to the location where catalog files will
409# be installed by po/Makefile.
410glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
411[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
412glib_save_prefix="$prefix"
413glib_save_exec_prefix="$exec_prefix"
414glib_save_datarootdir="$datarootdir"
415test "x$prefix" = xNONE && prefix=$ac_default_prefix
416test "x$exec_prefix" = xNONE && exec_prefix=$prefix
417datarootdir=`eval echo "${datarootdir}"`
418if test "x$CATOBJEXT" = "x.mo" ; then
419 localedir=`eval echo "${libdir}/locale"`
420else
421 localedir=`eval echo "${datadir}/locale"`
422fi
423prefix="$glib_save_prefix"
424exec_prefix="$glib_save_exec_prefix"
425datarootdir="$glib_save_datarootdir"
426AC_DEFINE_UNQUOTED($1, "$localedir",
427 [Define the location where the catalogs will be installed])
428])
429
430dnl
431dnl Now the definitions that aclocal will find
432dnl
433ifdef(glib_configure_ac,[],[
434AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
435AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
436])dnl
437
438# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
439#
440# Create a temporary file with TEST-FILE as its contents and pass the
441# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
442# 0 and perform ACTION-IF-FAIL for any other exit status.
443AC_DEFUN([GLIB_RUN_PROG],
444[cat >conftest.foo <<_ACEOF
445$2
446_ACEOF
447if AC_RUN_LOG([$1 conftest.foo]); then
448 m4_ifval([$3], [$3], [:])
449m4_ifvaln([$4], [else $4])dnl
450echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
451sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
452fi])
453
454
455dnl GLIB_GSETTINGS
456dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
457dnl the schema should be compiled
458dnl
459
460AC_DEFUN([GLIB_GSETTINGS],
461[
462 m4_pattern_allow([AM_V_GEN])
463 AC_ARG_ENABLE(schemas-compile,
464 AC_HELP_STRING([--disable-schemas-compile],
465 [Disable regeneration of gschemas.compiled on install]),
466 [case ${enableval} in
467 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
468 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
469 *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
470 esac])
471 AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
472 PKG_PROG_PKG_CONFIG([0.16])
473 AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
474 if test x$cross_compiling != xyes; then
475 GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
476 else
477 AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
478 fi
479 AC_SUBST(GLIB_COMPILE_SCHEMAS)
480 if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
481 ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
482 else
483 ifelse([$1],,[:],[$1])
484 fi
485
486 GSETTINGS_RULES='
487.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
488
489mostlyclean-am: clean-gsettings-schemas
490
491gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
492
493%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
494 $(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 [$]@
495
496all-am: $(gsettings_SCHEMAS:.xml=.valid)
497uninstall-am: uninstall-gsettings-schemas
498install-data-am: install-gsettings-schemas
499
500.SECONDARY: $(gsettings_SCHEMAS)
501
502install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
503 @$(NORMAL_INSTALL)
504 if test -n "$^"; then \
505 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
506 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
507 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
508 fi
509
510uninstall-gsettings-schemas:
511 @$(NORMAL_UNINSTALL)
512 @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
513 files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
514 test -n "$$files" || exit 0; \
515 echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
516 cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
517 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
518
519clean-gsettings-schemas:
520 rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
521
522ifdef gsettings_ENUM_NAMESPACE
523$(gsettings__enum_file): $(gsettings_ENUM_FILES)
524 $(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 [$]@
525endif
526'
527 _GSETTINGS_SUBST(GSETTINGS_RULES)
528])
529
530dnl _GSETTINGS_SUBST(VARIABLE)
531dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
532AC_DEFUN([_GSETTINGS_SUBST],
533[
534AC_SUBST([$1])
535m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
536]
537)
538
539# nls.m4 serial 5 (gettext-0.18)
540dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
541dnl Inc.
542dnl This file is free software; the Free Software Foundation
543dnl gives unlimited permission to copy and/or distribute it,
544dnl with or without modifications, as long as this notice is preserved.
545dnl
546dnl This file can can be used in projects which are not available under
547dnl the GNU General Public License or the GNU Library General Public
548dnl License but which still want to provide support for the GNU gettext
549dnl functionality.
550dnl Please note that the actual code of the GNU gettext library is covered
551dnl by the GNU Library General Public License, and the rest of the GNU
552dnl gettext package package is covered by the GNU General Public License.
553dnl They are *not* in the public domain.
554
555dnl Authors:
556dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
557dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
558
559AC_PREREQ([2.50])
560
561AC_DEFUN([AM_NLS],
562[
563 AC_MSG_CHECKING([whether NLS is requested])
564 dnl Default is enabled NLS
565 AC_ARG_ENABLE([nls],
566 [ --disable-nls do not use Native Language Support],
567 USE_NLS=$enableval, USE_NLS=yes)
568 AC_MSG_RESULT([$USE_NLS])
569 AC_SUBST([USE_NLS])
570])
571
572# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
573# serial 1 (pkg-config-0.24)
574#
575# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
576#
577# This program is free software; you can redistribute it and/or modify
578# it under the terms of the GNU General Public License as published by
579# the Free Software Foundation; either version 2 of the License, or
580# (at your option) any later version.
581#
582# This program is distributed in the hope that it will be useful, but
583# WITHOUT ANY WARRANTY; without even the implied warranty of
584# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
585# General Public License for more details.
586#
587# You should have received a copy of the GNU General Public License
588# along with this program; if not, write to the Free Software
589# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
590#
591# As a special exception to the GNU General Public License, if you
592# distribute this file as part of a program that contains a
593# configuration script generated by Autoconf, you may include it under
594# the same distribution terms that you use for the rest of that program.
595
596# PKG_PROG_PKG_CONFIG([MIN-VERSION])
597# ----------------------------------
598AC_DEFUN([PKG_PROG_PKG_CONFIG],
599[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
600m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
601AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
602AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
603AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
604
605if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
606 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
607fi
608if test -n "$PKG_CONFIG"; then
609 _pkg_min_version=m4_default([$1], [0.9.0])
610 AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
611 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
612 AC_MSG_RESULT([yes])
613 else
614 AC_MSG_RESULT([no])
615 PKG_CONFIG=""
616 fi
617fi[]dnl
618])# PKG_PROG_PKG_CONFIG
619
620# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
621#
622# Check to see whether a particular set of modules exists. Similar
623# to PKG_CHECK_MODULES(), but does not set variables or print errors.
624#
625# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
626# only at the first occurence in configure.ac, so if the first place
627# it's called might be skipped (such as if it is within an "if", you
628# have to call PKG_CHECK_EXISTS manually
629# --------------------------------------------------------------
630AC_DEFUN([PKG_CHECK_EXISTS],
631[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
632if test -n "$PKG_CONFIG" && \
633 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
634 m4_default([$2], [:])
635m4_ifvaln([$3], [else
636 $3])dnl
637fi])
638
639# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
640# ---------------------------------------------
641m4_define([_PKG_CONFIG],
642[if test -n "$$1"; then
643 pkg_cv_[]$1="$$1"
644 elif test -n "$PKG_CONFIG"; then
645 PKG_CHECK_EXISTS([$3],
646 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
647 [pkg_failed=yes])
648 else
649 pkg_failed=untried
650fi[]dnl
651])# _PKG_CONFIG
652
653# _PKG_SHORT_ERRORS_SUPPORTED
654# -----------------------------
655AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
656[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
657if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
658 _pkg_short_errors_supported=yes
659else
660 _pkg_short_errors_supported=no
661fi[]dnl
662])# _PKG_SHORT_ERRORS_SUPPORTED
663
664
665# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
666# [ACTION-IF-NOT-FOUND])
667#
668#
669# Note that if there is a possibility the first call to
670# PKG_CHECK_MODULES might not happen, you should be sure to include an
671# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
672#
673#
674# --------------------------------------------------------------
675AC_DEFUN([PKG_CHECK_MODULES],
676[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
677AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
678AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
679
680pkg_failed=no
681AC_MSG_CHECKING([for $1])
682
683_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
684_PKG_CONFIG([$1][_LIBS], [libs], [$2])
685
686m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
687and $1[]_LIBS to avoid the need to call pkg-config.
688See the pkg-config man page for more details.])
689
690if test $pkg_failed = yes; then
691 AC_MSG_RESULT([no])
692 _PKG_SHORT_ERRORS_SUPPORTED
693 if test $_pkg_short_errors_supported = yes; then
694 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
695 else
696 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
697 fi
698 # Put the nasty error message in config.log where it belongs
699 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
700
701 m4_default([$4], [AC_MSG_ERROR(
702[Package requirements ($2) were not met:
703
704$$1_PKG_ERRORS
705
706Consider adjusting the PKG_CONFIG_PATH environment variable if you
707installed software in a non-standard prefix.
708
709_PKG_TEXT])
710 ])
711elif test $pkg_failed = untried; then
712 AC_MSG_RESULT([no])
713 m4_default([$4], [AC_MSG_FAILURE(
714[The pkg-config script could not be found or is too old. Make sure it
715is in your PATH or set the PKG_CONFIG environment variable to the full
716path to pkg-config.
717
718_PKG_TEXT
719
720To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
721 ])
722else
723 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
724 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
725 AC_MSG_RESULT([yes])
726 $3
727fi[]dnl
728])# PKG_CHECK_MODULES
729
22# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.730# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
23#731#
24# This file is free software; the Free Software Foundation732# This file is free software; the Free Software Foundation
@@ -1016,711 +1724,4 @@
1016AC_SUBST([am__untar])1724AC_SUBST([am__untar])
1017]) # _AM_PROG_TAR1725]) # _AM_PROG_TAR
10181726
1019# nls.m4 serial 3 (gettext-0.15)
1020dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
1021dnl This file is free software; the Free Software Foundation
1022dnl gives unlimited permission to copy and/or distribute it,
1023dnl with or without modifications, as long as this notice is preserved.
1024dnl
1025dnl This file can can be used in projects which are not available under
1026dnl the GNU General Public License or the GNU Library General Public
1027dnl License but which still want to provide support for the GNU gettext
1028dnl functionality.
1029dnl Please note that the actual code of the GNU gettext library is covered
1030dnl by the GNU Library General Public License, and the rest of the GNU
1031dnl gettext package package is covered by the GNU General Public License.
1032dnl They are *not* in the public domain.
1033
1034dnl Authors:
1035dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1036dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1037
1038AC_PREREQ(2.50)
1039
1040AC_DEFUN([AM_NLS],
1041[
1042 AC_MSG_CHECKING([whether NLS is requested])
1043 dnl Default is enabled NLS
1044 AC_ARG_ENABLE(nls,
1045 [ --disable-nls do not use Native Language Support],
1046 USE_NLS=$enableval, USE_NLS=yes)
1047 AC_MSG_RESULT($USE_NLS)
1048 AC_SUBST(USE_NLS)
1049])
1050
1051# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1052# serial 1 (pkg-config-0.24)
1053#
1054# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1055#
1056# This program is free software; you can redistribute it and/or modify
1057# it under the terms of the GNU General Public License as published by
1058# the Free Software Foundation; either version 2 of the License, or
1059# (at your option) any later version.
1060#
1061# This program is distributed in the hope that it will be useful, but
1062# WITHOUT ANY WARRANTY; without even the implied warranty of
1063# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1064# General Public License for more details.
1065#
1066# You should have received a copy of the GNU General Public License
1067# along with this program; if not, write to the Free Software
1068# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1069#
1070# As a special exception to the GNU General Public License, if you
1071# distribute this file as part of a program that contains a
1072# configuration script generated by Autoconf, you may include it under
1073# the same distribution terms that you use for the rest of that program.
1074
1075# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1076# ----------------------------------
1077AC_DEFUN([PKG_PROG_PKG_CONFIG],
1078[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1079m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
1080AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
1081AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
1082AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
1083
1084if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1085 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
1086fi
1087if test -n "$PKG_CONFIG"; then
1088 _pkg_min_version=m4_default([$1], [0.9.0])
1089 AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
1090 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
1091 AC_MSG_RESULT([yes])
1092 else
1093 AC_MSG_RESULT([no])
1094 PKG_CONFIG=""
1095 fi
1096fi[]dnl
1097])# PKG_PROG_PKG_CONFIG
1098
1099# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1100#
1101# Check to see whether a particular set of modules exists. Similar
1102# to PKG_CHECK_MODULES(), but does not set variables or print errors.
1103#
1104# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1105# only at the first occurence in configure.ac, so if the first place
1106# it's called might be skipped (such as if it is within an "if", you
1107# have to call PKG_CHECK_EXISTS manually
1108# --------------------------------------------------------------
1109AC_DEFUN([PKG_CHECK_EXISTS],
1110[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1111if test -n "$PKG_CONFIG" && \
1112 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
1113 m4_default([$2], [:])
1114m4_ifvaln([$3], [else
1115 $3])dnl
1116fi])
1117
1118# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1119# ---------------------------------------------
1120m4_define([_PKG_CONFIG],
1121[if test -n "$$1"; then
1122 pkg_cv_[]$1="$$1"
1123 elif test -n "$PKG_CONFIG"; then
1124 PKG_CHECK_EXISTS([$3],
1125 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
1126 [pkg_failed=yes])
1127 else
1128 pkg_failed=untried
1129fi[]dnl
1130])# _PKG_CONFIG
1131
1132# _PKG_SHORT_ERRORS_SUPPORTED
1133# -----------------------------
1134AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
1135[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1136if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1137 _pkg_short_errors_supported=yes
1138else
1139 _pkg_short_errors_supported=no
1140fi[]dnl
1141])# _PKG_SHORT_ERRORS_SUPPORTED
1142
1143
1144# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1145# [ACTION-IF-NOT-FOUND])
1146#
1147#
1148# Note that if there is a possibility the first call to
1149# PKG_CHECK_MODULES might not happen, you should be sure to include an
1150# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1151#
1152#
1153# --------------------------------------------------------------
1154AC_DEFUN([PKG_CHECK_MODULES],
1155[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1156AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
1157AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
1158
1159pkg_failed=no
1160AC_MSG_CHECKING([for $1])
1161
1162_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
1163_PKG_CONFIG([$1][_LIBS], [libs], [$2])
1164
1165m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
1166and $1[]_LIBS to avoid the need to call pkg-config.
1167See the pkg-config man page for more details.])
1168
1169if test $pkg_failed = yes; then
1170 AC_MSG_RESULT([no])
1171 _PKG_SHORT_ERRORS_SUPPORTED
1172 if test $_pkg_short_errors_supported = yes; then
1173 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
1174 else
1175 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
1176 fi
1177 # Put the nasty error message in config.log where it belongs
1178 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1179
1180 m4_default([$4], [AC_MSG_ERROR(
1181[Package requirements ($2) were not met:
1182
1183$$1_PKG_ERRORS
1184
1185Consider adjusting the PKG_CONFIG_PATH environment variable if you
1186installed software in a non-standard prefix.
1187
1188_PKG_TEXT])[]dnl
1189 ])
1190elif test $pkg_failed = untried; then
1191 AC_MSG_RESULT([no])
1192 m4_default([$4], [AC_MSG_FAILURE(
1193[The pkg-config script could not be found or is too old. Make sure it
1194is in your PATH or set the PKG_CONFIG environment variable to the full
1195path to pkg-config.
1196
1197_PKG_TEXT
1198
1199To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
1200 ])
1201else
1202 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1203 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
1204 AC_MSG_RESULT([yes])
1205 $3
1206fi[]dnl
1207])# PKG_CHECK_MODULES
1208
1209# Copyright (C) 1995-2002 Free Software Foundation, Inc.
1210# Copyright (C) 2001-2003,2004 Red Hat, Inc.
1211#
1212# This file is free software, distributed under the terms of the GNU
1213# General Public License. As a special exception to the GNU General
1214# Public License, this file may be distributed as part of a program
1215# that contains a configuration script generated by Autoconf, under
1216# the same distribution terms as the rest of that program.
1217#
1218# This file can be copied and used freely without restrictions. It can
1219# be used in projects which are not available under the GNU Public License
1220# but which still want to provide support for the GNU gettext functionality.
1221#
1222# Macro to add for using GNU gettext.
1223# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
1224#
1225# Modified to never use included libintl.
1226# Owen Taylor <otaylor@redhat.com>, 12/15/1998
1227#
1228# Major rework to remove unused code
1229# Owen Taylor <otaylor@redhat.com>, 12/11/2002
1230#
1231# Added better handling of ALL_LINGUAS from GNU gettext version
1232# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
1233#
1234# Modified to require ngettext
1235# Matthias Clasen <mclasen@redhat.com> 08/06/2004
1236#
1237# We need this here as well, since someone might use autoconf-2.5x
1238# to configure GLib then an older version to configure a package
1239# using AM_GLIB_GNU_GETTEXT
1240AC_PREREQ(2.53)
1241
1242dnl
1243dnl We go to great lengths to make sure that aclocal won't
1244dnl try to pull in the installed version of these macros
1245dnl when running aclocal in the glib directory.
1246dnl
1247m4_copy([AC_DEFUN],[glib_DEFUN])
1248m4_copy([AC_REQUIRE],[glib_REQUIRE])
1249dnl
1250dnl At the end, if we're not within glib, we'll define the public
1251dnl definitions in terms of our private definitions.
1252dnl
1253
1254# GLIB_LC_MESSAGES
1255#--------------------
1256glib_DEFUN([GLIB_LC_MESSAGES],
1257 [AC_CHECK_HEADERS([locale.h])
1258 if test $ac_cv_header_locale_h = yes; then
1259 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
1260 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
1261 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
1262 if test $am_cv_val_LC_MESSAGES = yes; then
1263 AC_DEFINE(HAVE_LC_MESSAGES, 1,
1264 [Define if your <locale.h> file defines LC_MESSAGES.])
1265 fi
1266 fi])
1267
1268# GLIB_PATH_PROG_WITH_TEST
1269#----------------------------
1270dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1271dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1272glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
1273[# Extract the first word of "$2", so it can be a program name with args.
1274set dummy $2; ac_word=[$]2
1275AC_MSG_CHECKING([for $ac_word])
1276AC_CACHE_VAL(ac_cv_path_$1,
1277[case "[$]$1" in
1278 /*)
1279 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1280 ;;
1281 *)
1282 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1283 for ac_dir in ifelse([$5], , $PATH, [$5]); do
1284 test -z "$ac_dir" && ac_dir=.
1285 if test -f $ac_dir/$ac_word; then
1286 if [$3]; then
1287 ac_cv_path_$1="$ac_dir/$ac_word"
1288 break
1289 fi
1290 fi
1291 done
1292 IFS="$ac_save_ifs"
1293dnl If no 4th arg is given, leave the cache variable unset,
1294dnl so AC_PATH_PROGS will keep looking.
1295ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1296])dnl
1297 ;;
1298esac])dnl
1299$1="$ac_cv_path_$1"
1300if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1301 AC_MSG_RESULT([$]$1)
1302else
1303 AC_MSG_RESULT(no)
1304fi
1305AC_SUBST($1)dnl
1306])
1307
1308# GLIB_WITH_NLS
1309#-----------------
1310glib_DEFUN([GLIB_WITH_NLS],
1311 dnl NLS is obligatory
1312 [USE_NLS=yes
1313 AC_SUBST(USE_NLS)
1314
1315 gt_cv_have_gettext=no
1316
1317 CATOBJEXT=NONE
1318 XGETTEXT=:
1319 INTLLIBS=
1320
1321 AC_CHECK_HEADER(libintl.h,
1322 [gt_cv_func_dgettext_libintl="no"
1323 libintl_extra_libs=""
1324
1325 #
1326 # First check in libc
1327 #
1328 AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
1329 [AC_TRY_LINK([
1330#include <libintl.h>
1331],
1332 [return !ngettext ("","", 1)],
1333 gt_cv_func_ngettext_libc=yes,
1334 gt_cv_func_ngettext_libc=no)
1335 ])
1336
1337 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1338 AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
1339 [AC_TRY_LINK([
1340#include <libintl.h>
1341],
1342 [return !dgettext ("","")],
1343 gt_cv_func_dgettext_libc=yes,
1344 gt_cv_func_dgettext_libc=no)
1345 ])
1346 fi
1347
1348 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1349 AC_CHECK_FUNCS(bind_textdomain_codeset)
1350 fi
1351
1352 #
1353 # If we don't have everything we want, check in libintl
1354 #
1355 if test "$gt_cv_func_dgettext_libc" != "yes" \
1356 || test "$gt_cv_func_ngettext_libc" != "yes" \
1357 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1358
1359 AC_CHECK_LIB(intl, bindtextdomain,
1360 [AC_CHECK_LIB(intl, ngettext,
1361 [AC_CHECK_LIB(intl, dgettext,
1362 gt_cv_func_dgettext_libintl=yes)])])
1363
1364 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1365 AC_MSG_CHECKING([if -liconv is needed to use gettext])
1366 AC_MSG_RESULT([])
1367 AC_CHECK_LIB(intl, ngettext,
1368 [AC_CHECK_LIB(intl, dcgettext,
1369 [gt_cv_func_dgettext_libintl=yes
1370 libintl_extra_libs=-liconv],
1371 :,-liconv)],
1372 :,-liconv)
1373 fi
1374
1375 #
1376 # If we found libintl, then check in it for bind_textdomain_codeset();
1377 # we'll prefer libc if neither have bind_textdomain_codeset(),
1378 # and both have dgettext and ngettext
1379 #
1380 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1381 glib_save_LIBS="$LIBS"
1382 LIBS="$LIBS -lintl $libintl_extra_libs"
1383 unset ac_cv_func_bind_textdomain_codeset
1384 AC_CHECK_FUNCS(bind_textdomain_codeset)
1385 LIBS="$glib_save_LIBS"
1386
1387 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1388 gt_cv_func_dgettext_libc=no
1389 else
1390 if test "$gt_cv_func_dgettext_libc" = "yes" \
1391 && test "$gt_cv_func_ngettext_libc" = "yes"; then
1392 gt_cv_func_dgettext_libintl=no
1393 fi
1394 fi
1395 fi
1396 fi
1397
1398 if test "$gt_cv_func_dgettext_libc" = "yes" \
1399 || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1400 gt_cv_have_gettext=yes
1401 fi
1402
1403 if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1404 INTLLIBS="-lintl $libintl_extra_libs"
1405 fi
1406
1407 if test "$gt_cv_have_gettext" = "yes"; then
1408 AC_DEFINE(HAVE_GETTEXT,1,
1409 [Define if the GNU gettext() function is already present or preinstalled.])
1410 GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1411 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1412 if test "$MSGFMT" != "no"; then
1413 glib_save_LIBS="$LIBS"
1414 LIBS="$LIBS $INTLLIBS"
1415 AC_CHECK_FUNCS(dcgettext)
1416 MSGFMT_OPTS=
1417 AC_MSG_CHECKING([if msgfmt accepts -c])
1418 GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1419msgid ""
1420msgstr ""
1421"Content-Type: text/plain; charset=UTF-8\n"
1422"Project-Id-Version: test 1.0\n"
1423"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1424"Last-Translator: test <foo@bar.xx>\n"
1425"Language-Team: C <LL@li.org>\n"
1426"MIME-Version: 1.0\n"
1427"Content-Transfer-Encoding: 8bit\n"
1428], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1429 AC_SUBST(MSGFMT_OPTS)
1430 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1431 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1432 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1433 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1434 return _nl_msg_cat_cntr],
1435 [CATOBJEXT=.gmo
1436 DATADIRNAME=share],
1437 [case $host in
1438 *-*-solaris*)
1439 dnl On Solaris, if bind_textdomain_codeset is in libc,
1440 dnl GNU format message catalog is always supported,
1441 dnl since both are added to the libc all together.
1442 dnl Hence, we'd like to go with DATADIRNAME=share and
1443 dnl and CATOBJEXT=.gmo in this case.
1444 AC_CHECK_FUNC(bind_textdomain_codeset,
1445 [CATOBJEXT=.gmo
1446 DATADIRNAME=share],
1447 [CATOBJEXT=.mo
1448 DATADIRNAME=lib])
1449 ;;
1450 *)
1451 CATOBJEXT=.mo
1452 DATADIRNAME=lib
1453 ;;
1454 esac])
1455 LIBS="$glib_save_LIBS"
1456 INSTOBJEXT=.mo
1457 else
1458 gt_cv_have_gettext=no
1459 fi
1460 fi
1461 ])
1462
1463 if test "$gt_cv_have_gettext" = "yes" ; then
1464 AC_DEFINE(ENABLE_NLS, 1,
1465 [always defined to indicate that i18n is enabled])
1466 fi
1467
1468 dnl Test whether we really found GNU xgettext.
1469 if test "$XGETTEXT" != ":"; then
1470 dnl If it is not GNU xgettext we define it as : so that the
1471 dnl Makefiles still can work.
1472 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1473 : ;
1474 else
1475 AC_MSG_RESULT(
1476 [found xgettext program is not GNU xgettext; ignore it])
1477 XGETTEXT=":"
1478 fi
1479 fi
1480
1481 # We need to process the po/ directory.
1482 POSUB=po
1483
1484 AC_OUTPUT_COMMANDS(
1485 [case "$CONFIG_FILES" in *po/Makefile.in*)
1486 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
1487 esac])
1488
1489 dnl These rules are solely for the distribution goal. While doing this
1490 dnl we only have to keep exactly one list of the available catalogs
1491 dnl in configure.ac.
1492 for lang in $ALL_LINGUAS; do
1493 GMOFILES="$GMOFILES $lang.gmo"
1494 POFILES="$POFILES $lang.po"
1495 done
1496
1497 dnl Make all variables we use known to autoconf.
1498 AC_SUBST(CATALOGS)
1499 AC_SUBST(CATOBJEXT)
1500 AC_SUBST(DATADIRNAME)
1501 AC_SUBST(GMOFILES)
1502 AC_SUBST(INSTOBJEXT)
1503 AC_SUBST(INTLLIBS)
1504 AC_SUBST(PO_IN_DATADIR_TRUE)
1505 AC_SUBST(PO_IN_DATADIR_FALSE)
1506 AC_SUBST(POFILES)
1507 AC_SUBST(POSUB)
1508 ])
1509
1510# AM_GLIB_GNU_GETTEXT
1511# -------------------
1512# Do checks necessary for use of gettext. If a suitable implementation
1513# of gettext is found in either in libintl or in the C library,
1514# it will set INTLLIBS to the libraries needed for use of gettext
1515# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
1516# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
1517# on various variables needed by the Makefile.in.in installed by
1518# glib-gettextize.
1519dnl
1520glib_DEFUN([GLIB_GNU_GETTEXT],
1521 [AC_REQUIRE([AC_PROG_CC])dnl
1522 AC_REQUIRE([AC_HEADER_STDC])dnl
1523
1524 GLIB_LC_MESSAGES
1525 GLIB_WITH_NLS
1526
1527 if test "$gt_cv_have_gettext" = "yes"; then
1528 if test "x$ALL_LINGUAS" = "x"; then
1529 LINGUAS=
1530 else
1531 AC_MSG_CHECKING(for catalogs to be installed)
1532 NEW_LINGUAS=
1533 for presentlang in $ALL_LINGUAS; do
1534 useit=no
1535 if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
1536 desiredlanguages="$LINGUAS"
1537 else
1538 desiredlanguages="$ALL_LINGUAS"
1539 fi
1540 for desiredlang in $desiredlanguages; do
1541 # Use the presentlang catalog if desiredlang is
1542 # a. equal to presentlang, or
1543 # b. a variant of presentlang (because in this case,
1544 # presentlang can be used as a fallback for messages
1545 # which are not translated in the desiredlang catalog).
1546 case "$desiredlang" in
1547 "$presentlang"*) useit=yes;;
1548 esac
1549 done
1550 if test $useit = yes; then
1551 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
1552 fi
1553 done
1554 LINGUAS=$NEW_LINGUAS
1555 AC_MSG_RESULT($LINGUAS)
1556 fi
1557
1558 dnl Construct list of names of catalog files to be constructed.
1559 if test -n "$LINGUAS"; then
1560 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1561 fi
1562 fi
1563
1564 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1565 dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1566 dnl Try to locate is.
1567 MKINSTALLDIRS=
1568 if test -n "$ac_aux_dir"; then
1569 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1570 fi
1571 if test -z "$MKINSTALLDIRS"; then
1572 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1573 fi
1574 AC_SUBST(MKINSTALLDIRS)
1575
1576 dnl Generate list of files to be processed by xgettext which will
1577 dnl be included in po/Makefile.
1578 test -d po || mkdir po
1579 if test "x$srcdir" != "x."; then
1580 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1581 posrcprefix="$srcdir/"
1582 else
1583 posrcprefix="../$srcdir/"
1584 fi
1585 else
1586 posrcprefix="../"
1587 fi
1588 rm -f po/POTFILES
1589 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1590 < $srcdir/po/POTFILES.in > po/POTFILES
1591 ])
1592
1593# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
1594# -------------------------------
1595# Define VARIABLE to the location where catalog files will
1596# be installed by po/Makefile.
1597glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
1598[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1599glib_save_prefix="$prefix"
1600glib_save_exec_prefix="$exec_prefix"
1601glib_save_datarootdir="$datarootdir"
1602test "x$prefix" = xNONE && prefix=$ac_default_prefix
1603test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1604datarootdir=`eval echo "${datarootdir}"`
1605if test "x$CATOBJEXT" = "x.mo" ; then
1606 localedir=`eval echo "${libdir}/locale"`
1607else
1608 localedir=`eval echo "${datadir}/locale"`
1609fi
1610prefix="$glib_save_prefix"
1611exec_prefix="$glib_save_exec_prefix"
1612datarootdir="$glib_save_datarootdir"
1613AC_DEFINE_UNQUOTED($1, "$localedir",
1614 [Define the location where the catalogs will be installed])
1615])
1616
1617dnl
1618dnl Now the definitions that aclocal will find
1619dnl
1620ifdef(glib_configure_ac,[],[
1621AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
1622AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1623])dnl
1624
1625# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1626#
1627# Create a temporary file with TEST-FILE as its contents and pass the
1628# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1629# 0 and perform ACTION-IF-FAIL for any other exit status.
1630AC_DEFUN([GLIB_RUN_PROG],
1631[cat >conftest.foo <<_ACEOF
1632$2
1633_ACEOF
1634if AC_RUN_LOG([$1 conftest.foo]); then
1635 m4_ifval([$3], [$3], [:])
1636m4_ifvaln([$4], [else $4])dnl
1637echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1638sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1639fi])
1640
1641
1642dnl GLIB_GSETTINGS
1643dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
1644dnl the schema should be compiled
1645dnl
1646
1647AC_DEFUN([GLIB_GSETTINGS],
1648[
1649 m4_pattern_allow([AM_V_GEN])
1650 AC_ARG_ENABLE(schemas-compile,
1651 AC_HELP_STRING([--disable-schemas-compile],
1652 [Disable regeneration of gschemas.compiled on install]),
1653 [case ${enableval} in
1654 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
1655 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
1656 *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
1657 esac])
1658 AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
1659 PKG_PROG_PKG_CONFIG([0.16])
1660 AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
1661 if test x$cross_compiling != xyes; then
1662 GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
1663 else
1664 AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
1665 fi
1666 AC_SUBST(GLIB_COMPILE_SCHEMAS)
1667 if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
1668 ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
1669 else
1670 ifelse([$1],,[:],[$1])
1671 fi
1672
1673 GSETTINGS_RULES='
1674.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
1675
1676mostlyclean-am: clean-gsettings-schemas
1677
1678gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
1679
1680%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
1681 $(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 [$]@
1682
1683all-am: $(gsettings_SCHEMAS:.xml=.valid)
1684uninstall-am: uninstall-gsettings-schemas
1685install-data-am: install-gsettings-schemas
1686
1687.SECONDARY: $(gsettings_SCHEMAS)
1688
1689install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
1690 @$(NORMAL_INSTALL)
1691 if test -n "$^"; then \
1692 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
1693 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
1694 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
1695 fi
1696
1697uninstall-gsettings-schemas:
1698 @$(NORMAL_UNINSTALL)
1699 @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
1700 files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
1701 test -n "$$files" || exit 0; \
1702 echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
1703 cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
1704 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
1705
1706clean-gsettings-schemas:
1707 rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
1708
1709ifdef gsettings_ENUM_NAMESPACE
1710$(gsettings__enum_file): $(gsettings_ENUM_FILES)
1711 $(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 [$]@
1712endif
1713'
1714 _GSETTINGS_SUBST(GSETTINGS_RULES)
1715])
1716
1717dnl _GSETTINGS_SUBST(VARIABLE)
1718dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1719AC_DEFUN([_GSETTINGS_SUBST],
1720[
1721AC_SUBST([$1])
1722m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1723]
1724)
1725
1726m4_include([m4/intltool.m4])1727m4_include([m4/intltool.m4])
17271728
=== modified file 'configure'
--- configure 2010-12-23 12:40:25 +0000
+++ configure 2011-01-10 17:05:40 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for gsettings-desktop-schemas 0.1.3.3# Generated by GNU Autoconf 2.68 for gsettings-desktop-schemas 0.1.4.
4#4#
5# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas>.5# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas>.
6#6#
@@ -91,6 +91,7 @@
91IFS=" "" $as_nl"91IFS=" "" $as_nl"
9292
93# Find who we are. Look in the path if we contain no directory separator.93# Find who we are. Look in the path if we contain no directory separator.
94as_myself=
94case $0 in #((95case $0 in #((
95 *[\\/]* ) as_myself=$0 ;;96 *[\\/]* ) as_myself=$0 ;;
96 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR97 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
216 # We cannot yet assume a decent shell, so we have to provide a217 # We cannot yet assume a decent shell, so we have to provide a
217 # neutralization value for shells without unset; and this also218 # neutralization value for shells without unset; and this also
218 # works around shells that cannot unset nonexistent variables.219 # works around shells that cannot unset nonexistent variables.
220 # Preserve -v and -x to the replacement shell.
219 BASH_ENV=/dev/null221 BASH_ENV=/dev/null
220 ENV=/dev/null222 ENV=/dev/null
221 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV223 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
222 export CONFIG_SHELL224 export CONFIG_SHELL
223 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}225 case $- in # ((((
226 *v*x* | *x*v* ) as_opts=-vx ;;
227 *v* ) as_opts=-v ;;
228 *x* ) as_opts=-x ;;
229 * ) as_opts= ;;
230 esac
231 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
224fi232fi
225233
226 if test x$as_have_required = xno; then :234 if test x$as_have_required = xno; then :
@@ -553,8 +561,8 @@
553# Identity of this package.561# Identity of this package.
554PACKAGE_NAME='gsettings-desktop-schemas'562PACKAGE_NAME='gsettings-desktop-schemas'
555PACKAGE_TARNAME='gsettings-desktop-schemas'563PACKAGE_TARNAME='gsettings-desktop-schemas'
556PACKAGE_VERSION='0.1.3'564PACKAGE_VERSION='0.1.4'
557PACKAGE_STRING='gsettings-desktop-schemas 0.1.3'565PACKAGE_STRING='gsettings-desktop-schemas 0.1.4'
558PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'566PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'
559PACKAGE_URL=''567PACKAGE_URL=''
560568
@@ -755,7 +763,8 @@
755LDFLAGS763LDFLAGS
756LIBS764LIBS
757CPPFLAGS765CPPFLAGS
758CPP'766CPP
767CPPFLAGS'
759768
760769
761# Initialize some variables set by options.770# Initialize some variables set by options.
@@ -1160,7 +1169,7 @@
1160 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&21169 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1161 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&1170 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1162 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&21171 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1163 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}1172 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1164 ;;1173 ;;
11651174
1166 esac1175 esac
@@ -1298,7 +1307,7 @@
1298 # Omit some internal or obsolete options to make the list less imposing.1307 # Omit some internal or obsolete options to make the list less imposing.
1299 # This message is too long to be a string in the A/UX 3.1 sh.1308 # This message is too long to be a string in the A/UX 3.1 sh.
1300 cat <<_ACEOF1309 cat <<_ACEOF
1301\`configure' configures gsettings-desktop-schemas 0.1.3 to adapt to many kinds of systems.1310\`configure' configures gsettings-desktop-schemas 0.1.4 to adapt to many kinds of systems.
13021311
1303Usage: $0 [OPTION]... [VAR=VALUE]...1312Usage: $0 [OPTION]... [VAR=VALUE]...
13041313
@@ -1365,7 +1374,7 @@
13651374
1366if test -n "$ac_init_help"; then1375if test -n "$ac_init_help"; then
1367 case $ac_init_help in1376 case $ac_init_help in
1368 short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.3:";;1377 short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.4:";;
1369 esac1378 esac
1370 cat <<\_ACEOF1379 cat <<\_ACEOF
13711380
@@ -1464,8 +1473,8 @@
1464test -n "$ac_init_help" && exit $ac_status1473test -n "$ac_init_help" && exit $ac_status
1465if $ac_init_version; then1474if $ac_init_version; then
1466 cat <<\_ACEOF1475 cat <<\_ACEOF
1467gsettings-desktop-schemas configure 0.1.31476gsettings-desktop-schemas configure 0.1.4
1468generated by GNU Autoconf 2.671477generated by GNU Autoconf 2.68
14691478
1470Copyright (C) 2010 Free Software Foundation, Inc.1479Copyright (C) 2010 Free Software Foundation, Inc.
1471This configure script is free software; the Free Software Foundation1480This configure script is free software; the Free Software Foundation
@@ -1511,7 +1520,7 @@
15111520
1512 ac_retval=11521 ac_retval=1
1513fi1522fi
1514 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1523 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1515 as_fn_set_status $ac_retval1524 as_fn_set_status $ac_retval
15161525
1517} # ac_fn_c_try_compile1526} # ac_fn_c_try_compile
@@ -1548,7 +1557,7 @@
15481557
1549 ac_retval=11558 ac_retval=1
1550fi1559fi
1551 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1560 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1552 as_fn_set_status $ac_retval1561 as_fn_set_status $ac_retval
15531562
1554} # ac_fn_c_try_cpp1563} # ac_fn_c_try_cpp
@@ -1590,7 +1599,7 @@
1590 ac_retval=$ac_status1599 ac_retval=$ac_status
1591fi1600fi
1592 rm -rf conftest.dSYM conftest_ipa8_conftest.oo1601 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1593 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1602 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1594 as_fn_set_status $ac_retval1603 as_fn_set_status $ac_retval
15951604
1596} # ac_fn_c_try_run1605} # ac_fn_c_try_run
@@ -1603,10 +1612,10 @@
1603ac_fn_c_check_header_mongrel ()1612ac_fn_c_check_header_mongrel ()
1604{1613{
1605 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1614 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1606 if eval "test \"\${$3+set}\"" = set; then :1615 if eval \${$3+:} false; then :
1607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51616 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1608$as_echo_n "checking for $2... " >&6; }1617$as_echo_n "checking for $2... " >&6; }
1609if eval "test \"\${$3+set}\"" = set; then :1618if eval \${$3+:} false; then :
1610 $as_echo_n "(cached) " >&61619 $as_echo_n "(cached) " >&6
1611fi1620fi
1612eval ac_res=\$$31621eval ac_res=\$$3
@@ -1667,13 +1676,13 @@
1667$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}1676$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1668( $as_echo "## ---------------------------------------------------------------------------------------- ##1677( $as_echo "## ---------------------------------------------------------------------------------------- ##
1669## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas ##1678## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas ##
1670## ---------------------------------------------------------------------------------------- ##"[]1679## ---------------------------------------------------------------------------------------- ##"
1671 ) | sed "s/^/$as_me: WARNING: /" >&21680 ) | sed "s/^/$as_me: WARNING: /" >&2
1672 ;;1681 ;;
1673esac1682esac
1674 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51683 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1675$as_echo_n "checking for $2... " >&6; }1684$as_echo_n "checking for $2... " >&6; }
1676if eval "test \"\${$3+set}\"" = set; then :1685if eval \${$3+:} false; then :
1677 $as_echo_n "(cached) " >&61686 $as_echo_n "(cached) " >&6
1678else1687else
1679 eval "$3=\$ac_header_compiler"1688 eval "$3=\$ac_header_compiler"
@@ -1682,7 +1691,7 @@
1682 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&51691 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1683$as_echo "$ac_res" >&6; }1692$as_echo "$ac_res" >&6; }
1684fi1693fi
1685 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1694 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
16861695
1687} # ac_fn_c_check_header_mongrel1696} # ac_fn_c_check_header_mongrel
16881697
@@ -1695,7 +1704,7 @@
1695 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1704 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1696 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1697$as_echo_n "checking for $2... " >&6; }1706$as_echo_n "checking for $2... " >&6; }
1698if eval "test \"\${$3+set}\"" = set; then :1707if eval \${$3+:} false; then :
1699 $as_echo_n "(cached) " >&61708 $as_echo_n "(cached) " >&6
1700else1709else
1701 cat confdefs.h - <<_ACEOF >conftest.$ac_ext1710 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1713,7 +1722,7 @@
1713eval ac_res=\$$31722eval ac_res=\$$3
1714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&51723 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1715$as_echo "$ac_res" >&6; }1724$as_echo "$ac_res" >&6; }
1716 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1725 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
17171726
1718} # ac_fn_c_check_header_compile1727} # ac_fn_c_check_header_compile
17191728
@@ -1758,7 +1767,7 @@
1758 # interfere with the next link command; also delete a directory that is1767 # interfere with the next link command; also delete a directory that is
1759 # left behind by Apple's compiler. We do this before executing the actions.1768 # left behind by Apple's compiler. We do this before executing the actions.
1760 rm -rf conftest.dSYM conftest_ipa8_conftest.oo1769 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1761 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1770 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1762 as_fn_set_status $ac_retval1771 as_fn_set_status $ac_retval
17631772
1764} # ac_fn_c_try_link1773} # ac_fn_c_try_link
@@ -1771,7 +1780,7 @@
1771 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1780 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51781 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1773$as_echo_n "checking for $2... " >&6; }1782$as_echo_n "checking for $2... " >&6; }
1774if eval "test \"\${$3+set}\"" = set; then :1783if eval \${$3+:} false; then :
1775 $as_echo_n "(cached) " >&61784 $as_echo_n "(cached) " >&6
1776else1785else
1777 cat confdefs.h - <<_ACEOF >conftest.$ac_ext1786 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1826,15 +1835,15 @@
1826eval ac_res=\$$31835eval ac_res=\$$3
1827 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&51836 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1828$as_echo "$ac_res" >&6; }1837$as_echo "$ac_res" >&6; }
1829 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1838 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
18301839
1831} # ac_fn_c_check_func1840} # ac_fn_c_check_func
1832cat >config.log <<_ACEOF1841cat >config.log <<_ACEOF
1833This file contains any messages produced by compilers while1842This file contains any messages produced by compilers while
1834running configure, to aid debugging if configure makes a mistake.1843running configure, to aid debugging if configure makes a mistake.
18351844
1836It was created by gsettings-desktop-schemas $as_me 0.1.3, which was1845It was created by gsettings-desktop-schemas $as_me 0.1.4, which was
1837generated by GNU Autoconf 2.67. Invocation command line was1846generated by GNU Autoconf 2.68. Invocation command line was
18381847
1839 $ $0 $@1848 $ $0 $@
18401849
@@ -1946,7 +1955,7 @@
19461955
1947 $as_echo "## ---------------- ##1956 $as_echo "## ---------------- ##
1948## Cache variables. ##1957## Cache variables. ##
1949## ---------------- ##"[]1958## ---------------- ##"
1950 echo1959 echo
1951 # The following way of writing the cache mishandles newlines in values,1960 # The following way of writing the cache mishandles newlines in values,
1952(1961(
@@ -1982,7 +1991,7 @@
19821991
1983 $as_echo "## ----------------- ##1992 $as_echo "## ----------------- ##
1984## Output variables. ##1993## Output variables. ##
1985## ----------------- ##"[]1994## ----------------- ##"
1986 echo1995 echo
1987 for ac_var in $ac_subst_vars1996 for ac_var in $ac_subst_vars
1988 do1997 do
@@ -1997,7 +2006,7 @@
1997 if test -n "$ac_subst_files"; then2006 if test -n "$ac_subst_files"; then
1998 $as_echo "## ------------------- ##2007 $as_echo "## ------------------- ##
1999## File substitutions. ##2008## File substitutions. ##
2000## ------------------- ##"[]2009## ------------------- ##"
2001 echo2010 echo
2002 for ac_var in $ac_subst_files2011 for ac_var in $ac_subst_files
2003 do2012 do
@@ -2013,7 +2022,7 @@
2013 if test -s confdefs.h; then2022 if test -s confdefs.h; then
2014 $as_echo "## ----------- ##2023 $as_echo "## ----------- ##
2015## confdefs.h. ##2024## confdefs.h. ##
2016## ----------- ##"[]2025## ----------- ##"
2017 echo2026 echo
2018 cat confdefs.h2027 cat confdefs.h
2019 echo2028 echo
@@ -2230,7 +2239,7 @@
2230{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&52239{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2231$as_echo_n "checking for a BSD-compatible install... " >&6; }2240$as_echo_n "checking for a BSD-compatible install... " >&6; }
2232if test -z "$INSTALL"; then2241if test -z "$INSTALL"; then
2233if test "${ac_cv_path_install+set}" = set; then :2242if ${ac_cv_path_install+:} false; then :
2234 $as_echo_n "(cached) " >&62243 $as_echo_n "(cached) " >&6
2235else2244else
2236 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2245 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2407,7 +2416,7 @@
2407set dummy ${ac_tool_prefix}strip; ac_word=$22416set dummy ${ac_tool_prefix}strip; ac_word=$2
2408{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52417{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2409$as_echo_n "checking for $ac_word... " >&6; }2418$as_echo_n "checking for $ac_word... " >&6; }
2410if test "${ac_cv_prog_STRIP+set}" = set; then :2419if ${ac_cv_prog_STRIP+:} false; then :
2411 $as_echo_n "(cached) " >&62420 $as_echo_n "(cached) " >&6
2412else2421else
2413 if test -n "$STRIP"; then2422 if test -n "$STRIP"; then
@@ -2447,7 +2456,7 @@
2447set dummy strip; ac_word=$22456set dummy strip; ac_word=$2
2448{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52457{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2449$as_echo_n "checking for $ac_word... " >&6; }2458$as_echo_n "checking for $ac_word... " >&6; }
2450if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :2459if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
2451 $as_echo_n "(cached) " >&62460 $as_echo_n "(cached) " >&6
2452else2461else
2453 if test -n "$ac_ct_STRIP"; then2462 if test -n "$ac_ct_STRIP"; then
@@ -2500,7 +2509,7 @@
2500{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&52509{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2501$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }2510$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2502if test -z "$MKDIR_P"; then2511if test -z "$MKDIR_P"; then
2503 if test "${ac_cv_path_mkdir+set}" = set; then :2512 if ${ac_cv_path_mkdir+:} false; then :
2504 $as_echo_n "(cached) " >&62513 $as_echo_n "(cached) " >&6
2505else2514else
2506 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2515 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2551,7 +2560,7 @@
2551set dummy $ac_prog; ac_word=$22560set dummy $ac_prog; ac_word=$2
2552{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52561{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2553$as_echo_n "checking for $ac_word... " >&6; }2562$as_echo_n "checking for $ac_word... " >&6; }
2554if test "${ac_cv_prog_AWK+set}" = set; then :2563if ${ac_cv_prog_AWK+:} false; then :
2555 $as_echo_n "(cached) " >&62564 $as_echo_n "(cached) " >&6
2556else2565else
2557 if test -n "$AWK"; then2566 if test -n "$AWK"; then
@@ -2591,7 +2600,7 @@
2591$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }2600$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2592set x ${MAKE-make}2601set x ${MAKE-make}
2593ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`2602ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2594if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :2603if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
2595 $as_echo_n "(cached) " >&62604 $as_echo_n "(cached) " >&6
2596else2605else
2597 cat >conftest.make <<\_ACEOF2606 cat >conftest.make <<\_ACEOF
@@ -2649,7 +2658,7 @@
26492658
2650# Define the identity of the package.2659# Define the identity of the package.
2651 PACKAGE='gsettings-desktop-schemas'2660 PACKAGE='gsettings-desktop-schemas'
2652 VERSION='0.1.3'2661 VERSION='0.1.4'
26532662
26542663
2655cat >>confdefs.h <<_ACEOF2664cat >>confdefs.h <<_ACEOF
@@ -2732,7 +2741,7 @@
27322741
2733{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&52742{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
2734$as_echo_n "checking for a sed that does not truncate output... " >&6; }2743$as_echo_n "checking for a sed that does not truncate output... " >&6; }
2735if test "${ac_cv_path_SED+set}" = set; then :2744if ${ac_cv_path_SED+:} false; then :
2736 $as_echo_n "(cached) " >&62745 $as_echo_n "(cached) " >&6
2737else2746else
2738 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/2747 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -2824,7 +2833,7 @@
2824set dummy ${ac_tool_prefix}pkg-config; ac_word=$22833set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
2825{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52834{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2826$as_echo_n "checking for $ac_word... " >&6; }2835$as_echo_n "checking for $ac_word... " >&6; }
2827if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :2836if ${ac_cv_path_PKG_CONFIG+:} false; then :
2828 $as_echo_n "(cached) " >&62837 $as_echo_n "(cached) " >&6
2829else2838else
2830 case $PKG_CONFIG in2839 case $PKG_CONFIG in
@@ -2867,7 +2876,7 @@
2867set dummy pkg-config; ac_word=$22876set dummy pkg-config; ac_word=$2
2868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52877{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2869$as_echo_n "checking for $ac_word... " >&6; }2878$as_echo_n "checking for $ac_word... " >&6; }
2870if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :2879if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
2871 $as_echo_n "(cached) " >&62880 $as_echo_n "(cached) " >&6
2872else2881else
2873 case $ac_pt_PKG_CONFIG in2882 case $ac_pt_PKG_CONFIG in
@@ -2940,7 +2949,7 @@
2940set dummy glib-compile-schemas; ac_word=$22949set dummy glib-compile-schemas; ac_word=$2
2941{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52950{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2942$as_echo_n "checking for $ac_word... " >&6; }2951$as_echo_n "checking for $ac_word... " >&6; }
2943if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :2952if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
2944 $as_echo_n "(cached) " >&62953 $as_echo_n "(cached) " >&6
2945else2954else
2946 case $GLIB_COMPILE_SCHEMAS in2955 case $GLIB_COMPILE_SCHEMAS in
@@ -3106,7 +3115,7 @@
3106set dummy ${ac_tool_prefix}gcc; ac_word=$23115set dummy ${ac_tool_prefix}gcc; ac_word=$2
3107{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53116{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3108$as_echo_n "checking for $ac_word... " >&6; }3117$as_echo_n "checking for $ac_word... " >&6; }
3109if test "${ac_cv_prog_CC+set}" = set; then :3118if ${ac_cv_prog_CC+:} false; then :
3110 $as_echo_n "(cached) " >&63119 $as_echo_n "(cached) " >&6
3111else3120else
3112 if test -n "$CC"; then3121 if test -n "$CC"; then
@@ -3146,7 +3155,7 @@
3146set dummy gcc; ac_word=$23155set dummy gcc; ac_word=$2
3147{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53156{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3148$as_echo_n "checking for $ac_word... " >&6; }3157$as_echo_n "checking for $ac_word... " >&6; }
3149if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :3158if ${ac_cv_prog_ac_ct_CC+:} false; then :
3150 $as_echo_n "(cached) " >&63159 $as_echo_n "(cached) " >&6
3151else3160else
3152 if test -n "$ac_ct_CC"; then3161 if test -n "$ac_ct_CC"; then
@@ -3199,7 +3208,7 @@
3199set dummy ${ac_tool_prefix}cc; ac_word=$23208set dummy ${ac_tool_prefix}cc; ac_word=$2
3200{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53209{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3201$as_echo_n "checking for $ac_word... " >&6; }3210$as_echo_n "checking for $ac_word... " >&6; }
3202if test "${ac_cv_prog_CC+set}" = set; then :3211if ${ac_cv_prog_CC+:} false; then :
3203 $as_echo_n "(cached) " >&63212 $as_echo_n "(cached) " >&6
3204else3213else
3205 if test -n "$CC"; then3214 if test -n "$CC"; then
@@ -3239,7 +3248,7 @@
3239set dummy cc; ac_word=$23248set dummy cc; ac_word=$2
3240{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53249{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3241$as_echo_n "checking for $ac_word... " >&6; }3250$as_echo_n "checking for $ac_word... " >&6; }
3242if test "${ac_cv_prog_CC+set}" = set; then :3251if ${ac_cv_prog_CC+:} false; then :
3243 $as_echo_n "(cached) " >&63252 $as_echo_n "(cached) " >&6
3244else3253else
3245 if test -n "$CC"; then3254 if test -n "$CC"; then
@@ -3298,7 +3307,7 @@
3298set dummy $ac_tool_prefix$ac_prog; ac_word=$23307set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3299{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53308{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3300$as_echo_n "checking for $ac_word... " >&6; }3309$as_echo_n "checking for $ac_word... " >&6; }
3301if test "${ac_cv_prog_CC+set}" = set; then :3310if ${ac_cv_prog_CC+:} false; then :
3302 $as_echo_n "(cached) " >&63311 $as_echo_n "(cached) " >&6
3303else3312else
3304 if test -n "$CC"; then3313 if test -n "$CC"; then
@@ -3342,7 +3351,7 @@
3342set dummy $ac_prog; ac_word=$23351set dummy $ac_prog; ac_word=$2
3343{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53352{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3344$as_echo_n "checking for $ac_word... " >&6; }3353$as_echo_n "checking for $ac_word... " >&6; }
3345if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :3354if ${ac_cv_prog_ac_ct_CC+:} false; then :
3346 $as_echo_n "(cached) " >&63355 $as_echo_n "(cached) " >&6
3347else3356else
3348 if test -n "$ac_ct_CC"; then3357 if test -n "$ac_ct_CC"; then
@@ -3625,7 +3634,7 @@
3625ac_clean_files=$ac_clean_files_save3634ac_clean_files=$ac_clean_files_save
3626{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&53635{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
3627$as_echo_n "checking for suffix of object files... " >&6; }3636$as_echo_n "checking for suffix of object files... " >&6; }
3628if test "${ac_cv_objext+set}" = set; then :3637if ${ac_cv_objext+:} false; then :
3629 $as_echo_n "(cached) " >&63638 $as_echo_n "(cached) " >&6
3630else3639else
3631 cat confdefs.h - <<_ACEOF >conftest.$ac_ext3640 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3676,7 +3685,7 @@
3676ac_objext=$OBJEXT3685ac_objext=$OBJEXT
3677{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&53686{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
3678$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }3687$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3679if test "${ac_cv_c_compiler_gnu+set}" = set; then :3688if ${ac_cv_c_compiler_gnu+:} false; then :
3680 $as_echo_n "(cached) " >&63689 $as_echo_n "(cached) " >&6
3681else3690else
3682 cat confdefs.h - <<_ACEOF >conftest.$ac_ext3691 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3713,7 +3722,7 @@
3713ac_save_CFLAGS=$CFLAGS3722ac_save_CFLAGS=$CFLAGS
3714{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&53723{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
3715$as_echo_n "checking whether $CC accepts -g... " >&6; }3724$as_echo_n "checking whether $CC accepts -g... " >&6; }
3716if test "${ac_cv_prog_cc_g+set}" = set; then :3725if ${ac_cv_prog_cc_g+:} false; then :
3717 $as_echo_n "(cached) " >&63726 $as_echo_n "(cached) " >&6
3718else3727else
3719 ac_save_c_werror_flag=$ac_c_werror_flag3728 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3791,7 +3800,7 @@
3791fi3800fi
3792{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&53801{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
3793$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }3802$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
3794if test "${ac_cv_prog_cc_c89+set}" = set; then :3803if ${ac_cv_prog_cc_c89+:} false; then :
3795 $as_echo_n "(cached) " >&63804 $as_echo_n "(cached) " >&6
3796else3805else
3797 ac_cv_prog_cc_c89=no3806 ac_cv_prog_cc_c89=no
@@ -3890,7 +3899,7 @@
38903899
3891{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&53900{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3892$as_echo_n "checking dependency style of $depcc... " >&6; }3901$as_echo_n "checking dependency style of $depcc... " >&6; }
3893if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :3902if ${am_cv_CC_dependencies_compiler_type+:} false; then :
3894 $as_echo_n "(cached) " >&63903 $as_echo_n "(cached) " >&6
3895else3904else
3896 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then3905 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4026,7 +4035,7 @@
4026 CPP=4035 CPP=
4027fi4036fi
4028if test -z "$CPP"; then4037if test -z "$CPP"; then
4029 if test "${ac_cv_prog_CPP+set}" = set; then :4038 if ${ac_cv_prog_CPP+:} false; then :
4030 $as_echo_n "(cached) " >&64039 $as_echo_n "(cached) " >&6
4031else4040else
4032 # Double quotes because CPP needs to be expanded4041 # Double quotes because CPP needs to be expanded
@@ -4154,7 +4163,7 @@
41544163
4155{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&54164{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4156$as_echo_n "checking for grep that handles long lines and -e... " >&6; }4165$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4157if test "${ac_cv_path_GREP+set}" = set; then :4166if ${ac_cv_path_GREP+:} false; then :
4158 $as_echo_n "(cached) " >&64167 $as_echo_n "(cached) " >&6
4159else4168else
4160 if test -z "$GREP"; then4169 if test -z "$GREP"; then
@@ -4217,7 +4226,7 @@
42174226
4218{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&54227{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4219$as_echo_n "checking for egrep... " >&6; }4228$as_echo_n "checking for egrep... " >&6; }
4220if test "${ac_cv_path_EGREP+set}" = set; then :4229if ${ac_cv_path_EGREP+:} false; then :
4221 $as_echo_n "(cached) " >&64230 $as_echo_n "(cached) " >&6
4222else4231else
4223 if echo a | $GREP -E '(a|b)' >/dev/null 2>&14232 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4284,7 +4293,7 @@
42844293
4285{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&54294{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
4286$as_echo_n "checking for ANSI C header files... " >&6; }4295$as_echo_n "checking for ANSI C header files... " >&6; }
4287if test "${ac_cv_header_stdc+set}" = set; then :4296if ${ac_cv_header_stdc+:} false; then :
4288 $as_echo_n "(cached) " >&64297 $as_echo_n "(cached) " >&6
4289else4298else
4290 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4299 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4415,7 +4424,7 @@
4415 for ac_header in locale.h4424 for ac_header in locale.h
4416do :4425do :
4417 ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"4426 ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
4418if test "x$ac_cv_header_locale_h" = x""yes; then :4427if test "x$ac_cv_header_locale_h" = xyes; then :
4419 cat >>confdefs.h <<_ACEOF4428 cat >>confdefs.h <<_ACEOF
4420#define HAVE_LOCALE_H 14429#define HAVE_LOCALE_H 1
4421_ACEOF4430_ACEOF
@@ -4427,7 +4436,7 @@
4427 if test $ac_cv_header_locale_h = yes; then4436 if test $ac_cv_header_locale_h = yes; then
4428 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&54437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
4429$as_echo_n "checking for LC_MESSAGES... " >&6; }4438$as_echo_n "checking for LC_MESSAGES... " >&6; }
4430if test "${am_cv_val_LC_MESSAGES+set}" = set; then :4439if ${am_cv_val_LC_MESSAGES+:} false; then :
4431 $as_echo_n "(cached) " >&64440 $as_echo_n "(cached) " >&6
4432else4441else
4433 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4442 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4467,7 +4476,7 @@
4467 INTLLIBS=4476 INTLLIBS=
44684477
4469 ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"4478 ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
4470if test "x$ac_cv_header_libintl_h" = x""yes; then :4479if test "x$ac_cv_header_libintl_h" = xyes; then :
4471 gt_cv_func_dgettext_libintl="no"4480 gt_cv_func_dgettext_libintl="no"
4472 libintl_extra_libs=""4481 libintl_extra_libs=""
44734482
@@ -4476,7 +4485,7 @@
4476 #4485 #
4477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&54486 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
4478$as_echo_n "checking for ngettext in libc... " >&6; }4487$as_echo_n "checking for ngettext in libc... " >&6; }
4479if test "${gt_cv_func_ngettext_libc+set}" = set; then :4488if ${gt_cv_func_ngettext_libc+:} false; then :
4480 $as_echo_n "(cached) " >&64489 $as_echo_n "(cached) " >&6
4481else4490else
4482 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4491 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4507,7 +4516,7 @@
4507 if test "$gt_cv_func_ngettext_libc" = "yes" ; then4516 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
4508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&54517 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
4509$as_echo_n "checking for dgettext in libc... " >&6; }4518$as_echo_n "checking for dgettext in libc... " >&6; }
4510if test "${gt_cv_func_dgettext_libc+set}" = set; then :4519if ${gt_cv_func_dgettext_libc+:} false; then :
4511 $as_echo_n "(cached) " >&64520 $as_echo_n "(cached) " >&6
4512else4521else
4513 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4522 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4540,7 +4549,7 @@
4540 for ac_func in bind_textdomain_codeset4549 for ac_func in bind_textdomain_codeset
4541do :4550do :
4542 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"4551 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
4543if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :4552if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
4544 cat >>confdefs.h <<_ACEOF4553 cat >>confdefs.h <<_ACEOF
4545#define HAVE_BIND_TEXTDOMAIN_CODESET 14554#define HAVE_BIND_TEXTDOMAIN_CODESET 1
4546_ACEOF4555_ACEOF
@@ -4559,7 +4568,7 @@
45594568
4560 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&54569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
4561$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }4570$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
4562if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :4571if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
4563 $as_echo_n "(cached) " >&64572 $as_echo_n "(cached) " >&6
4564else4573else
4565 ac_check_lib_save_LIBS=$LIBS4574 ac_check_lib_save_LIBS=$LIBS
@@ -4593,10 +4602,10 @@
4593fi4602fi
4594{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&54603{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
4595$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }4604$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
4596if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :4605if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
4597 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&54606 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
4598$as_echo_n "checking for ngettext in -lintl... " >&6; }4607$as_echo_n "checking for ngettext in -lintl... " >&6; }
4599if test "${ac_cv_lib_intl_ngettext+set}" = set; then :4608if ${ac_cv_lib_intl_ngettext+:} false; then :
4600 $as_echo_n "(cached) " >&64609 $as_echo_n "(cached) " >&6
4601else4610else
4602 ac_check_lib_save_LIBS=$LIBS4611 ac_check_lib_save_LIBS=$LIBS
@@ -4630,10 +4639,10 @@
4630fi4639fi
4631{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&54640{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
4632$as_echo "$ac_cv_lib_intl_ngettext" >&6; }4641$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
4633if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :4642if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
4634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&54643 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
4635$as_echo_n "checking for dgettext in -lintl... " >&6; }4644$as_echo_n "checking for dgettext in -lintl... " >&6; }
4636if test "${ac_cv_lib_intl_dgettext+set}" = set; then :4645if ${ac_cv_lib_intl_dgettext+:} false; then :
4637 $as_echo_n "(cached) " >&64646 $as_echo_n "(cached) " >&6
4638else4647else
4639 ac_check_lib_save_LIBS=$LIBS4648 ac_check_lib_save_LIBS=$LIBS
@@ -4667,7 +4676,7 @@
4667fi4676fi
4668{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&54677{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
4669$as_echo "$ac_cv_lib_intl_dgettext" >&6; }4678$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
4670if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :4679if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
4671 gt_cv_func_dgettext_libintl=yes4680 gt_cv_func_dgettext_libintl=yes
4672fi4681fi
46734682
@@ -4683,7 +4692,7 @@
4683$as_echo "" >&6; }4692$as_echo "" >&6; }
4684 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&54693 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
4685$as_echo_n "checking for ngettext in -lintl... " >&6; }4694$as_echo_n "checking for ngettext in -lintl... " >&6; }
4686if test "${ac_cv_lib_intl_ngettext+set}" = set; then :4695if ${ac_cv_lib_intl_ngettext+:} false; then :
4687 $as_echo_n "(cached) " >&64696 $as_echo_n "(cached) " >&6
4688else4697else
4689 ac_check_lib_save_LIBS=$LIBS4698 ac_check_lib_save_LIBS=$LIBS
@@ -4717,10 +4726,10 @@
4717fi4726fi
4718{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&54727{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
4719$as_echo "$ac_cv_lib_intl_ngettext" >&6; }4728$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
4720if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :4729if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
4721 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&54730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
4722$as_echo_n "checking for dcgettext in -lintl... " >&6; }4731$as_echo_n "checking for dcgettext in -lintl... " >&6; }
4723if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :4732if ${ac_cv_lib_intl_dcgettext+:} false; then :
4724 $as_echo_n "(cached) " >&64733 $as_echo_n "(cached) " >&6
4725else4734else
4726 ac_check_lib_save_LIBS=$LIBS4735 ac_check_lib_save_LIBS=$LIBS
@@ -4754,7 +4763,7 @@
4754fi4763fi
4755{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&54764{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
4756$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }4765$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
4757if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :4766if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
4758 gt_cv_func_dgettext_libintl=yes4767 gt_cv_func_dgettext_libintl=yes
4759 libintl_extra_libs=-liconv4768 libintl_extra_libs=-liconv
4760else4769else
@@ -4779,7 +4788,7 @@
4779 for ac_func in bind_textdomain_codeset4788 for ac_func in bind_textdomain_codeset
4780do :4789do :
4781 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"4790 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
4782if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :4791if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
4783 cat >>confdefs.h <<_ACEOF4792 cat >>confdefs.h <<_ACEOF
4784#define HAVE_BIND_TEXTDOMAIN_CODESET 14793#define HAVE_BIND_TEXTDOMAIN_CODESET 1
4785_ACEOF4794_ACEOF
@@ -4817,7 +4826,7 @@
4817set dummy msgfmt; ac_word=$24826set dummy msgfmt; ac_word=$2
4818{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54827{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4819$as_echo_n "checking for $ac_word... " >&6; }4828$as_echo_n "checking for $ac_word... " >&6; }
4820if test "${ac_cv_path_MSGFMT+set}" = set; then :4829if ${ac_cv_path_MSGFMT+:} false; then :
4821 $as_echo_n "(cached) " >&64830 $as_echo_n "(cached) " >&6
4822else4831else
4823 case "$MSGFMT" in4832 case "$MSGFMT" in
@@ -4854,7 +4863,7 @@
4854 for ac_func in dcgettext4863 for ac_func in dcgettext
4855do :4864do :
4856 ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"4865 ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
4857if test "x$ac_cv_func_dcgettext" = x""yes; then :4866if test "x$ac_cv_func_dcgettext" = xyes; then :
4858 cat >>confdefs.h <<_ACEOF4867 cat >>confdefs.h <<_ACEOF
4859#define HAVE_DCGETTEXT 14868#define HAVE_DCGETTEXT 1
4860_ACEOF4869_ACEOF
@@ -4895,7 +4904,7 @@
4895set dummy gmsgfmt; ac_word=$24904set dummy gmsgfmt; ac_word=$2
4896{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54905{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4897$as_echo_n "checking for $ac_word... " >&6; }4906$as_echo_n "checking for $ac_word... " >&6; }
4898if test "${ac_cv_path_GMSGFMT+set}" = set; then :4907if ${ac_cv_path_GMSGFMT+:} false; then :
4899 $as_echo_n "(cached) " >&64908 $as_echo_n "(cached) " >&6
4900else4909else
4901 case $GMSGFMT in4910 case $GMSGFMT in
@@ -4936,7 +4945,7 @@
4936set dummy xgettext; ac_word=$24945set dummy xgettext; ac_word=$2
4937{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54946{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4938$as_echo_n "checking for $ac_word... " >&6; }4947$as_echo_n "checking for $ac_word... " >&6; }
4939if test "${ac_cv_path_XGETTEXT+set}" = set; then :4948if ${ac_cv_path_XGETTEXT+:} false; then :
4940 $as_echo_n "(cached) " >&64949 $as_echo_n "(cached) " >&6
4941else4950else
4942 case "$XGETTEXT" in4951 case "$XGETTEXT" in
@@ -4987,7 +4996,7 @@
4987 case $host in4996 case $host in
4988 *-*-solaris*)4997 *-*-solaris*)
4989 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"4998 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
4990if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :4999if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
4991 CATOBJEXT=.gmo5000 CATOBJEXT=.gmo
4992 DATADIRNAME=share5001 DATADIRNAME=share
4993else5002else
@@ -5157,7 +5166,7 @@
5157set dummy intltool-update; ac_word=$25166set dummy intltool-update; ac_word=$2
5158{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55167{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5159$as_echo_n "checking for $ac_word... " >&6; }5168$as_echo_n "checking for $ac_word... " >&6; }
5160if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :5169if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
5161 $as_echo_n "(cached) " >&65170 $as_echo_n "(cached) " >&6
5162else5171else
5163 case $INTLTOOL_UPDATE in5172 case $INTLTOOL_UPDATE in
@@ -5197,7 +5206,7 @@
5197set dummy intltool-merge; ac_word=$25206set dummy intltool-merge; ac_word=$2
5198{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55207{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5199$as_echo_n "checking for $ac_word... " >&6; }5208$as_echo_n "checking for $ac_word... " >&6; }
5200if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :5209if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
5201 $as_echo_n "(cached) " >&65210 $as_echo_n "(cached) " >&6
5202else5211else
5203 case $INTLTOOL_MERGE in5212 case $INTLTOOL_MERGE in
@@ -5237,7 +5246,7 @@
5237set dummy intltool-extract; ac_word=$25246set dummy intltool-extract; ac_word=$2
5238{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55247{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5239$as_echo_n "checking for $ac_word... " >&6; }5248$as_echo_n "checking for $ac_word... " >&6; }
5240if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :5249if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
5241 $as_echo_n "(cached) " >&65250 $as_echo_n "(cached) " >&6
5242else5251else
5243 case $INTLTOOL_EXTRACT in5252 case $INTLTOOL_EXTRACT in
@@ -5398,7 +5407,7 @@
5398set dummy xgettext; ac_word=$25407set dummy xgettext; ac_word=$2
5399{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55408{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5400$as_echo_n "checking for $ac_word... " >&6; }5409$as_echo_n "checking for $ac_word... " >&6; }
5401if test "${ac_cv_path_XGETTEXT+set}" = set; then :5410if ${ac_cv_path_XGETTEXT+:} false; then :
5402 $as_echo_n "(cached) " >&65411 $as_echo_n "(cached) " >&6
5403else5412else
5404 case $XGETTEXT in5413 case $XGETTEXT in
@@ -5438,7 +5447,7 @@
5438set dummy msgmerge; ac_word=$25447set dummy msgmerge; ac_word=$2
5439{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55448{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5440$as_echo_n "checking for $ac_word... " >&6; }5449$as_echo_n "checking for $ac_word... " >&6; }
5441if test "${ac_cv_path_MSGMERGE+set}" = set; then :5450if ${ac_cv_path_MSGMERGE+:} false; then :
5442 $as_echo_n "(cached) " >&65451 $as_echo_n "(cached) " >&6
5443else5452else
5444 case $MSGMERGE in5453 case $MSGMERGE in
@@ -5478,7 +5487,7 @@
5478set dummy msgfmt; ac_word=$25487set dummy msgfmt; ac_word=$2
5479{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55488{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5480$as_echo_n "checking for $ac_word... " >&6; }5489$as_echo_n "checking for $ac_word... " >&6; }
5481if test "${ac_cv_path_MSGFMT+set}" = set; then :5490if ${ac_cv_path_MSGFMT+:} false; then :
5482 $as_echo_n "(cached) " >&65491 $as_echo_n "(cached) " >&6
5483else5492else
5484 case $MSGFMT in5493 case $MSGFMT in
@@ -5518,7 +5527,7 @@
5518set dummy gmsgfmt; ac_word=$25527set dummy gmsgfmt; ac_word=$2
5519{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55528{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5520$as_echo_n "checking for $ac_word... " >&6; }5529$as_echo_n "checking for $ac_word... " >&6; }
5521if test "${ac_cv_path_GMSGFMT+set}" = set; then :5530if ${ac_cv_path_GMSGFMT+:} false; then :
5522 $as_echo_n "(cached) " >&65531 $as_echo_n "(cached) " >&6
5523else5532else
5524 case $GMSGFMT in5533 case $GMSGFMT in
@@ -5569,7 +5578,7 @@
5569set dummy perl; ac_word=$25578set dummy perl; ac_word=$2
5570{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55579{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5571$as_echo_n "checking for $ac_word... " >&6; }5580$as_echo_n "checking for $ac_word... " >&6; }
5572if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :5581if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
5573 $as_echo_n "(cached) " >&65582 $as_echo_n "(cached) " >&6
5574else5583else
5575 case $INTLTOOL_PERL in5584 case $INTLTOOL_PERL in
@@ -5653,7 +5662,7 @@
5653 case $host in5662 case $host in
5654 *-*-solaris*)5663 *-*-solaris*)
5655 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"5664 ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
5656if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :5665if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
5657 DATADIRNAME=share5666 DATADIRNAME=share
5658else5667else
5659 DATADIRNAME=lib5668 DATADIRNAME=lib
@@ -5740,10 +5749,21 @@
5740 :end' >>confcache5749 :end' >>confcache
5741if diff "$cache_file" confcache >/dev/null 2>&1; then :; else5750if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
5742 if test -w "$cache_file"; then5751 if test -w "$cache_file"; then
5743 test "x$cache_file" != "x/dev/null" &&5752 if test "x$cache_file" != "x/dev/null"; then
5744 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&55753 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
5745$as_echo "$as_me: updating cache $cache_file" >&6;}5754$as_echo "$as_me: updating cache $cache_file" >&6;}
5746 cat confcache >$cache_file5755 if test ! -f "$cache_file" || test -h "$cache_file"; then
5756 cat confcache >"$cache_file"
5757 else
5758 case $cache_file in #(
5759 */* | ?:*)
5760 mv -f confcache "$cache_file"$$ &&
5761 mv -f "$cache_file"$$ "$cache_file" ;; #(
5762 *)
5763 mv -f confcache "$cache_file" ;;
5764 esac
5765 fi
5766 fi
5747 else5767 else
5748 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&55768 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
5749$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}5769$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -5835,7 +5855,7 @@
58355855
58365856
58375857
5838: ${CONFIG_STATUS=./config.status}5858: "${CONFIG_STATUS=./config.status}"
5839ac_write_fail=05859ac_write_fail=0
5840ac_clean_files_save=$ac_clean_files5860ac_clean_files_save=$ac_clean_files
5841ac_clean_files="$ac_clean_files $CONFIG_STATUS"5861ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -5936,6 +5956,7 @@
5936IFS=" "" $as_nl"5956IFS=" "" $as_nl"
59375957
5938# Find who we are. Look in the path if we contain no directory separator.5958# Find who we are. Look in the path if we contain no directory separator.
5959as_myself=
5939case $0 in #((5960case $0 in #((
5940 *[\\/]* ) as_myself=$0 ;;5961 *[\\/]* ) as_myself=$0 ;;
5941 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR5962 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6242,8 +6263,8 @@
6242# report actual input values of CONFIG_FILES etc. instead of their6263# report actual input values of CONFIG_FILES etc. instead of their
6243# values after options handling.6264# values after options handling.
6244ac_log="6265ac_log="
6245This file was extended by gsettings-desktop-schemas $as_me 0.1.3, which was6266This file was extended by gsettings-desktop-schemas $as_me 0.1.4, which was
6246generated by GNU Autoconf 2.67. Invocation command line was6267generated by GNU Autoconf 2.68. Invocation command line was
62476268
6248 CONFIG_FILES = $CONFIG_FILES6269 CONFIG_FILES = $CONFIG_FILES
6249 CONFIG_HEADERS = $CONFIG_HEADERS6270 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6299,8 +6320,8 @@
6299cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=16320cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6300ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"6321ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6301ac_cs_version="\\6322ac_cs_version="\\
6302gsettings-desktop-schemas config.status 0.1.36323gsettings-desktop-schemas config.status 0.1.4
6303configured by $0, generated by GNU Autoconf 2.67,6324configured by $0, generated by GNU Autoconf 2.68,
6304 with options \\"\$ac_cs_config\\"6325 with options \\"\$ac_cs_config\\"
63056326
6306Copyright (C) 2010 Free Software Foundation, Inc.6327Copyright (C) 2010 Free Software Foundation, Inc.
@@ -6449,9 +6470,10 @@
6449# after its creation but before its name has been assigned to `$tmp'.6470# after its creation but before its name has been assigned to `$tmp'.
6450$debug ||6471$debug ||
6451{6472{
6452 tmp=6473 tmp= ac_tmp=
6453 trap 'exit_status=$?6474 trap 'exit_status=$?
6454 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status6475 : "${ac_tmp:=$tmp}"
6476 { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
6455' 06477' 0
6456 trap 'as_fn_exit 1' 1 2 13 156478 trap 'as_fn_exit 1' 1 2 13 15
6457}6479}
@@ -6459,12 +6481,13 @@
64596481
6460{6482{
6461 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&6483 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
6462 test -n "$tmp" && test -d "$tmp"6484 test -d "$tmp"
6463} ||6485} ||
6464{6486{
6465 tmp=./conf$$-$RANDOM6487 tmp=./conf$$-$RANDOM
6466 (umask 077 && mkdir "$tmp")6488 (umask 077 && mkdir "$tmp")
6467} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 56489} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
6490ac_tmp=$tmp
64686491
6469# Set up the scripts for CONFIG_FILES section.6492# Set up the scripts for CONFIG_FILES section.
6470# No need to generate them if there are no CONFIG_FILES.6493# No need to generate them if there are no CONFIG_FILES.
@@ -6486,7 +6509,7 @@
6486 ac_cs_awk_cr=$ac_cr6509 ac_cs_awk_cr=$ac_cr
6487fi6510fi
64886511
6489echo 'BEGIN {' >"$tmp/subs1.awk" &&6512echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
6490_ACEOF6513_ACEOF
64916514
64926515
@@ -6514,7 +6537,7 @@
6514rm -f conf$$subs.sh6537rm -f conf$$subs.sh
65156538
6516cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=16539cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6517cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&6540cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
6518_ACEOF6541_ACEOF
6519sed -n '6542sed -n '
6520h6543h
@@ -6562,7 +6585,7 @@
6562rm -f conf$$subs.awk6585rm -f conf$$subs.awk
6563cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=16586cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6564_ACAWK6587_ACAWK
6565cat >>"\$tmp/subs1.awk" <<_ACAWK &&6588cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
6566 for (key in S) S_is_set[key] = 16589 for (key in S) S_is_set[key] = 1
6567 FS = ""6590 FS = ""
65686591
@@ -6594,7 +6617,7 @@
6594 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"6617 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
6595else6618else
6596 cat6619 cat
6597fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \6620fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
6598 || as_fn_error $? "could not setup config files machinery" "$LINENO" 56621 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
6599_ACEOF6622_ACEOF
66006623
@@ -6653,7 +6676,7 @@
6653 for ac_f6676 for ac_f
6654 do6677 do
6655 case $ac_f in6678 case $ac_f in
6656 -) ac_f="$tmp/stdin";;6679 -) ac_f="$ac_tmp/stdin";;
6657 *) # Look for the file first in the build tree, then in the source tree6680 *) # Look for the file first in the build tree, then in the source tree
6658 # (if the path is not absolute). The absolute path cannot be DOS-style,6681 # (if the path is not absolute). The absolute path cannot be DOS-style,
6659 # because $ac_f cannot contain `:'.6682 # because $ac_f cannot contain `:'.
@@ -6688,7 +6711,7 @@
6688 esac6711 esac
66896712
6690 case $ac_tag in6713 case $ac_tag in
6691 *:-:* | *:-) cat >"$tmp/stdin" \6714 *:-:* | *:-) cat >"$ac_tmp/stdin" \
6692 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;6715 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
6693 esac6716 esac
6694 ;;6717 ;;
@@ -6825,21 +6848,22 @@
6825s&@MKDIR_P@&$ac_MKDIR_P&;t t6848s&@MKDIR_P@&$ac_MKDIR_P&;t t
6826$ac_datarootdir_hack6849$ac_datarootdir_hack
6827"6850"
6828eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \6851eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
6829 || as_fn_error $? "could not create $ac_file" "$LINENO" 56852 >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
68306853
6831test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&6854test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
6832 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&6855 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
6833 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&6856 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
6857 "$ac_tmp/out"`; test -z "$ac_out"; } &&
6834 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'6858 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
6835which seems to be undefined. Please make sure it is defined" >&56859which seems to be undefined. Please make sure it is defined" >&5
6836$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'6860$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
6837which seems to be undefined. Please make sure it is defined" >&2;}6861which seems to be undefined. Please make sure it is defined" >&2;}
68386862
6839 rm -f "$tmp/stdin"6863 rm -f "$ac_tmp/stdin"
6840 case $ac_file in6864 case $ac_file in
6841 -) cat "$tmp/out" && rm -f "$tmp/out";;6865 -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
6842 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;6866 *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
6843 esac \6867 esac \
6844 || as_fn_error $? "could not create $ac_file" "$LINENO" 56868 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
6845 ;;6869 ;;
68466870
=== modified file 'configure.ac'
--- configure.ac 2010-12-23 12:40:25 +0000
+++ configure.ac 2011-01-10 17:05:40 +0000
@@ -1,5 +1,5 @@
1AC_PREREQ(2.53)1AC_PREREQ(2.53)
2AC_INIT([gsettings-desktop-schemas], [0.1.3],2AC_INIT([gsettings-desktop-schemas], [0.1.4],
3 [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])3 [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])
4AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml)4AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml)
5AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])5AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
66
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-23 12:40:25 +0000
+++ debian/changelog 2011-01-10 17:05:40 +0000
@@ -1,3 +1,9 @@
1gsettings-desktop-schemas (0.1.4-1) UNRELEASED; urgency=low
2
3 * New upstream release.
4
5 -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 10 Jan 2011 18:01:17 +0100
6
1gsettings-desktop-schemas (0.1.3-1) experimental; urgency=low7gsettings-desktop-schemas (0.1.3-1) experimental; urgency=low
28
3 * New upstream release.9 * New upstream release.
410
=== modified file 'schemas/Makefile.am'
--- schemas/Makefile.am 2010-11-30 10:25:03 +0000
+++ schemas/Makefile.am 2011-01-10 17:05:40 +0000
@@ -7,7 +7,8 @@
7 org.gnome.desktop.thumbnail-cache.gschema.xml \7 org.gnome.desktop.thumbnail-cache.gschema.xml \
8 org.gnome.desktop.a11y.keyboard.gschema.xml \8 org.gnome.desktop.a11y.keyboard.gschema.xml \
9 org.gnome.desktop.a11y.applications.gschema.xml \9 org.gnome.desktop.a11y.applications.gschema.xml \
10 org.gnome.desktop.a11y.mouse.gschema.xml10 org.gnome.desktop.a11y.mouse.gschema.xml \
11 org.gnome.desktop.thumbnailers.gschema.xml
1112
12desktop_gschemas_in = \13desktop_gschemas_in = \
13 org.gnome.desktop.background.gschema.xml.in \14 org.gnome.desktop.background.gschema.xml.in \
1415
=== modified file 'schemas/Makefile.in'
--- schemas/Makefile.in 2010-11-30 10:25:03 +0000
+++ schemas/Makefile.in 2011-01-10 17:05:40 +0000
@@ -202,7 +202,8 @@
202 org.gnome.desktop.thumbnail-cache.gschema.xml \202 org.gnome.desktop.thumbnail-cache.gschema.xml \
203 org.gnome.desktop.a11y.keyboard.gschema.xml \203 org.gnome.desktop.a11y.keyboard.gschema.xml \
204 org.gnome.desktop.a11y.applications.gschema.xml \204 org.gnome.desktop.a11y.applications.gschema.xml \
205 org.gnome.desktop.a11y.mouse.gschema.xml205 org.gnome.desktop.a11y.mouse.gschema.xml \
206 org.gnome.desktop.thumbnailers.gschema.xml
206207
207desktop_gschemas_in = \208desktop_gschemas_in = \
208 org.gnome.desktop.background.gschema.xml.in \209 org.gnome.desktop.background.gschema.xml.in \
209210
=== modified file 'schemas/gsettings-desktop-schemas.convert'
--- schemas/gsettings-desktop-schemas.convert 2010-12-23 12:40:25 +0000
+++ schemas/gsettings-desktop-schemas.convert 2011-01-10 17:05:40 +0000
@@ -170,3 +170,7 @@
170dwell-click-enabled = /desktop/gnome/accessibility/mouse/dwell_enable170dwell-click-enabled = /desktop/gnome/accessibility/mouse/dwell_enable
171secondary-click-enabled = /desktop/gnome/accessibility/mouse/delay_enable171secondary-click-enabled = /desktop/gnome/accessibility/mouse/delay_enable
172secondary-click-time = /desktop/gnome/accessibility/mouse/delay_time172secondary-click-time = /desktop/gnome/accessibility/mouse/delay_time
173
174# From org.gnome.desktop.thumbnailers
175[org.gnome.desktop.thumbnailers]
176disable-all = /desktop/gnome/thumbnailers/disable_all
173177
=== modified file 'schemas/org.gnome.desktop.background.gschema.xml.in'
--- schemas/org.gnome.desktop.background.gschema.xml.in 2010-12-23 12:40:25 +0000
+++ schemas/org.gnome.desktop.background.gschema.xml.in 2011-01-10 17:05:40 +0000
@@ -47,12 +47,12 @@
47 <default>'solid'</default>47 <default>'solid'</default>
48 <summary>Color Shading Type</summary>48 <summary>Color Shading Type</summary>
49 <description>49 <description>
50 How to shade the background color. Possible values are "horizontal", 50 How to shade the background color. Possible values are "horizontal",
51 "vertical", and "solid".51 "vertical", and "solid".
52 </description>52 </description>
53 </key>53 </key>
54 <key name="show-desktop-icons" type="b">54 <key name="show-desktop-icons" type="b">
55 <default>true</default>55 <default>false</default>
56 <summary>Have file manager handle the desktop</summary>56 <summary>Have file manager handle the desktop</summary>
57 <description>57 <description>
58 If set to true, then file manager will draw the icons on the desktop.58 If set to true, then file manager will draw the icons on the desktop.
5959
=== added file 'schemas/org.gnome.desktop.thumbnailers.gschema.xml'
--- schemas/org.gnome.desktop.thumbnailers.gschema.xml 1970-01-01 00:00:00 +0000
+++ schemas/org.gnome.desktop.thumbnailers.gschema.xml 2011-01-10 17:05:40 +0000
@@ -0,0 +1,25 @@
1<?xml version="1.0"?>
2<schemalist>
3 <schema id="org.gnome.desktop.thumbnailers" path="/desktop/gnome/thumbnailers/">
4 <key name="disable-all" type="b">
5 <default>false</default>
6 <summary>Disable all external thumbnailers</summary>
7 <description>
8 Set to true to disable all external thumbnailer programs,
9 independent on whether they are independently disabled/enabled.
10 </description>
11 </key>
12
13 <key name="disable" type="as">
14 <default>[]</default>
15 <summary>
16 List of mime-types for which external thumbnailer
17 programs will be disabled
18 </summary>
19 <description>
20 Thumbnails will not be created for files whose mime-type is
21 contained in the list.
22 </description>
23 </key>
24 </schema>
25</schemalist>

Subscribers

People subscribed via source and target branches

to all changes: