Ubuntu
gsettings-desktop-schemas package

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

  1. Natty (11.04)
  2. 0_1_1_release
  3. Merge into natty
Proposed by Rodrigo Moya
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 3
Merge reported by: Rodrigo Moya
Merged at revision: not available
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_1_release
Merge into: lp:ubuntu/natty/gsettings-desktop-schemas
Diff against target: 1497 lines (+598/-566)
7 files modified
NEWS (+5/-0)
aclocal.m4 (+521/-519)
configure (+52/-44)
configure.ac (+1/-1)
debian/changelog (+7/-0)
schemas/gsettings-desktop-schemas.convert (+3/-1)
schemas/org.gnome.desktop.interface.gschema.xml (+9/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_1_release
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+41075@code.launchpad.net

Description of the change

Upstream 0.1.1 release

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

We should set the default cursor to a theme we use somewhere but otherwise seems fine, feel free to upload

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-11-05 17:22:35 +0000
+++ NEWS 2010-11-17 17:44:38 +0000
@@ -1,3 +1,8 @@
1Major changes in 0.1.1
2======================
3
4* Misc. schema updates
5
1Major changes in 0.1.06Major changes in 0.1.0
2======================7======================
38
49
=== modified file 'aclocal.m4'
--- aclocal.m4 2010-11-05 17:22:35 +0000
+++ aclocal.m4 2010-11-17 17:44:38 +0000
@@ -13,527 +13,12 @@
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.66],,16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17[m4_warning([this file was generated for autoconf 2.66.17[m4_warning([this file was generated for autoconf 2.67.
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 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
505 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
506 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
507
508uninstall-gsettings-schemas:
509 @$(NORMAL_UNINSTALL)
510 @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
511 files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
512 test -n "$$files" || exit 0; \
513 echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
514 cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
515 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
516
517clean-gsettings-schemas:
518 rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
519
520ifdef gsettings_ENUM_NAMESPACE
521$(gsettings__enum_file): $(gsettings_ENUM_FILES)
522 $(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>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@
523endif
524'
525 _GSETTINGS_SUBST(GSETTINGS_RULES)
526])
527
528dnl _GSETTINGS_SUBST(VARIABLE)
529dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
530AC_DEFUN([_GSETTINGS_SUBST],
531[
532AC_SUBST([$1])
533m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
534]
535)
536
537# nls.m4 serial 5 (gettext-0.18)22# nls.m4 serial 5 (gettext-0.18)
538dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,23dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
539dnl Inc.24dnl Inc.
@@ -704,7 +189,7 @@
704Consider adjusting the PKG_CONFIG_PATH environment variable if you189Consider adjusting the PKG_CONFIG_PATH environment variable if you
705installed software in a non-standard prefix.190installed software in a non-standard prefix.
706191
707_PKG_TEXT])192_PKG_TEXT])[]dnl
708 ])193 ])
709elif test $pkg_failed = untried; then194elif test $pkg_failed = untried; then
710 AC_MSG_RESULT([no])195 AC_MSG_RESULT([no])
@@ -715,7 +200,7 @@
715200
716_PKG_TEXT201_PKG_TEXT
717202
718To get pkg-config, see <http://pkg-config.freedesktop.org/>.])203To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
719 ])204 ])
720else205else
721 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS206 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -1722,4 +1207,521 @@
1722AC_SUBST([am__untar])1207AC_SUBST([am__untar])
1723]) # _AM_PROG_TAR1208]) # _AM_PROG_TAR
17241209
1210# Copyright (C) 1995-2002 Free Software Foundation, Inc.
1211# Copyright (C) 2001-2003,2004 Red Hat, Inc.
1212#
1213# This file is free software, distributed under the terms of the GNU
1214# General Public License. As a special exception to the GNU General
1215# Public License, this file may be distributed as part of a program
1216# that contains a configuration script generated by Autoconf, under
1217# the same distribution terms as the rest of that program.
1218#
1219# This file can be copied and used freely without restrictions. It can
1220# be used in projects which are not available under the GNU Public License
1221# but which still want to provide support for the GNU gettext functionality.
1222#
1223# Macro to add for using GNU gettext.
1224# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
1225#
1226# Modified to never use included libintl.
1227# Owen Taylor <otaylor@redhat.com>, 12/15/1998
1228#
1229# Major rework to remove unused code
1230# Owen Taylor <otaylor@redhat.com>, 12/11/2002
1231#
1232# Added better handling of ALL_LINGUAS from GNU gettext version
1233# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
1234#
1235# Modified to require ngettext
1236# Matthias Clasen <mclasen@redhat.com> 08/06/2004
1237#
1238# We need this here as well, since someone might use autoconf-2.5x
1239# to configure GLib then an older version to configure a package
1240# using AM_GLIB_GNU_GETTEXT
1241AC_PREREQ(2.53)
1242
1243dnl
1244dnl We go to great lengths to make sure that aclocal won't
1245dnl try to pull in the installed version of these macros
1246dnl when running aclocal in the glib directory.
1247dnl
1248m4_copy([AC_DEFUN],[glib_DEFUN])
1249m4_copy([AC_REQUIRE],[glib_REQUIRE])
1250dnl
1251dnl At the end, if we're not within glib, we'll define the public
1252dnl definitions in terms of our private definitions.
1253dnl
1254
1255# GLIB_LC_MESSAGES
1256#--------------------
1257glib_DEFUN([GLIB_LC_MESSAGES],
1258 [AC_CHECK_HEADERS([locale.h])
1259 if test $ac_cv_header_locale_h = yes; then
1260 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
1261 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
1262 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
1263 if test $am_cv_val_LC_MESSAGES = yes; then
1264 AC_DEFINE(HAVE_LC_MESSAGES, 1,
1265 [Define if your <locale.h> file defines LC_MESSAGES.])
1266 fi
1267 fi])
1268
1269# GLIB_PATH_PROG_WITH_TEST
1270#----------------------------
1271dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1272dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1273glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
1274[# Extract the first word of "$2", so it can be a program name with args.
1275set dummy $2; ac_word=[$]2
1276AC_MSG_CHECKING([for $ac_word])
1277AC_CACHE_VAL(ac_cv_path_$1,
1278[case "[$]$1" in
1279 /*)
1280 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1281 ;;
1282 *)
1283 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1284 for ac_dir in ifelse([$5], , $PATH, [$5]); do
1285 test -z "$ac_dir" && ac_dir=.
1286 if test -f $ac_dir/$ac_word; then
1287 if [$3]; then
1288 ac_cv_path_$1="$ac_dir/$ac_word"
1289 break
1290 fi
1291 fi
1292 done
1293 IFS="$ac_save_ifs"
1294dnl If no 4th arg is given, leave the cache variable unset,
1295dnl so AC_PATH_PROGS will keep looking.
1296ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1297])dnl
1298 ;;
1299esac])dnl
1300$1="$ac_cv_path_$1"
1301if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1302 AC_MSG_RESULT([$]$1)
1303else
1304 AC_MSG_RESULT(no)
1305fi
1306AC_SUBST($1)dnl
1307])
1308
1309# GLIB_WITH_NLS
1310#-----------------
1311glib_DEFUN([GLIB_WITH_NLS],
1312 dnl NLS is obligatory
1313 [USE_NLS=yes
1314 AC_SUBST(USE_NLS)
1315
1316 gt_cv_have_gettext=no
1317
1318 CATOBJEXT=NONE
1319 XGETTEXT=:
1320 INTLLIBS=
1321
1322 AC_CHECK_HEADER(libintl.h,
1323 [gt_cv_func_dgettext_libintl="no"
1324 libintl_extra_libs=""
1325
1326 #
1327 # First check in libc
1328 #
1329 AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
1330 [AC_TRY_LINK([
1331#include <libintl.h>
1332],
1333 [return !ngettext ("","", 1)],
1334 gt_cv_func_ngettext_libc=yes,
1335 gt_cv_func_ngettext_libc=no)
1336 ])
1337
1338 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1339 AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
1340 [AC_TRY_LINK([
1341#include <libintl.h>
1342],
1343 [return !dgettext ("","")],
1344 gt_cv_func_dgettext_libc=yes,
1345 gt_cv_func_dgettext_libc=no)
1346 ])
1347 fi
1348
1349 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1350 AC_CHECK_FUNCS(bind_textdomain_codeset)
1351 fi
1352
1353 #
1354 # If we don't have everything we want, check in libintl
1355 #
1356 if test "$gt_cv_func_dgettext_libc" != "yes" \
1357 || test "$gt_cv_func_ngettext_libc" != "yes" \
1358 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1359
1360 AC_CHECK_LIB(intl, bindtextdomain,
1361 [AC_CHECK_LIB(intl, ngettext,
1362 [AC_CHECK_LIB(intl, dgettext,
1363 gt_cv_func_dgettext_libintl=yes)])])
1364
1365 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1366 AC_MSG_CHECKING([if -liconv is needed to use gettext])
1367 AC_MSG_RESULT([])
1368 AC_CHECK_LIB(intl, ngettext,
1369 [AC_CHECK_LIB(intl, dcgettext,
1370 [gt_cv_func_dgettext_libintl=yes
1371 libintl_extra_libs=-liconv],
1372 :,-liconv)],
1373 :,-liconv)
1374 fi
1375
1376 #
1377 # If we found libintl, then check in it for bind_textdomain_codeset();
1378 # we'll prefer libc if neither have bind_textdomain_codeset(),
1379 # and both have dgettext and ngettext
1380 #
1381 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1382 glib_save_LIBS="$LIBS"
1383 LIBS="$LIBS -lintl $libintl_extra_libs"
1384 unset ac_cv_func_bind_textdomain_codeset
1385 AC_CHECK_FUNCS(bind_textdomain_codeset)
1386 LIBS="$glib_save_LIBS"
1387
1388 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1389 gt_cv_func_dgettext_libc=no
1390 else
1391 if test "$gt_cv_func_dgettext_libc" = "yes" \
1392 && test "$gt_cv_func_ngettext_libc" = "yes"; then
1393 gt_cv_func_dgettext_libintl=no
1394 fi
1395 fi
1396 fi
1397 fi
1398
1399 if test "$gt_cv_func_dgettext_libc" = "yes" \
1400 || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1401 gt_cv_have_gettext=yes
1402 fi
1403
1404 if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1405 INTLLIBS="-lintl $libintl_extra_libs"
1406 fi
1407
1408 if test "$gt_cv_have_gettext" = "yes"; then
1409 AC_DEFINE(HAVE_GETTEXT,1,
1410 [Define if the GNU gettext() function is already present or preinstalled.])
1411 GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1412 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1413 if test "$MSGFMT" != "no"; then
1414 glib_save_LIBS="$LIBS"
1415 LIBS="$LIBS $INTLLIBS"
1416 AC_CHECK_FUNCS(dcgettext)
1417 MSGFMT_OPTS=
1418 AC_MSG_CHECKING([if msgfmt accepts -c])
1419 GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1420msgid ""
1421msgstr ""
1422"Content-Type: text/plain; charset=UTF-8\n"
1423"Project-Id-Version: test 1.0\n"
1424"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1425"Last-Translator: test <foo@bar.xx>\n"
1426"Language-Team: C <LL@li.org>\n"
1427"MIME-Version: 1.0\n"
1428"Content-Transfer-Encoding: 8bit\n"
1429], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1430 AC_SUBST(MSGFMT_OPTS)
1431 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1432 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1433 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1434 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1435 return _nl_msg_cat_cntr],
1436 [CATOBJEXT=.gmo
1437 DATADIRNAME=share],
1438 [case $host in
1439 *-*-solaris*)
1440 dnl On Solaris, if bind_textdomain_codeset is in libc,
1441 dnl GNU format message catalog is always supported,
1442 dnl since both are added to the libc all together.
1443 dnl Hence, we'd like to go with DATADIRNAME=share and
1444 dnl and CATOBJEXT=.gmo in this case.
1445 AC_CHECK_FUNC(bind_textdomain_codeset,
1446 [CATOBJEXT=.gmo
1447 DATADIRNAME=share],
1448 [CATOBJEXT=.mo
1449 DATADIRNAME=lib])
1450 ;;
1451 *)
1452 CATOBJEXT=.mo
1453 DATADIRNAME=lib
1454 ;;
1455 esac])
1456 LIBS="$glib_save_LIBS"
1457 INSTOBJEXT=.mo
1458 else
1459 gt_cv_have_gettext=no
1460 fi
1461 fi
1462 ])
1463
1464 if test "$gt_cv_have_gettext" = "yes" ; then
1465 AC_DEFINE(ENABLE_NLS, 1,
1466 [always defined to indicate that i18n is enabled])
1467 fi
1468
1469 dnl Test whether we really found GNU xgettext.
1470 if test "$XGETTEXT" != ":"; then
1471 dnl If it is not GNU xgettext we define it as : so that the
1472 dnl Makefiles still can work.
1473 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1474 : ;
1475 else
1476 AC_MSG_RESULT(
1477 [found xgettext program is not GNU xgettext; ignore it])
1478 XGETTEXT=":"
1479 fi
1480 fi
1481
1482 # We need to process the po/ directory.
1483 POSUB=po
1484
1485 AC_OUTPUT_COMMANDS(
1486 [case "$CONFIG_FILES" in *po/Makefile.in*)
1487 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
1488 esac])
1489
1490 dnl These rules are solely for the distribution goal. While doing this
1491 dnl we only have to keep exactly one list of the available catalogs
1492 dnl in configure.ac.
1493 for lang in $ALL_LINGUAS; do
1494 GMOFILES="$GMOFILES $lang.gmo"
1495 POFILES="$POFILES $lang.po"
1496 done
1497
1498 dnl Make all variables we use known to autoconf.
1499 AC_SUBST(CATALOGS)
1500 AC_SUBST(CATOBJEXT)
1501 AC_SUBST(DATADIRNAME)
1502 AC_SUBST(GMOFILES)
1503 AC_SUBST(INSTOBJEXT)
1504 AC_SUBST(INTLLIBS)
1505 AC_SUBST(PO_IN_DATADIR_TRUE)
1506 AC_SUBST(PO_IN_DATADIR_FALSE)
1507 AC_SUBST(POFILES)
1508 AC_SUBST(POSUB)
1509 ])
1510
1511# AM_GLIB_GNU_GETTEXT
1512# -------------------
1513# Do checks necessary for use of gettext. If a suitable implementation
1514# of gettext is found in either in libintl or in the C library,
1515# it will set INTLLIBS to the libraries needed for use of gettext
1516# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
1517# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
1518# on various variables needed by the Makefile.in.in installed by
1519# glib-gettextize.
1520dnl
1521glib_DEFUN([GLIB_GNU_GETTEXT],
1522 [AC_REQUIRE([AC_PROG_CC])dnl
1523 AC_REQUIRE([AC_HEADER_STDC])dnl
1524
1525 GLIB_LC_MESSAGES
1526 GLIB_WITH_NLS
1527
1528 if test "$gt_cv_have_gettext" = "yes"; then
1529 if test "x$ALL_LINGUAS" = "x"; then
1530 LINGUAS=
1531 else
1532 AC_MSG_CHECKING(for catalogs to be installed)
1533 NEW_LINGUAS=
1534 for presentlang in $ALL_LINGUAS; do
1535 useit=no
1536 if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
1537 desiredlanguages="$LINGUAS"
1538 else
1539 desiredlanguages="$ALL_LINGUAS"
1540 fi
1541 for desiredlang in $desiredlanguages; do
1542 # Use the presentlang catalog if desiredlang is
1543 # a. equal to presentlang, or
1544 # b. a variant of presentlang (because in this case,
1545 # presentlang can be used as a fallback for messages
1546 # which are not translated in the desiredlang catalog).
1547 case "$desiredlang" in
1548 "$presentlang"*) useit=yes;;
1549 esac
1550 done
1551 if test $useit = yes; then
1552 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
1553 fi
1554 done
1555 LINGUAS=$NEW_LINGUAS
1556 AC_MSG_RESULT($LINGUAS)
1557 fi
1558
1559 dnl Construct list of names of catalog files to be constructed.
1560 if test -n "$LINGUAS"; then
1561 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1562 fi
1563 fi
1564
1565 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1566 dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1567 dnl Try to locate is.
1568 MKINSTALLDIRS=
1569 if test -n "$ac_aux_dir"; then
1570 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1571 fi
1572 if test -z "$MKINSTALLDIRS"; then
1573 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1574 fi
1575 AC_SUBST(MKINSTALLDIRS)
1576
1577 dnl Generate list of files to be processed by xgettext which will
1578 dnl be included in po/Makefile.
1579 test -d po || mkdir po
1580 if test "x$srcdir" != "x."; then
1581 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1582 posrcprefix="$srcdir/"
1583 else
1584 posrcprefix="../$srcdir/"
1585 fi
1586 else
1587 posrcprefix="../"
1588 fi
1589 rm -f po/POTFILES
1590 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1591 < $srcdir/po/POTFILES.in > po/POTFILES
1592 ])
1593
1594# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
1595# -------------------------------
1596# Define VARIABLE to the location where catalog files will
1597# be installed by po/Makefile.
1598glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
1599[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1600glib_save_prefix="$prefix"
1601glib_save_exec_prefix="$exec_prefix"
1602glib_save_datarootdir="$datarootdir"
1603test "x$prefix" = xNONE && prefix=$ac_default_prefix
1604test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1605datarootdir=`eval echo "${datarootdir}"`
1606if test "x$CATOBJEXT" = "x.mo" ; then
1607 localedir=`eval echo "${libdir}/locale"`
1608else
1609 localedir=`eval echo "${datadir}/locale"`
1610fi
1611prefix="$glib_save_prefix"
1612exec_prefix="$glib_save_exec_prefix"
1613datarootdir="$glib_save_datarootdir"
1614AC_DEFINE_UNQUOTED($1, "$localedir",
1615 [Define the location where the catalogs will be installed])
1616])
1617
1618dnl
1619dnl Now the definitions that aclocal will find
1620dnl
1621ifdef(glib_configure_ac,[],[
1622AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
1623AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1624])dnl
1625
1626# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1627#
1628# Create a temporary file with TEST-FILE as its contents and pass the
1629# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1630# 0 and perform ACTION-IF-FAIL for any other exit status.
1631AC_DEFUN([GLIB_RUN_PROG],
1632[cat >conftest.foo <<_ACEOF
1633$2
1634_ACEOF
1635if AC_RUN_LOG([$1 conftest.foo]); then
1636 m4_ifval([$3], [$3], [:])
1637m4_ifvaln([$4], [else $4])dnl
1638echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1639sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1640fi])
1641
1642
1643dnl GLIB_GSETTINGS
1644dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
1645dnl the schema should be compiled
1646dnl
1647
1648AC_DEFUN([GLIB_GSETTINGS],
1649[
1650 m4_pattern_allow([AM_V_GEN])
1651 AC_ARG_ENABLE(schemas-compile,
1652 AC_HELP_STRING([--disable-schemas-compile],
1653 [Disable regeneration of gschemas.compiled on install]),
1654 [case ${enableval} in
1655 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
1656 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
1657 *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
1658 esac])
1659 AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
1660 PKG_PROG_PKG_CONFIG([0.16])
1661 AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
1662 if test x$cross_compiling != xyes; then
1663 GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
1664 else
1665 AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
1666 fi
1667 AC_SUBST(GLIB_COMPILE_SCHEMAS)
1668 if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
1669 ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
1670 else
1671 ifelse([$1],,[:],[$1])
1672 fi
1673
1674 GSETTINGS_RULES='
1675.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
1676
1677mostlyclean-am: clean-gsettings-schemas
1678
1679gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
1680
1681%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
1682 $(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 [$]@
1683
1684all-am: $(gsettings_SCHEMAS:.xml=.valid)
1685uninstall-am: uninstall-gsettings-schemas
1686install-data-am: install-gsettings-schemas
1687
1688.SECONDARY: $(gsettings_SCHEMAS)
1689
1690install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
1691 @$(NORMAL_INSTALL)
1692 if test -n "$^"; then \
1693 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
1694 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
1695 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
1696 fi
1697
1698uninstall-gsettings-schemas:
1699 @$(NORMAL_UNINSTALL)
1700 @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
1701 files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
1702 test -n "$$files" || exit 0; \
1703 echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
1704 cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
1705 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
1706
1707clean-gsettings-schemas:
1708 rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
1709
1710ifdef gsettings_ENUM_NAMESPACE
1711$(gsettings__enum_file): $(gsettings_ENUM_FILES)
1712 $(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>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@
1713endif
1714'
1715 _GSETTINGS_SUBST(GSETTINGS_RULES)
1716])
1717
1718dnl _GSETTINGS_SUBST(VARIABLE)
1719dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1720AC_DEFUN([_GSETTINGS_SUBST],
1721[
1722AC_SUBST([$1])
1723m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1724]
1725)
1726
1725m4_include([m4/intltool.m4])1727m4_include([m4/intltool.m4])
17261728
=== modified file 'configure'
--- configure 2010-11-05 17:22:35 +0000
+++ configure 2010-11-17 17:44:38 +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.66 for gsettings-desktop-schemas 0.1.0.3# Generated by GNU Autoconf 2.67 for gsettings-desktop-schemas 0.1.1.
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#
@@ -553,8 +553,8 @@
553# Identity of this package.553# Identity of this package.
554PACKAGE_NAME='gsettings-desktop-schemas'554PACKAGE_NAME='gsettings-desktop-schemas'
555PACKAGE_TARNAME='gsettings-desktop-schemas'555PACKAGE_TARNAME='gsettings-desktop-schemas'
556PACKAGE_VERSION='0.1.0'556PACKAGE_VERSION='0.1.1'
557PACKAGE_STRING='gsettings-desktop-schemas 0.1.0'557PACKAGE_STRING='gsettings-desktop-schemas 0.1.1'
558PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'558PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'
559PACKAGE_URL=''559PACKAGE_URL=''
560560
@@ -755,8 +755,7 @@
755LDFLAGS755LDFLAGS
756LIBS756LIBS
757CPPFLAGS757CPPFLAGS
758CPP758CPP'
759CPPFLAGS'
760759
761760
762# Initialize some variables set by options.761# Initialize some variables set by options.
@@ -819,8 +818,9 @@
819 fi818 fi
820819
821 case $ac_option in820 case $ac_option in
822 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;821 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
823 *) ac_optarg=yes ;;822 *=) ac_optarg= ;;
823 *) ac_optarg=yes ;;
824 esac824 esac
825825
826 # Accept the important Cygnus configure options, so we can diagnose typos.826 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1298,7 +1298,7 @@
1298 # Omit some internal or obsolete options to make the list less imposing.1298 # 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.1299 # This message is too long to be a string in the A/UX 3.1 sh.
1300 cat <<_ACEOF1300 cat <<_ACEOF
1301\`configure' configures gsettings-desktop-schemas 0.1.0 to adapt to many kinds of systems.1301\`configure' configures gsettings-desktop-schemas 0.1.1 to adapt to many kinds of systems.
13021302
1303Usage: $0 [OPTION]... [VAR=VALUE]...1303Usage: $0 [OPTION]... [VAR=VALUE]...
13041304
@@ -1365,7 +1365,7 @@
13651365
1366if test -n "$ac_init_help"; then1366if test -n "$ac_init_help"; then
1367 case $ac_init_help in1367 case $ac_init_help in
1368 short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.0:";;1368 short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.1:";;
1369 esac1369 esac
1370 cat <<\_ACEOF1370 cat <<\_ACEOF
13711371
@@ -1464,8 +1464,8 @@
1464test -n "$ac_init_help" && exit $ac_status1464test -n "$ac_init_help" && exit $ac_status
1465if $ac_init_version; then1465if $ac_init_version; then
1466 cat <<\_ACEOF1466 cat <<\_ACEOF
1467gsettings-desktop-schemas configure 0.1.01467gsettings-desktop-schemas configure 0.1.1
1468generated by GNU Autoconf 2.661468generated by GNU Autoconf 2.67
14691469
1470Copyright (C) 2010 Free Software Foundation, Inc.1470Copyright (C) 2010 Free Software Foundation, Inc.
1471This configure script is free software; the Free Software Foundation1471This configure script is free software; the Free Software Foundation
@@ -1537,7 +1537,7 @@
1537 mv -f conftest.er1 conftest.err1537 mv -f conftest.er1 conftest.err
1538 fi1538 fi
1539 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&51539 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1540 test $ac_status = 0; } >/dev/null && {1540 test $ac_status = 0; } > conftest.i && {
1541 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||1541 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1542 test ! -s conftest.err1542 test ! -s conftest.err
1543 }; then :1543 }; then :
@@ -1642,7 +1642,7 @@
1642else1642else
1643 ac_header_preproc=no1643 ac_header_preproc=no
1644fi1644fi
1645rm -f conftest.err conftest.$ac_ext1645rm -f conftest.err conftest.i conftest.$ac_ext
1646{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&51646{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1647$as_echo "$ac_header_preproc" >&6; }1647$as_echo "$ac_header_preproc" >&6; }
16481648
@@ -1833,8 +1833,8 @@
1833This file contains any messages produced by compilers while1833This file contains any messages produced by compilers while
1834running configure, to aid debugging if configure makes a mistake.1834running configure, to aid debugging if configure makes a mistake.
18351835
1836It was created by gsettings-desktop-schemas $as_me 0.1.0, which was1836It was created by gsettings-desktop-schemas $as_me 0.1.1, which was
1837generated by GNU Autoconf 2.66. Invocation command line was1837generated by GNU Autoconf 2.67. Invocation command line was
18381838
1839 $ $0 $@1839 $ $0 $@
18401840
@@ -2092,7 +2092,7 @@
2092 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&52092 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2093$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}2093$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2094as_fn_error $? "failed to load site script $ac_site_file2094as_fn_error $? "failed to load site script $ac_site_file
2095See \`config.log' for more details" "$LINENO" 5; }2095See \`config.log' for more details" "$LINENO" 5 ; }
2096 fi2096 fi
2097done2097done
20982098
@@ -2317,11 +2317,11 @@
2317'2317'
2318case `pwd` in2318case `pwd` in
2319 *[\\\"\#\$\&\'\`$am_lf]*)2319 *[\\\"\#\$\&\'\`$am_lf]*)
2320 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;2320 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
2321esac2321esac
2322case $srcdir in2322case $srcdir in
2323 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)2323 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2324 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;2324 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
2325esac2325esac
23262326
2327# Do `set' in a subshell so we don't clobber the current shell's2327# Do `set' in a subshell so we don't clobber the current shell's
@@ -2649,7 +2649,7 @@
26492649
2650# Define the identity of the package.2650# Define the identity of the package.
2651 PACKAGE='gsettings-desktop-schemas'2651 PACKAGE='gsettings-desktop-schemas'
2652 VERSION='0.1.0'2652 VERSION='0.1.1'
26532653
26542654
2655cat >>confdefs.h <<_ACEOF2655cat >>confdefs.h <<_ACEOF
@@ -2807,7 +2807,7 @@
2807 enableval=$enable_schemas_compile; case ${enableval} in2807 enableval=$enable_schemas_compile; case ${enableval} in
2808 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;2808 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
2809 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;2809 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
2810 *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;2810 *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
2811 esac2811 esac
2812fi2812fi
28132813
@@ -3002,9 +3002,11 @@
30023002
3003install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)3003install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
3004 @$(NORMAL_INSTALL)3004 @$(NORMAL_INSTALL)
3005 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"3005 if test -n "$^"; then \
3006 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"3006 test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
3007 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)3007 $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
3008 test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
3009 fi
30083010
3009uninstall-gsettings-schemas:3011uninstall-gsettings-schemas:
3010 @$(NORMAL_UNINSTALL)3012 @$(NORMAL_UNINSTALL)
@@ -3395,7 +3397,7 @@
3395test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53397test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3396$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3398$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3397as_fn_error $? "no acceptable C compiler found in \$PATH3399as_fn_error $? "no acceptable C compiler found in \$PATH
3398See \`config.log' for more details" "$LINENO" 5; }3400See \`config.log' for more details" "$LINENO" 5 ; }
33993401
3400# Provide some information about the compiler.3402# Provide some information about the compiler.
3401$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&53403$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3510,7 +3512,7 @@
3510{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53512{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3511$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3513$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3512as_fn_error 77 "C compiler cannot create executables3514as_fn_error 77 "C compiler cannot create executables
3513See \`config.log' for more details" "$LINENO" 5; }3515See \`config.log' for more details" "$LINENO" 5 ; }
3514else3516else
3515 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&53517 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3516$as_echo "yes" >&6; }3518$as_echo "yes" >&6; }
@@ -3553,7 +3555,7 @@
3553 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53555 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3554$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3556$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3555as_fn_error $? "cannot compute suffix of executables: cannot compile and link3557as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3556See \`config.log' for more details" "$LINENO" 5; }3558See \`config.log' for more details" "$LINENO" 5 ; }
3557fi3559fi
3558rm -f conftest conftest$ac_cv_exeext3560rm -f conftest conftest$ac_cv_exeext
3559{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&53561{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3612,7 +3614,7 @@
3612$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3614$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3613as_fn_error $? "cannot run C compiled programs.3615as_fn_error $? "cannot run C compiled programs.
3614If you meant to cross compile, use \`--host'.3616If you meant to cross compile, use \`--host'.
3615See \`config.log' for more details" "$LINENO" 5; }3617See \`config.log' for more details" "$LINENO" 5 ; }
3616 fi3618 fi
3617 fi3619 fi
3618fi3620fi
@@ -3664,7 +3666,7 @@
3664{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53666{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3665$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3667$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3666as_fn_error $? "cannot compute suffix of object files: cannot compile3668as_fn_error $? "cannot compute suffix of object files: cannot compile
3667See \`config.log' for more details" "$LINENO" 5; }3669See \`config.log' for more details" "$LINENO" 5 ; }
3668fi3670fi
3669rm -f conftest.$ac_cv_objext conftest.$ac_ext3671rm -f conftest.$ac_cv_objext conftest.$ac_ext
3670fi3672fi
@@ -4054,7 +4056,7 @@
4054 # Broken: fails on valid input.4056 # Broken: fails on valid input.
4055continue4057continue
4056fi4058fi
4057rm -f conftest.err conftest.$ac_ext4059rm -f conftest.err conftest.i conftest.$ac_ext
40584060
4059 # OK, works on sane cases. Now check whether nonexistent headers4061 # OK, works on sane cases. Now check whether nonexistent headers
4060 # can be detected and how.4062 # can be detected and how.
@@ -4070,11 +4072,11 @@
4070ac_preproc_ok=:4072ac_preproc_ok=:
4071break4073break
4072fi4074fi
4073rm -f conftest.err conftest.$ac_ext4075rm -f conftest.err conftest.i conftest.$ac_ext
40744076
4075done4077done
4076# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.4078# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4077rm -f conftest.err conftest.$ac_ext4079rm -f conftest.i conftest.err conftest.$ac_ext
4078if $ac_preproc_ok; then :4080if $ac_preproc_ok; then :
4079 break4081 break
4080fi4082fi
@@ -4113,7 +4115,7 @@
4113 # Broken: fails on valid input.4115 # Broken: fails on valid input.
4114continue4116continue
4115fi4117fi
4116rm -f conftest.err conftest.$ac_ext4118rm -f conftest.err conftest.i conftest.$ac_ext
41174119
4118 # OK, works on sane cases. Now check whether nonexistent headers4120 # OK, works on sane cases. Now check whether nonexistent headers
4119 # can be detected and how.4121 # can be detected and how.
@@ -4129,18 +4131,18 @@
4129ac_preproc_ok=:4131ac_preproc_ok=:
4130break4132break
4131fi4133fi
4132rm -f conftest.err conftest.$ac_ext4134rm -f conftest.err conftest.i conftest.$ac_ext
41334135
4134done4136done
4135# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.4137# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4136rm -f conftest.err conftest.$ac_ext4138rm -f conftest.i conftest.err conftest.$ac_ext
4137if $ac_preproc_ok; then :4139if $ac_preproc_ok; then :
41384140
4139else4141else
4140 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&54142 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4141$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}4143$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4142as_fn_error $? "C preprocessor \"$CPP\" fails sanity check4144as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4143See \`config.log' for more details" "$LINENO" 5; }4145See \`config.log' for more details" "$LINENO" 5 ; }
4144fi4146fi
41454147
4146ac_ext=c4148ac_ext=c
@@ -6240,8 +6242,8 @@
6240# report actual input values of CONFIG_FILES etc. instead of their6242# report actual input values of CONFIG_FILES etc. instead of their
6241# values after options handling.6243# values after options handling.
6242ac_log="6244ac_log="
6243This file was extended by gsettings-desktop-schemas $as_me 0.1.0, which was6245This file was extended by gsettings-desktop-schemas $as_me 0.1.1, which was
6244generated by GNU Autoconf 2.66. Invocation command line was6246generated by GNU Autoconf 2.67. Invocation command line was
62456247
6246 CONFIG_FILES = $CONFIG_FILES6248 CONFIG_FILES = $CONFIG_FILES
6247 CONFIG_HEADERS = $CONFIG_HEADERS6249 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6297,8 +6299,8 @@
6297cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=16299cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6298ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"6300ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6299ac_cs_version="\\6301ac_cs_version="\\
6300gsettings-desktop-schemas config.status 0.1.06302gsettings-desktop-schemas config.status 0.1.1
6301configured by $0, generated by GNU Autoconf 2.66,6303configured by $0, generated by GNU Autoconf 2.67,
6302 with options \\"\$ac_cs_config\\"6304 with options \\"\$ac_cs_config\\"
63036305
6304Copyright (C) 2010 Free Software Foundation, Inc.6306Copyright (C) 2010 Free Software Foundation, Inc.
@@ -6319,11 +6321,16 @@
6319while test $# != 06321while test $# != 0
6320do6322do
6321 case $1 in6323 case $1 in
6322 --*=*)6324 --*=?*)
6323 ac_option=`expr "X$1" : 'X\([^=]*\)='`6325 ac_option=`expr "X$1" : 'X\([^=]*\)='`
6324 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`6326 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
6325 ac_shift=:6327 ac_shift=:
6326 ;;6328 ;;
6329 --*=)
6330 ac_option=`expr "X$1" : 'X\([^=]*\)='`
6331 ac_optarg=
6332 ac_shift=:
6333 ;;
6327 *)6334 *)
6328 ac_option=$16335 ac_option=$1
6329 ac_optarg=$26336 ac_optarg=$2
@@ -6345,6 +6352,7 @@
6345 $ac_shift6352 $ac_shift
6346 case $ac_optarg in6353 case $ac_optarg in
6347 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;6354 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
6355 '') as_fn_error $? "missing file argument" ;;
6348 esac6356 esac
6349 as_fn_append CONFIG_FILES " '$ac_optarg'"6357 as_fn_append CONFIG_FILES " '$ac_optarg'"
6350 ac_need_defaults=false;;6358 ac_need_defaults=false;;
@@ -6419,7 +6427,7 @@
6419 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;6427 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
6420 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;6428 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
64216429
6422 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;6430 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
6423 esac6431 esac
6424done6432done
64256433
@@ -6626,7 +6634,7 @@
6626 esac6634 esac
6627 case $ac_mode$ac_tag in6635 case $ac_mode$ac_tag in
6628 :[FHL]*:*);;6636 :[FHL]*:*);;
6629 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;6637 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
6630 :[FH]-) ac_tag=-:-;;6638 :[FH]-) ac_tag=-:-;;
6631 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;6639 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
6632 esac6640 esac
@@ -6654,7 +6662,7 @@
6654 [\\/$]*) false;;6662 [\\/$]*) false;;
6655 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;6663 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
6656 esac ||6664 esac ||
6657 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;6665 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
6658 esac6666 esac
6659 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac6667 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
6660 as_fn_append ac_file_inputs " '$ac_f'"6668 as_fn_append ac_file_inputs " '$ac_f'"
@@ -6681,7 +6689,7 @@
66816689
6682 case $ac_tag in6690 case $ac_tag in
6683 *:-:* | *:-) cat >"$tmp/stdin" \6691 *:-:* | *:-) cat >"$tmp/stdin" \
6684 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;6692 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
6685 esac6693 esac
6686 ;;6694 ;;
6687 esac6695 esac
66886696
=== modified file 'configure.ac'
--- configure.ac 2010-11-05 17:22:35 +0000
+++ configure.ac 2010-11-17 17:44:38 +0000
@@ -1,5 +1,5 @@
1AC_PREREQ(2.53)1AC_PREREQ(2.53)
2AC_INIT([gsettings-desktop-schemas], [0.1.0],2AC_INIT([gsettings-desktop-schemas], [0.1.1],
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-11-05 17:22:35 +0000
+++ debian/changelog 2010-11-17 17:44:38 +0000
@@ -1,3 +1,10 @@
1gsettings-desktop-schemas (0.1.1-0ubuntu1) natty; urgency=low
2
3 * New upstream release:
4 - Misc schema updates
5
6 -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 17 Nov 2010 18:38:53 +0100
7
1gsettings-desktop-schemas (0.1.0-0ubuntu1) natty; urgency=low8gsettings-desktop-schemas (0.1.0-0ubuntu1) natty; urgency=low
29
3 * debian/control:10 * debian/control:
411
=== modified file 'schemas/gsettings-desktop-schemas.convert'
--- schemas/gsettings-desktop-schemas.convert 2010-11-05 17:22:35 +0000
+++ schemas/gsettings-desktop-schemas.convert 2010-11-17 17:44:38 +0000
@@ -47,7 +47,9 @@
47menubar-detachable = /desktop/gnome/interface/menubar_detachable47menubar-detachable = /desktop/gnome/interface/menubar_detachable
48toolbar-detachable = /desktop/gnome/interface/toolbar_detachable48toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
49toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size49toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
50cursor-blink = /desktop/gnome/interface/cursor_blink50# Disabled, as we want users to use the new default:
51# https://bugzilla.gnome.org/show_bug.cgi?id=634639
52# cursor-blink = /desktop/gnome/interface/cursor_blink
51cursor-blink-time = /desktop/gnome/interface/cursor_blink_time53cursor-blink-time = /desktop/gnome/interface/cursor_blink_time
52icon-theme = /desktop/gnome/interface/icon_theme54icon-theme = /desktop/gnome/interface/icon_theme
53gtk-theme = /desktop/gnome/interface/gtk_theme55gtk-theme = /desktop/gnome/interface/gtk_theme
5456
=== modified file 'schemas/org.gnome.desktop.interface.gschema.xml'
--- schemas/org.gnome.desktop.interface.gschema.xml 2010-11-05 17:22:35 +0000
+++ schemas/org.gnome.desktop.interface.gschema.xml 2010-11-17 17:44:38 +0000
@@ -88,6 +88,14 @@
88 Length of the cursor blink cycle, in milliseconds.88 Length of the cursor blink cycle, in milliseconds.
89 </description>89 </description>
90 </key>90 </key>
91 <key name="cursor-blink-timeout" type="i">
92 <range min="1" max="2147483647"/>
93 <default>10</default>
94 <summary>Cursor Blink Timeout</summary>
95 <description>
96 Time after which the cursor stops blinking, in seconds.
97 </description>
98 </key>
91 <key name="icon-theme" type="s">99 <key name="icon-theme" type="s">
92 <default>'gnome'</default>100 <default>'gnome'</default>
93 <summary>Icon Theme</summary>101 <summary>Icon Theme</summary>
@@ -190,7 +198,7 @@
190 </description>198 </description>
191 </key>199 </key>
192 <key name="cursor-theme" type="s">200 <key name="cursor-theme" type="s">
193 <default>'dmz-aa'</default>201 <default>'Adwaita'</default>
194 <summary>Cursor theme</summary>202 <summary>Cursor theme</summary>
195 <description>Cursor theme name. Used only by Xservers that support the Xcursor extension.</description>203 <description>Cursor theme name. Used only by Xservers that support the Xcursor extension.</description>
196 </key>204 </key>

Subscribers

People subscribed via source and target branches

to all changes: