diff -Nru mutter-3.11.91+git20140314.4f9872c0/aclocal.m4 mutter-3.12.2/aclocal.m4 --- mutter-3.11.91+git20140314.4f9872c0/aclocal.m4 2014-03-16 09:39:10.000000000 +0000 +++ mutter-3.12.2/aclocal.m4 2014-05-14 08:27:50.000000000 +0000 @@ -20,2190 +20,2245 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) - PKG_PROG_PKG_CONFIG([0.16]) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - no_glib="" +# AM_AUX_DIR_EXPAND -*- Autoconf -*- - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi +# AM_CONDITIONAL -*- Autoconf -*- - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -int -main () -{ - unsigned int major, minor, micro; +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - fclose (fopen ("conf.glibtest", "w")); - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - AC_SUBST(GLIB_COMPILE_RESOURCES) - rm -f conf.glibtest -]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) - gt_cv_have_gettext=no +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" + break fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas -mostlyclean-am: clean-gsettings-schemas +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +# Generate code to set up dependency tracking. -*- Autoconf -*- -.SECONDARY: $(gsettings_SCHEMAS) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 +# Do all the work for Automake. -*- Autoconf -*- -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. - AC_MSG_CHECKING([for gobject-introspection]) +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi - AC_MSG_RESULT([$found_introspection]) +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -AC_PREREQ([2.50]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +# Check to see how 'make' treats includes. -*- Autoconf -*- -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) +# Helper functions for option handling. -*- Autoconf -*- -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -$$1_PKG_ERRORS +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -# AM_AUX_DIR_EXPAND -*- Autoconf -*- + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# Check how to create a tarball. -*- Autoconf -*- -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) else - break + AC_MSG_RESULT([no]) + _am_tools=none fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= + none) + am__tar=false + am__tar_=false + am__untar=false ;; - none) break ;; esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi done - - cd .. rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) +AC_PREREQ([2.50]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# AM_OUTPUT_DEPENDENCY_COMMANDS +# _PKG_SHORT_ERRORS_SUPPORTED # ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +pkg_failed=no +AC_MSG_CHECKING([for $1]) -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +$$1_PKG_ERRORS -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: +_PKG_TEXT -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. + no_glib="" -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no fi -fi]) -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include -# Copyright (C) 2003-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +int +main () +{ + unsigned int major, minor, micro; -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) + fclose (fopen ("conf.glibtest", "w")); -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } -# Copyright (C) 1996-2013 Free Software Foundation, Inc. + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) + +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# Check to see how 'make' treats includes. -*- Autoconf -*- +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf +AC_SUBST($1)dnl ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + gt_cv_have_gettext=no -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# Helper functions for option handling. -*- Autoconf -*- + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + # We need to process the po/ directory. + POSUB=po -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break + fi + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! + localedir=`eval echo "${datadir}/locale"` fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +.SECONDARY: $(gsettings_SCHEMAS) -# Check how to create a tarball. -*- Autoconf -*- +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi -# Copyright (C) 2004-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl - [pax], - [], +# serial 1 - [m4_fatal([Unknown tar format])]) +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - AC_MSG_CHECKING([how to create a $1 tar archive]) + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} + AC_MSG_CHECKING([for gobject-introspection]) - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break + AC_MSG_RESULT([$found_introspection]) - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection fi - done - rm -rf conftest.dir + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) m4_include([m4/gtk-doc.m4]) m4_include([m4/intltool.m4]) diff -Nru mutter-3.11.91+git20140314.4f9872c0/config.guess mutter-3.12.2/config.guess --- mutter-3.11.91+git20140314.4f9872c0/config.guess 2014-03-16 09:39:13.000000000 +0000 +++ mutter-3.12.2/config.guess 2014-05-02 10:04:02.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2013-11-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; diff -Nru mutter-3.11.91+git20140314.4f9872c0/config.sub mutter-3.12.2/config.sub --- mutter-3.11.91+git20140314.4f9872c0/config.sub 2014-03-16 09:39:13.000000000 +0000 +++ mutter-3.12.2/config.sub 2014-05-02 10:04:02.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2013-10-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -324,7 +325,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +382,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -1006,7 +1008,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown diff -Nru mutter-3.11.91+git20140314.4f9872c0/configure mutter-3.12.2/configure --- mutter-3.11.91+git20140314.4f9872c0/configure 2014-03-16 09:39:11.000000000 +0000 +++ mutter-3.12.2/configure 2014-05-14 08:27:55.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mutter 3.11.91. +# Generated by GNU Autoconf 2.69 for mutter 3.12.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='mutter' PACKAGE_TARNAME='mutter' -PACKAGE_VERSION='3.11.91' -PACKAGE_STRING='mutter 3.11.91' +PACKAGE_VERSION='3.12.2' +PACKAGE_STRING='mutter 3.12.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=mutter' PACKAGE_URL='' @@ -1460,7 +1460,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mutter 3.11.91 to adapt to many kinds of systems. +\`configure' configures mutter 3.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1534,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mutter 3.11.91:";; + short | recursive ) echo "Configuration of mutter 3.12.2:";; esac cat <<\_ACEOF @@ -1685,7 +1685,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mutter configure 3.11.91 +mutter configure 3.12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2237,7 +2237,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mutter $as_me 3.11.91, which was +It was created by mutter $as_me 3.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3106,7 +3106,7 @@ # Define the identity of the package. PACKAGE='mutter' - VERSION='3.11.91' + VERSION='3.12.2' cat >>confdefs.h <<_ACEOF @@ -3378,8 +3378,8 @@ MUTTER_MAJOR_VERSION=3 -MUTTER_MINOR_VERSION=11 -MUTTER_MICRO_VERSION=91 +MUTTER_MINOR_VERSION=12 +MUTTER_MICRO_VERSION=2 MUTTER_PLUGIN_API_VERSION=3 @@ -7240,8 +7240,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -7639,6 +7638,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7677,11 +7680,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8771,19 +8774,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8802,10 +8798,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -10361,7 +10357,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10839,9 +10835,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -11063,7 +11056,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11240,7 +11233,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -11694,7 +11686,7 @@ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12531,6 +12523,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -12647,7 +12650,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12696,10 +12699,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12711,18 +12718,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -14522,7 +14517,7 @@ gsettings-desktop-schemas >= 3.7.3 xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 $CLUTTER_PACKAGE >= 1.15.90 - cogl-1.0 >= 1.15.6 + cogl-1.0 >= 1.17.1 upower-glib >= 0.99.0 gnome-desktop-3.0 " @@ -18211,7 +18206,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mutter $as_me 3.11.91, which was +This file was extended by mutter $as_me 3.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18277,7 +18272,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mutter config.status 3.11.91 +mutter config.status 3.12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20109,7 +20104,7 @@ " -MUTTER_MINOR_VERSION=11 +MUTTER_MINOR_VERSION=12 if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then stable_version=`expr $MUTTER_MINOR_VERSION - 1` echo "This is the UNSTABLE branch of mutter" diff -Nru mutter-3.11.91+git20140314.4f9872c0/configure.ac mutter-3.12.2/configure.ac --- mutter-3.11.91+git20140314.4f9872c0/configure.ac 2014-03-16 09:38:51.000000000 +0000 +++ mutter-3.12.2/configure.ac 2014-05-14 08:27:24.000000000 +0000 @@ -2,8 +2,8 @@ AC_CONFIG_MACRO_DIR([m4]) m4_define([mutter_major_version], [3]) -m4_define([mutter_minor_version], [11]) -m4_define([mutter_micro_version], [91]) +m4_define([mutter_minor_version], [12]) +m4_define([mutter_micro_version], [2]) m4_define([mutter_version], [mutter_major_version.mutter_minor_version.mutter_micro_version]) @@ -76,7 +76,7 @@ gsettings-desktop-schemas >= 3.7.3 xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 $CLUTTER_PACKAGE >= 1.15.90 - cogl-1.0 >= 1.15.6 + cogl-1.0 >= 1.17.1 upower-glib >= 0.99.0 gnome-desktop-3.0 " diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/changelog mutter-3.12.2/debian/changelog --- mutter-3.11.91+git20140314.4f9872c0/debian/changelog 2014-03-16 09:42:23.000000000 +0000 +++ mutter-3.12.2/debian/changelog 2014-05-15 22:15:44.000000000 +0000 @@ -1,10 +1,35 @@ -mutter (3.11.91+git20140314.4f9872c0-0ubuntu1~14.04~ricotz0) trusty; urgency=medium +mutter (3.12.2-0ubuntu1~trusty1) trusty; urgency=medium - * New git snapshot + * New upstream release + * debian/watch: watch for stable releases + + -- Tim Lunn Fri, 16 May 2014 08:12:29 +1000 + +mutter (3.12.1-0ubuntu1~trusty1) trusty; urgency=medium + + * New upstream release + + -- Tim Lunn Sun, 27 Apr 2014 11:09:07 +1000 + +mutter (3.12.0-0ubuntu1~trusty1) trusty; urgency=medium + + * New upstream release + + [ Sjoerd Simons ] + * debian/patches/prevent-double-lock-deadlock.patch: + + Added. Don't call X functions that lock the display in code paths that + have already locked the display if X threads have been initialized + (bgo#704101) + + -- Tim Lunn Tue, 01 Apr 2014 11:15:16 +1100 + +mutter (3.11.92-0ubuntu1~trusty1) trusty; urgency=medium + + * New upstream release - -- Rico Tzschichholz Sun, 16 Mar 2014 10:42:23 +0100 + -- Tim Lunn Sat, 22 Mar 2014 12:56:32 +1100 -mutter (3.11.90-0ubuntu1~trusty1) trusty; urgency=medium +mutter (3.11.90-0ubuntu1~trusty2) trusty; urgency=medium * New upstream release diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/patches/git_revert_cogl_changes-001.patch mutter-3.12.2/debian/patches/git_revert_cogl_changes-001.patch --- mutter-3.11.91+git20140314.4f9872c0/debian/patches/git_revert_cogl_changes-001.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.12.2/debian/patches/git_revert_cogl_changes-001.patch 2014-01-18 04:23:06.000000000 +0000 @@ -0,0 +1,129 @@ +From 4af04ae6fa9d514973fb07b4f347650d46cb42cf Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Sat, 18 Jan 2014 15:11:56 +1100 +Subject: [PATCH 1/2] Revert "Properly set the number of components on the + CoglTextureRectangle" + +This reverts commit 3548e6da7323a69a446d92369fd5cce78a2c9336. +--- + src/compositor/meta-texture-rectangle.c | 30 ++++++++++++++++++++++++++++++ + src/compositor/meta-texture-rectangle.h | 7 +++++++ + src/compositor/meta-texture-tower.c | 12 ++++++++---- + src/compositor/meta-window-actor.c | 15 +++------------ + 4 files changed, 48 insertions(+), 16 deletions(-) + +diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c +index cd585b5..450155d 100644 +--- a/src/compositor/meta-texture-rectangle.c ++++ b/src/compositor/meta-texture-rectangle.c +@@ -26,6 +26,36 @@ + #include + #include "meta-texture-rectangle.h" + ++CoglTexture * ++meta_texture_rectangle_new (unsigned int width, ++ unsigned int height, ++ CoglPixelFormat format, ++ unsigned int rowstride, ++ const guint8 *data) ++{ ++ ClutterBackend *backend = ++ clutter_get_default_backend (); ++ CoglContext *context = ++ clutter_backend_get_cogl_context (backend); ++ CoglTextureRectangle *tex_rect; ++ ++ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height); ++ if (tex_rect == NULL) ++ return NULL; ++ ++ if (data) ++ cogl_texture_set_region (COGL_TEXTURE (tex_rect), ++ 0, 0, /* src_x/y */ ++ 0, 0, /* dst_x/y */ ++ width, height, /* dst_width/height */ ++ width, height, /* width/height */ ++ format, ++ rowstride, ++ data); ++ ++ return COGL_TEXTURE (tex_rect); ++} ++ + static void + texture_rectangle_check_cb (CoglTexture *sub_texture, + const float *sub_texture_coords, +diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h +index ba2624f..7b84229 100644 +--- a/src/compositor/meta-texture-rectangle.h ++++ b/src/compositor/meta-texture-rectangle.h +@@ -28,6 +28,13 @@ + + G_BEGIN_DECLS + ++CoglTexture * ++meta_texture_rectangle_new (unsigned int width, ++ unsigned int height, ++ CoglPixelFormat format, ++ unsigned int rowstride, ++ const guint8 *data); ++ + gboolean + meta_texture_rectangle_check (CoglTexture *texture); + +diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c +index 5d82add..019aaf4 100644 +--- a/src/compositor/meta-texture-tower.c ++++ b/src/compositor/meta-texture-tower.c +@@ -359,10 +359,14 @@ texture_tower_create_texture (MetaTextureTower *tower, + if ((!is_power_of_two (width) || !is_power_of_two (height)) && + meta_texture_rectangle_check (tower->textures[level - 1])) + { +- ClutterBackend *backend = clutter_get_default_backend (); +- CoglContext *context = clutter_backend_get_cogl_context (backend); +- +- tower->textures[level] = cogl_texture_rectangle_new_with_size (context, width, height); ++ tower->textures[level] = ++ meta_texture_rectangle_new (width, height, ++ /* data format */ ++ TEXTURE_FORMAT, ++ /* rowstride */ ++ width * 4, ++ /* data */ ++ NULL); + } + else + { +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 28d644c..af7899a 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -2101,18 +2101,9 @@ build_and_scan_frame_mask (MetaWindowActor *self, + + if (meta_texture_rectangle_check (paint_tex)) + { +- ClutterBackend *backend = clutter_get_default_backend (); +- CoglContext *context = clutter_backend_get_cogl_context (backend); +- +- mask_texture = COGL_TEXTURE (cogl_texture_rectangle_new_with_size (context, tex_width, tex_height)); +- cogl_texture_set_components (mask_texture, COGL_TEXTURE_COMPONENTS_A); +- cogl_texture_set_region (mask_texture, +- 0, 0, /* src_x/y */ +- 0, 0, /* dst_x/y */ +- tex_width, tex_height, /* dst_width/height */ +- tex_width, tex_height, /* width/height */ +- COGL_PIXEL_FORMAT_A_8, +- stride, mask_data); ++ mask_texture = meta_texture_rectangle_new (tex_width, tex_height, ++ COGL_PIXEL_FORMAT_A_8, ++ stride, mask_data); + } + else + { +-- +1.8.5.3 + + + + + diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/patches/git_revert_cogl_changes-002.patch mutter-3.12.2/debian/patches/git_revert_cogl_changes-002.patch --- mutter-3.11.91+git20140314.4f9872c0/debian/patches/git_revert_cogl_changes-002.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.12.2/debian/patches/git_revert_cogl_changes-002.patch 2014-01-18 04:23:06.000000000 +0000 @@ -0,0 +1,122 @@ +From 6fcc6a8d59fe4c6d6a9f4582dd8c4fe17c8afca4 Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Sat, 18 Jan 2014 15:12:09 +1100 +Subject: [PATCH 2/2] Revert "Update for Cogl API breaks" + +This reverts commit d2a1db8834bf0a9007bf6924b006a6f2c94ce88d. +--- + configure.ac | 2 +- + src/compositor/meta-texture-rectangle.c | 9 +++++++-- + src/compositor/meta-texture-rectangle.h | 4 +++- + src/compositor/meta-texture-tower.c | 4 ++++ + src/compositor/meta-window-actor.c | 5 ++++- + src/core/meta-cursor-tracker.c | 1 + + 6 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 621f76b..95912ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,7 +76,7 @@ MUTTER_PC_MODULES=" + gsettings-desktop-schemas >= 3.7.3 + xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 + $CLUTTER_PACKAGE >= 1.15.90 +- cogl-1.0 >= 1.17.1 ++ cogl-1.0 >= 1.15.6 + upower-glib >= 0.99.0 + gnome-desktop-3.0 + " +diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c +index 450155d..3fc9430 100644 +--- a/src/compositor/meta-texture-rectangle.c ++++ b/src/compositor/meta-texture-rectangle.c +@@ -30,8 +30,10 @@ CoglTexture * + meta_texture_rectangle_new (unsigned int width, + unsigned int height, + CoglPixelFormat format, ++ CoglPixelFormat internal_format, + unsigned int rowstride, +- const guint8 *data) ++ const guint8 *data, ++ GError **error) + { + ClutterBackend *backend = + clutter_get_default_backend (); +@@ -39,7 +41,10 @@ meta_texture_rectangle_new (unsigned int width, + clutter_backend_get_cogl_context (backend); + CoglTextureRectangle *tex_rect; + +- tex_rect = cogl_texture_rectangle_new_with_size (context, width, height); ++ tex_rect = cogl_texture_rectangle_new_with_size (context, ++ width, height, ++ internal_format, ++ error); + if (tex_rect == NULL) + return NULL; + +diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h +index 7b84229..30f60d3 100644 +--- a/src/compositor/meta-texture-rectangle.h ++++ b/src/compositor/meta-texture-rectangle.h +@@ -32,8 +32,10 @@ CoglTexture * + meta_texture_rectangle_new (unsigned int width, + unsigned int height, + CoglPixelFormat format, ++ CoglPixelFormat internal_format, + unsigned int rowstride, +- const guint8 *data); ++ const guint8 *data, ++ GError **error); + + gboolean + meta_texture_rectangle_check (CoglTexture *texture); +diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c +index 019aaf4..9a30de0 100644 +--- a/src/compositor/meta-texture-tower.c ++++ b/src/compositor/meta-texture-tower.c +@@ -363,9 +363,13 @@ texture_tower_create_texture (MetaTextureTower *tower, + meta_texture_rectangle_new (width, height, + /* data format */ + TEXTURE_FORMAT, ++ /* internal cogl format */ ++ TEXTURE_FORMAT, + /* rowstride */ + width * 4, + /* data */ ++ NULL, ++ /* error */ + NULL); + } + else +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index af7899a..d0240ba 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -2103,7 +2103,10 @@ build_and_scan_frame_mask (MetaWindowActor *self, + { + mask_texture = meta_texture_rectangle_new (tex_width, tex_height, + COGL_PIXEL_FORMAT_A_8, +- stride, mask_data); ++ COGL_PIXEL_FORMAT_A_8, ++ stride, ++ mask_data, ++ NULL /* error */); + } + else + { +diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c +index 84f3185..d1b365e 100644 +--- a/src/core/meta-cursor-tracker.c ++++ b/src/core/meta-cursor-tracker.c +@@ -307,6 +307,7 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker) + cursor_image->width, + cursor_image->height, + CLUTTER_CAIRO_FORMAT_ARGB32, ++ COGL_PIXEL_FORMAT_ANY, + cursor_image->width * 4, /* stride */ + cursor_data, + NULL); +-- +1.8.5.3 + + diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/patches/prevent-double-lock-deadlock.patch mutter-3.12.2/debian/patches/prevent-double-lock-deadlock.patch --- mutter-3.11.91+git20140314.4f9872c0/debian/patches/prevent-double-lock-deadlock.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.12.2/debian/patches/prevent-double-lock-deadlock.patch 2014-04-01 00:15:49.000000000 +0000 @@ -0,0 +1,15 @@ +--- a/src/core/window.c ++++ b/src/core/window.c +@@ -9566,7 +9566,11 @@ + * GDK will handle later these events, and eventually + * free the cookie data itself. + */ +- XGetEventData (display, &ev->xcookie); ++ /* We do NOT call XGetEventData (display, &ev->xcookie); here ++ because we're not supposed to call X functions from within a predicate. ++ XGetEventData has a lock, which fails as XCheckIfEvent has ++ already locked. */ ++ _XFetchEventCookie(display, &ev->xcookie); + xev = (XIEvent *) ev->xcookie.data; + + if (xev->evtype != XI_Motion) diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/patches/series mutter-3.12.2/debian/patches/series --- mutter-3.11.91+git20140314.4f9872c0/debian/patches/series 2014-03-16 09:42:23.000000000 +0000 +++ mutter-3.12.2/debian/patches/series 2014-04-01 00:16:06.000000000 +0000 @@ -1,2 +1,5 @@ +git_revert_cogl_changes-001.patch +git_revert_cogl_changes-002.patch 01_Wcast-align.patch 04_ignore_shadow_and_padding.patch +prevent-double-lock-deadlock.patch diff -Nru mutter-3.11.91+git20140314.4f9872c0/debian/watch mutter-3.12.2/debian/watch --- mutter-3.11.91+git20140314.4f9872c0/debian/watch 2014-03-16 09:42:23.000000000 +0000 +++ mutter-3.12.2/debian/watch 2014-05-15 22:14:57.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/mutter/([\d\.]+)/mutter-(.*)\.tar\.xz +http://ftp.gnome.org/pub/GNOME/sources/mutter/([\d\.]+[02468])/mutter-(.*)\.tar\.xz diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/Makefile.in mutter-3.12.2/doc/Makefile.in --- mutter-3.11.91+git20140314.4f9872c0/doc/Makefile.in 2014-03-16 09:39:13.000000000 +0000 +++ mutter-3.12.2/doc/Makefile.in 2014-05-14 08:27:53.000000000 +0000 @@ -383,9 +383,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/man/Makefile.in mutter-3.12.2/doc/man/Makefile.in --- mutter-3.11.91+git20140314.4f9872c0/doc/man/Makefile.in 2014-03-16 09:39:13.000000000 +0000 +++ mutter-3.12.2/doc/man/Makefile.in 2014-05-14 08:27:53.000000000 +0000 @@ -352,9 +352,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/man/Makefile + $(AUTOMAKE) --foreign doc/man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/api-index-full.html mutter-3.12.2/doc/reference/html/api-index-full.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/api-index-full.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/api-index-full.html 2014-05-14 08:43:38.000000000 +0000 @@ -821,14 +821,6 @@
-MetaPlugin:debug-mode, object property in MetaPlugin -
-
-
-MetaPlugin:screen, object property in MetaPlugin -
-
-
MetaPluginClass, struct in MetaPlugin
@@ -1228,10 +1220,6 @@
-MetaScreen:keyboard-grabbed, object property in MetaScreen -
-
-
MetaScreen:n-workspaces, object property in MetaScreen
diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/index.html mutter-3.12.2/doc/reference/html/index.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/index.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/index.html 2014-05-14 08:43:38.000000000 +0000 @@ -15,7 +15,7 @@

- This document is for Mutter 3.11.91. + This document is for Mutter 3.12.2. The latest version of this documentation can be found on-line at http://developer.gnome.org/meta/.

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/index.sgml mutter-3.12.2/doc/reference/html/index.sgml --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/index.sgml 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/index.sgml 2014-05-14 08:43:37.000000000 +0000 @@ -165,7 +165,6 @@ - @@ -190,9 +189,6 @@ - - - @@ -469,7 +465,6 @@ - diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaBackgroundActor.html mutter-3.12.2/doc/reference/html/MetaBackgroundActor.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaBackgroundActor.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/MetaBackgroundActor.html 2014-05-14 08:43:38.000000000 +0000 @@ -54,9 +54,9 @@

Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── ClutterActor
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── ClutterActor
             ╰── MetaBackgroundActor
@@ -64,7 +64,7 @@

Implemented Interfaces

MetaBackgroundActor implements - ClutterContainer, ClutterScriptable, ClutterAnimatable, AtkImplementorIface and MetaCullable.

+ ClutterContainer, ClutterScriptable, ClutterAnimatable, AtkImplementorIface and MetaCullable.

Description

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaBarrier.html mutter-3.12.2/doc/reference/html/MetaBarrier.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaBarrier.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/MetaBarrier.html 2014-05-14 08:43:38.000000000 +0000 @@ -44,7 +44,7 @@ -gboolean +gboolean meta_barrier_is_active () @@ -90,22 +90,22 @@ Read / Write / Construct Only -gint +gint x1 Read / Write / Construct Only -gint +gint x2 Read / Write / Construct Only -gint +gint y1 Read / Write / Construct Only -gint +gint y2 Read / Write / Construct Only @@ -165,7 +165,7 @@

Object Hierarchy

    GBoxed
     ╰── MetaBarrierEvent
-    GObject
+    GObject
     ╰── MetaBarrier
@@ -176,7 +176,7 @@

Functions

meta_barrier_is_active ()

-
gboolean
+
gboolean
 meta_barrier_is_active (MetaBarrier *barrier);
@@ -344,16 +344,16 @@   -

gboolean released;

-

A boolean flag, TRUE if this event generated +

gboolean released;

+

A boolean flag, TRUE if this event generated by the pointer leaving the barrier as a result of a client calling meta_barrier_release() (will be set only for MetaBarrier::leave signals)

  -

gboolean grabbed;

-

A boolean flag, TRUE if the pointer was grabbed +

gboolean grabbed;

+

A boolean flag, TRUE if the pointer was grabbed at the time this event was sent

  @@ -380,7 +380,7 @@

The “x1” property

-
  “x1”                       gint
+
  “x1”                       gint

The first X coordinate of the barrier.

Flags: Read / Write / Construct Only

Allowed values: [0,32767]

@@ -389,7 +389,7 @@

The “x2” property

-
  “x2”                       gint
+
  “x2”                       gint

The second X coordinate of the barrier.

Flags: Read / Write / Construct Only

Allowed values: [0,32767]

@@ -398,7 +398,7 @@

The “y1” property

-
  “y1”                       gint
+
  “y1”                       gint

The first Y coordinate of the barrier.

Flags: Read / Write / Construct Only

Allowed values: [0,32767]

@@ -407,7 +407,7 @@

The “y2” property

-
  “y2”                       gint
+
  “y2”                       gint

The second Y coordinate of the barrier.

Flags: Read / Write / Construct Only

Allowed values: [0,32767]

@@ -421,7 +421,7 @@ 
void
 user_function (MetaBarrier      *barrier,
                MetaBarrierEvent *event,
-               gpointer          user_data)
+ gpointer user_data)

When a pointer barrier is hit, this will trigger. This requires an XI2-enabled server.

@@ -460,7 +460,7 @@ 
void
 user_function (MetaBarrier      *barrier,
                MetaBarrierEvent *event,
-               gpointer          user_data)
+ gpointer user_data)

When a pointer barrier hitbox was left, this will trigger. This requires an XI2-enabled server.

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Common.html mutter-3.12.2/doc/reference/html/meta-Common.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Common.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/meta-Common.html 2014-05-14 08:43:38.000000000 +0000 @@ -197,7 +197,7 @@ guint32 timestamp, MetaMenuOp op, int workspace, - gpointer user_data); + gpointer user_data);
@@ -1395,7 +1395,7 @@ [array fixed-size=10] -

gboolean left_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];

+

gboolean left_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];

.

[array fixed-size=10] @@ -1405,7 +1405,7 @@ [array fixed-size=10] -

gboolean right_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];

+

gboolean right_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];

.

[array fixed-size=10] @@ -1438,17 +1438,17 @@ -

GtkBorder visible;

+

GtkBorder visible;

inner visible portion of frame border

  -

GtkBorder invisible;

+

GtkBorder invisible;

outer invisible portion of frame border

  -

GtkBorder total;

+

GtkBorder total;

sum of the two borders above

  diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta.devhelp2 mutter-3.12.2/doc/reference/html/meta.devhelp2 --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta.devhelp2 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/meta.devhelp2 2014-05-14 08:43:37.000000000 +0000 @@ -180,8 +180,6 @@ - - @@ -365,7 +363,6 @@ - diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaDisplay.html mutter-3.12.2/doc/reference/html/MetaDisplay.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaDisplay.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/MetaDisplay.html 2014-05-14 08:43:38.000000000 +0000 @@ -66,7 +66,7 @@ -gboolean +gboolean meta_display_supports_extended_barriers () @@ -90,7 +90,7 @@ -GSList * +GSList * meta_display_get_screens () @@ -98,7 +98,7 @@ -gboolean +gboolean meta_display_has_shape () @@ -122,7 +122,7 @@ -gboolean +gboolean meta_display_xwindow_is_a_no_focus_window () @@ -146,7 +146,7 @@ -gboolean +gboolean meta_display_xserver_time_is_before () @@ -185,7 +185,7 @@ -GList * +GList * meta_display_get_tab_list () @@ -209,7 +209,7 @@ -gboolean +gboolean meta_display_begin_grab_op () @@ -233,7 +233,7 @@ -guint +guint meta_display_add_keybinding () @@ -241,7 +241,7 @@ -gboolean +gboolean meta_display_remove_keybinding () @@ -249,7 +249,7 @@ -guint +guint meta_display_get_keybinding_action () @@ -273,7 +273,7 @@ -GSList * +GSList * meta_display_sort_windows_by_stacking () @@ -355,7 +355,7 @@ Run Last -gboolean +gboolean modifiers-accelerator-activated Run Last @@ -411,7 +411,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaDisplay
@@ -458,7 +458,7 @@

meta_display_supports_extended_barriers ()

-
gboolean
+
gboolean
 meta_display_supports_extended_barriers
                                (MetaDisplay *display);

 

@@ -531,7 +531,7 @@
 

 

 
meta_display_get_screens ()

-
GSList *
+
GSList *
 meta_display_get_screens (MetaDisplay *display);

 

 
Parameters

@@ -557,7 +557,7 @@
 

 

 
meta_display_has_shape ()

-
gboolean
+
gboolean
 meta_display_has_shape (MetaDisplay *display);

 

 

@@ -591,7 +591,7 @@
 

 

 
Returns

-
 the screen for the specified root window ID, or NULL. 

+
 the screen for the specified root window ID, or NULL. 

 
[transfer none]

 

 

@@ -627,7 +627,7 @@
 

 

 
meta_display_xwindow_is_a_no_focus_window ()

-
gboolean
+
gboolean
 meta_display_xwindow_is_a_no_focus_window
                                (MetaDisplay *display,
                                 Window xwindow);

@@ -655,7 +655,7 @@
 

 

 
Returns

-
 TRUE iff window is one of mutter's internal "no focus" windows
+
 TRUE iff window is one of mutter's internal "no focus" windows
 (there is one per screen) which will have the focus when there is no
 actual client window focused.

 

@@ -676,7 +676,7 @@
 

 

 
meta_display_xserver_time_is_before ()

-
gboolean
+
gboolean
 meta_display_xserver_time_is_before (MetaDisplay *display,
                                      guint32 time1,
                                      guint32 time2);

@@ -787,7 +787,7 @@
 

 

 
meta_display_get_tab_list ()

-
GList *
+
GList *
 meta_display_get_tab_list (MetaDisplay *display,
                            MetaTabList type,
                            MetaScreen *screen,
@@ -795,7 +795,7 @@
 
Determine the list of windows that should be displayed for Alt-TAB
 functionality.  The windows are returned in most recently used order.
 If workspace
- is not NULL, the list only conains windows that are on
+ is not NULL, the list only conains windows that are on
 workspace
  or have the demands-attention hint set; otherwise it contains
 all windows on screen
@@ -847,7 +847,7 @@
                            MetaScreen *screen,
                            MetaWorkspace *workspace,
                            MetaWindow *window,
-                           gboolean backward);

+                           gboolean backward);

 
Determine the next window that should be displayed for Alt-TAB
 functionality.

 

@@ -886,7 +886,7 @@
 
 
 
backward

-
If TRUE, look for the previous window.  

+
If TRUE, look for the previous window.  

  
 
 
@@ -948,15 +948,15 @@
 

 

 
meta_display_begin_grab_op ()

-
gboolean
+
gboolean
 meta_display_begin_grab_op (MetaDisplay *display,
                             MetaScreen *screen,
                             MetaWindow *window,
                             MetaGrabOp op,
-                            gboolean pointer_already_grabbed,
-                            gboolean frame_action,
+                            gboolean pointer_already_grabbed,
+                            gboolean frame_action,
                             int button,
-                            gulong modmask,
+                            gulong modmask,
                             guint32 timestamp,
                             int root_x,
                             int root_y);

@@ -1001,18 +1001,18 @@
 

 

 
meta_display_add_keybinding ()

-
guint
+
guint
 meta_display_add_keybinding (MetaDisplay *display,
                              const char *name,
-                             GSettings *settings,
+                             GSettings *settings,
                              MetaKeyBindingFlags flags,
                              MetaKeyHandlerFunc handler,
-                             gpointer user_data,
-                             GDestroyNotify free_data);

+                             gpointer user_data,
+                             GDestroyNotify free_data);

 
Add a keybinding at runtime. The key name
  in schema
  needs to be of
-type G_VARIANT_TYPE_STRING_ARRAY, with each string describing a
+type G_VARIANT_TYPE_STRING_ARRAY, with each string describing a
 keybinding in the form of "<Control>a" or "<Shift><Alt>F1". The parser
 is fairly liberal and allows lower or upper case, and also abbreviations
 such as "<Ctl>" and "<Ctrl>". If the key is set to the empty list or a
@@ -1046,7 +1046,7 @@
 
 
 
settings

-
the GSettings object where name
+
the GSettings object where name
 is stored

  
 
@@ -1085,7 +1085,7 @@
 

 

 
meta_display_remove_keybinding ()

-
gboolean
+
gboolean
 meta_display_remove_keybinding (MetaDisplay *display,
                                 const char *name);

 
Remove keybinding name
@@ -1116,15 +1116,15 @@
 

 

 
Returns

-
 TRUE if the binding has been removed sucessfully,
-otherwise FALSE

+
 TRUE if the binding has been removed sucessfully,
+otherwise FALSE

 

 

 

 

 

 
meta_display_get_keybinding_action ()

-
guint
+
guint
 meta_display_get_keybinding_action (MetaDisplay *display,
                                     unsigned int keycode,
                                     unsigned long  mask);

@@ -1173,7 +1173,7 @@
 
void
 meta_display_set_input_focus_window (MetaDisplay *display,
                                      MetaWindow *window,
-                                     gboolean focus_frame,
+                                     gboolean focus_frame,
                                      guint32 timestamp);

 

 

@@ -1188,9 +1188,9 @@
 

 

 
meta_display_sort_windows_by_stacking ()

-
GSList *
+
GSList *
 meta_display_sort_windows_by_stacking (MetaDisplay *display,
-                                       GSList *windows);

+                                       GSList *windows);

 
Sorts a set of windows according to their current stacking order. If windows
 from multiple screens are present in the set of input windows, then all the
 windows on screen 0 are sorted below all the windows on screen 1, and so forth.
@@ -1304,7 +1304,7 @@
 
meta_display_clear_mouse_mode ()

 
void
 meta_display_clear_mouse_mode (MetaDisplay *display);

-
Sets the mouse-mode flag to FALSE, which means that motion events are
+
Sets the mouse-mode flag to FALSE, which means that motion events are
 no longer ignored in mouse or sloppy focus.
 This is an internal function. It should be used only for reimplementing
 keybindings, and only in a manner compatible with core code.

@@ -1426,10 +1426,10 @@
 
The “accelerator-activated” signal

 
void
 user_function (MetaDisplay *metadisplay,
-               guint        arg1,
-               guint        arg2,
-               guint        arg3,
-               gpointer     user_data)

+               guint        arg1,
+               guint        arg2,
+               guint        arg3,
+               gpointer     user_data)

 
Flags: Run Last

 

 

@@ -1440,7 +1440,7 @@
                MetaScreen  *arg1,
                MetaWindow  *arg2,
                MetaGrabOp   arg3,
-               gpointer     user_data)

+               gpointer     user_data)

Flags: Run Last

@@ -1451,15 +1451,15 @@ MetaScreen *arg1, MetaWindow *arg2, MetaGrabOp arg3, - gpointer user_data) + gpointer user_data)

Flags: Run Last

The “modifiers-accelerator-activated” signal

-
gboolean
+
gboolean
 user_function (MetaDisplay *display,
-               gpointer     user_data)

+               gpointer     user_data)

The ::modifiers-accelerator-activated signal will be emitted when a special modifiers-only keybinding is activated.

@@ -1486,8 +1486,8 @@

Returns

-

TRUE means that the keyboard device should remain -frozen and FALSE for the default behavior of unfreezing the +

TRUE means that the keyboard device should remain +frozen and FALSE for the default behavior of unfreezing the keyboard.

@@ -1498,7 +1498,7 @@

The “overlay-key” signal

void
 user_function (MetaDisplay *metadisplay,
-               gpointer     user_data)
+ gpointer user_data)

Flags: Run Last

@@ -1507,7 +1507,7 @@ 
void
 user_function (MetaDisplay *metadisplay,
                MetaWindow  *arg1,
-               gpointer     user_data)
+ gpointer user_data)

Flags: Run Last

@@ -1516,7 +1516,7 @@ 
void
 user_function (MetaDisplay *metadisplay,
                MetaWindow  *arg1,
-               gpointer     user_data)
+ gpointer user_data)

Flags: Run Last

@@ -1525,7 +1525,7 @@ 
void
 user_function (MetaDisplay *metadisplay,
                MetaWindow  *arg1,
-               gpointer     user_data)
+ gpointer user_data)

Flags: Run Last

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Gradients.html mutter-3.12.2/doc/reference/html/meta-Gradients.html --- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Gradients.html 2014-03-16 09:40:19.000000000 +0000 +++ mutter-3.12.2/doc/reference/html/meta-Gradients.html 2014-05-14 08:43:38.000000000 +0000 @@ -41,7 +41,7 @@ -GdkPixbuf * +GdkPixbuf * meta_gradient_create_simple () @@ -49,7 +49,7 @@ -GdkPixbuf * +GdkPixbuf * meta_gradient_create_multi () @@ -57,7 +57,7 @@ -GdkPixbuf * +GdkPixbuf * meta_gradient_create_interwoven () @@ -94,11 +94,11 @@

Functions

meta_gradient_create_simple ()

-
GdkPixbuf *
+
GdkPixbuf *
 meta_gradient_create_simple (int width,
                              int height,
-                             const GdkRGBA *from,
-                             const GdkRGBA *to,
+                             const GdkRGBA *from,
+                             const GdkRGBA *to,
                              MetaGradientType style);

 

 
Parameters

@@ -146,10 +146,10 @@
 

 

 
meta_gradient_create_multi ()

-
GdkPixbuf *
+
GdkPixbuf *
 meta_gradient_create_multi (int width,
                             int height,
-                            const GdkRGBA *colors,
+                            const GdkRGBA *colors,
                             int n_colors,
                             MetaGradientType style);

 

@@ -198,12 +198,12 @@
 

 

 
meta_gradient_create_interwoven ()

-
GdkPixbuf *
+
GdkPixbuf *
 meta_gradient_create_interwoven (int width,
                                  int height,
-                                 const GdkRGBA colors1[2],
+                                 const GdkRGBA colors1[2],
                                  int thickness1,
-                                 const GdkRGBA colors2[2],
+                                 const GdkRGBA colors2[2],
                                  int thickness2);

 
Interwoven essentially means we have two vertical gradients,
 cut into horizontal strips of the given thickness, and then the strips
@@ -256,8 +256,8 @@
 

 
meta_gradient_add_alpha ()

 
void
-meta_gradient_add_alpha (GdkPixbuf *pixbuf,
-                         const guchar *alphas,
+meta_gradient_add_alpha (GdkPixbuf *pixbuf,
+                         const guchar *alphas,
                          int n_alphas,
                          MetaGradientType type);

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Main.html mutter-3.12.2/doc/reference/html/meta-Main.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Main.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-Main.html	2014-05-14 08:43:38.000000000 +0000
@@ -41,7 +41,7 @@
 
 
 
-GOptionContext *
+GOptionContext *
 
 
 meta_get_option_context ()
@@ -65,7 +65,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_get_replace_current_wm ()
@@ -135,13 +135,13 @@
 
Functions

 

 
meta_get_option_context ()

-
GOptionContext *
+
GOptionContext *
 meta_get_option_context (void);

-
Returns a GOptionContext initialized with mutter-related options.
+
Returns a GOptionContext initialized with mutter-related options.
 Parse the command-line args with this before calling meta_init().

 

 
Returns

-
 the GOptionContext

+
 the GOptionContext

 

 

 

@@ -169,7 +169,7 @@
 

 

 
meta_get_replace_current_wm ()

-
gboolean
+
gboolean
 meta_get_replace_current_wm (void);

 

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaCompositor.html mutter-3.12.2/doc/reference/html/meta-MetaCompositor.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaCompositor.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-MetaCompositor.html	2014-05-14 08:43:38.000000000 +0000
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_compositor_process_event ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_compositor_filter_keybinding ()
@@ -201,7 +201,7 @@
 
 
 
-ClutterActor *
+ClutterActor *
 
 
 meta_get_stage_for_screen ()
@@ -217,7 +217,7 @@
 
 
 
-GList *
+GList *
 
 
 meta_get_window_actors ()
@@ -225,7 +225,7 @@
 
 
 
-ClutterActor *
+ClutterActor *
 
 
 meta_get_window_group_for_screen ()
@@ -233,7 +233,7 @@
 
 
 
-ClutterActor *
+ClutterActor *
 
 
 meta_get_top_window_group_for_screen ()
@@ -379,7 +379,7 @@
 

 

 
meta_compositor_process_event ()

-
gboolean
+
gboolean
 meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent *event,
                                MetaWindow *window);

@@ -387,7 +387,7 @@
 

 

 
meta_compositor_filter_keybinding ()

-
gboolean
+
gboolean
 meta_compositor_filter_keybinding (MetaCompositor *compositor,
                                    MetaScreen *screen,
                                    MetaKeyBinding *binding);

@@ -456,7 +456,7 @@
 
void
 meta_compositor_sync_window_geometry (MetaCompositor *compositor,
                                       MetaWindow *window,
-                                      gboolean did_placement);

+                                      gboolean did_placement);

 

 

 

@@ -464,7 +464,7 @@
 
void
 meta_compositor_set_updates_frozen (MetaCompositor *compositor,
                                     MetaWindow *window,
-                                    gboolean updates_frozen);

+                                    gboolean updates_frozen);

 

 

 

@@ -472,7 +472,7 @@
 
void
 meta_compositor_queue_frame_drawn (MetaCompositor *compositor,
                                    MetaWindow *window,
-                                   gboolean no_delay_frame);

+                                   gboolean no_delay_frame);

 

 

 

@@ -480,7 +480,7 @@
 
void
 meta_compositor_sync_stack (MetaCompositor *compositor,
                             MetaScreen *screen,
-                            GList *stack);

+                            GList *stack);

 

 

 

@@ -488,8 +488,8 @@
 
void
 meta_compositor_sync_screen_size (MetaCompositor *compositor,
                                   MetaScreen *screen,
-                                  guint width,
-                                  guint height);

+                                  guint width,
+                                  guint height);
@@ -501,7 +501,7 @@

meta_get_stage_for_screen ()

-
ClutterActor *
+
ClutterActor *
 meta_get_stage_for_screen (MetaScreen *screen);

 

 
Parameters

@@ -520,7 +520,7 @@
 

 

 
Returns

-
 The ClutterStage for the screen. 

+
 The ClutterStage for the screen. 

 
[transfer none]
@@ -548,7 +548,7 @@

meta_get_window_actors ()

-
GList *
+
GList *
 meta_get_window_actors (MetaScreen *screen);

 

 
Parameters

@@ -575,7 +575,7 @@
 

 

 
meta_get_window_group_for_screen ()

-
ClutterActor *
+
ClutterActor *
 meta_get_window_group_for_screen (MetaScreen *screen);

 

 
Parameters

@@ -602,7 +602,7 @@
 

 

 
meta_get_top_window_group_for_screen ()

-
ClutterActor *
+
ClutterActor *
 meta_get_top_window_group_for_screen (MetaScreen *screen);

 

 
Parameters

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaGroup.html mutter-3.12.2/doc/reference/html/meta-MetaGroup.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaGroup.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-MetaGroup.html	2014-05-14 08:43:38.000000000 +0000
@@ -81,7 +81,7 @@
 
 
 
-GSList *
+GSList *
 
 
 meta_group_list_windows ()
@@ -112,7 +112,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_group_property_notify ()
@@ -209,7 +209,7 @@
 

 

 
meta_group_list_windows ()

-
GSList *
+
GSList *
 meta_group_list_windows (MetaGroup *group);

 

 
Parameters

@@ -253,7 +253,7 @@
 

 

 
meta_group_property_notify ()

-
gboolean
+
gboolean
 meta_group_property_notify (MetaGroup *group,
                             XEvent *event);

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaKeybinding.html mutter-3.12.2/doc/reference/html/meta-MetaKeybinding.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-MetaKeybinding.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-MetaKeybinding.html	2014-05-14 08:43:38.000000000 +0000
@@ -61,7 +61,7 @@
 
 
 
-guint
+guint
 
 
 meta_key_binding_get_mask ()
@@ -69,7 +69,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_key_binding_is_builtin ()
@@ -77,7 +77,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_keybindings_set_custom_handler ()
@@ -93,7 +93,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_screen_grab_all_keys ()
@@ -146,23 +146,23 @@
 

 

 
meta_key_binding_get_mask ()

-
guint
+
guint
 meta_key_binding_get_mask (MetaKeyBinding *binding);

 

 

 

 
meta_key_binding_is_builtin ()

-
gboolean
+
gboolean
 meta_key_binding_is_builtin (MetaKeyBinding *binding);

 

 

 

 
meta_keybindings_set_custom_handler ()

-
gboolean
-meta_keybindings_set_custom_handler (const gchar *name,
+
gboolean
+meta_keybindings_set_custom_handler (const gchar *name,
                                      MetaKeyHandlerFunc handler,
-                                     gpointer user_data,
-                                     GDestroyNotify free_data);

+                                     gpointer user_data,
+                                     GDestroyNotify free_data);

 
Allows users to register a custom handler for a
 builtin key binding.

 

@@ -199,9 +199,9 @@
 

 

 
Returns

-
 TRUE if the binding known as name
+
 TRUE if the binding known as name
 was found,
-FALSE otherwise.

+FALSE otherwise.

 

 

 

@@ -215,7 +215,7 @@
 

 

 
meta_screen_grab_all_keys ()

-
gboolean
+
gboolean
 meta_screen_grab_all_keys (MetaScreen *screen,
                            guint32 timestamp);

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaPlugin.html mutter-3.12.2/doc/reference/html/MetaPlugin.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaPlugin.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaPlugin.html	2014-05-14 08:43:38.000000000 +0000
@@ -16,8 +16,7 @@
 
 Top  | 
                   Description  | 
-                  Object Hierarchy  | 
-                  Properties
+                  Object Hierarchy
 
 Home
 Up
@@ -43,7 +42,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_plugin_running ()
@@ -51,7 +50,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_plugin_debug_mode ()
@@ -120,7 +119,7 @@
 
 
 
-gboolean
+gboolean
 
 
 meta_plugin_begin_modal ()
@@ -154,29 +153,6 @@
 

 

 

-
Properties

-

-----
-
-
-
-
-
-
-
-
-
-
-
-
-





gbooleandebug-modeRead

-MetaScreen *screenRead / Write

-

-

 
Types and Values

 
@@ -209,7 +185,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaPlugin
 

 

@@ -220,13 +196,13 @@
 
Functions

 
meta_plugin_running ()

-
gboolean
+
gboolean
 meta_plugin_running (MetaPlugin *plugin);

 

 
meta_plugin_debug_mode ()

-
gboolean
+
gboolean
 meta_plugin_debug_mode (MetaPlugin *plugin);

 

@@ -285,7 +261,7 @@
 

 
meta_plugin_begin_modal ()

-
gboolean
+
gboolean
 meta_plugin_begin_modal (MetaPlugin *plugin,
                          MetaModalOptions options,
                          guint32 timestamp);

@@ -301,7 +277,7 @@
 allow using obscure features of XGrabPointer() and XGrabKeyboard() without
 having to add them to this API.

 

-
Parameters

+
Parameters

 

 

 
 
 
 
 
 
@@ -328,7 +304,7 @@
 

 
 


 

 

-
Returns

+
Returns

 
 whether we successfully grabbed the keyboard and
 mouse and made the plugin modal.

 

@@ -346,7 +322,7 @@
 META_MODAL_KEYBOARD_ALREADY_GRABBED were provided as options
 when beginnning the modal operation.

 

-
Parameters

+
Parameters

 
@@ -377,7 +353,7 @@
 is associated with exactly one screen; if Metacity is managing
 multiple screens, multiple plugin instances will be created.

-
Parameters

+
Parameters

 

 
 

 
@@ -392,7 +368,7 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the MetaScreen for the plugin. 

 
[transfer none]

 

@@ -401,7 +377,7 @@
 

 
meta_plugin_manager_set_plugin_type ()

 
void
-meta_plugin_manager_set_plugin_type (GType gtype);

+meta_plugin_manager_set_plugin_type (GType gtype);

 

 

 

@@ -572,7 +548,7 @@
 };
 

 

-
Members

+
Members

 
@@ -676,7 +652,7 @@
 };
 

-
Members

+
Members

 

 
 

 
@@ -685,27 +661,27 @@
 
-
+
-
+
-
+
-
+
-
+
@@ -735,7 +711,7 @@
 };
 

-
Members

+
Members

 

 
 

 
 
const gchar *name;
const gchar *name;

 
name of the plugin

  
 

 
const gchar *version;
const gchar *version;

 
version of the plugin

  
 

 
const gchar *author;
const gchar *author;

 
author of the plugin

  
 

 
const gchar *license;
const gchar *license;

 
license of the plugin

  
 

 
const gchar *description;
const gchar *description;

 
description of the plugin

  
 

 
@@ -744,22 +720,22 @@
 
-
+
-
+
-
+
-
+
@@ -772,7 +748,7 @@
 
enum MetaModalOptions
Options that can be provided when calling meta_plugin_begin_modal().

-
Members

+
Members

 

 
 

 
 
guint version_major;
guint version_major;

 
major component of the version number of Meta with which the plugin was compiled

  
 

 
guint version_minor;
guint version_minor;

 
minor component of the version number of Meta with which the plugin was compiled

  
 

 
guint version_micro;
guint version_micro;

 
micro component of the version number of Meta with which the plugin was compiled

  
 

 
guint version_api;
guint version_api;

 
version of the plugin API

  
 

 
 
@@ -801,23 +777,6 @@
 
-

-
Property Details

-

-
The “debug-mode” property

-
  “debug-mode”               gboolean

-
Debug Mode.

-
Flags: Read

-
Default value: FALSE

-

-

-

-
The “screen” property

-
  “screen”                   MetaScreen *

-
MetaScreen.

-
Flags: Read / Write

-

-

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Preferences.html mutter-3.12.2/doc/reference/html/meta-Preferences.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Preferences.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-Preferences.html	2014-05-14 08:43:38.000000000 +0000
@@ -96,7 +96,7 @@
 
 

-

 
 

 
 
 
 

 
-gint
+gint
 
 
 meta_prefs_get_mouse_button_resize ()
@@ -104,7 +104,7 @@
 

 

 
-gint
+gint
 
 
 meta_prefs_get_mouse_button_menu ()
@@ -128,7 +128,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_attach_modal_dialogs ()
@@ -136,7 +136,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_raise_on_click ()
@@ -150,7 +150,7 @@
 
 

 
const PangoFontDescription *
+const PangoFontDescription *
 
 
 meta_prefs_get_titlebar_font ()
@@ -166,7 +166,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_dynamic_workspaces ()
@@ -174,7 +174,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_disable_workarounds ()
@@ -182,7 +182,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_auto_raise ()
@@ -198,7 +198,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_focus_change_on_pointer_rest ()
@@ -206,7 +206,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_gnome_accessibility ()
@@ -214,7 +214,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_gnome_animations ()
@@ -222,7 +222,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_edge_tiling ()
@@ -230,7 +230,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_auto_maximize ()
@@ -308,7 +308,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_compositing_manager ()
@@ -316,7 +316,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_force_fullscreen ()
@@ -332,7 +332,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_workspaces_only_on_primary ()
@@ -348,7 +348,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_ignore_request_hide_titlebar ()
@@ -388,7 +388,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_get_visual_bell ()
@@ -396,7 +396,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_prefs_bell_is_audible ()
@@ -445,14 +445,14 @@
 
MetaPrefsChangedFunc ()

 
void
 (*MetaPrefsChangedFunc) (MetaPreference pref,
-                         gpointer user_data);

+                         gpointer user_data);
 
 

 

 
meta_prefs_add_listener ()

 
void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
-                         gpointer user_data);

+                         gpointer user_data);
 

 
Parameters

 

@@ -481,7 +481,7 @@
 
meta_prefs_remove_listener ()
void
 meta_prefs_remove_listener (MetaPrefsChangedFunc func,
-                            gpointer user_data);

+                            gpointer user_data);

 
Parameters

 

 
 

@@ -562,13 +562,13 @@
 

 
meta_prefs_get_mouse_button_resize ()

-
gint
+
gint
 meta_prefs_get_mouse_button_resize (void);

 

 
meta_prefs_get_mouse_button_menu ()

-
gint
+
gint
 meta_prefs_get_mouse_button_menu (void);

 

@@ -586,13 +586,13 @@
 

 
meta_prefs_get_attach_modal_dialogs ()

-
gboolean
+
gboolean
 meta_prefs_get_attach_modal_dialogs (void);

 

 
meta_prefs_get_raise_on_click ()

-
gboolean
+
gboolean
 meta_prefs_get_raise_on_click (void);

 

@@ -604,7 +604,7 @@
 

 
meta_prefs_get_titlebar_font ()

-
const PangoFontDescription *
+
const PangoFontDescription *
 meta_prefs_get_titlebar_font (void);

 

@@ -616,19 +616,19 @@
 

 
meta_prefs_get_dynamic_workspaces ()

-
gboolean
+
gboolean
 meta_prefs_get_dynamic_workspaces (void);

 

 
meta_prefs_get_disable_workarounds ()

-
gboolean
+
gboolean
 meta_prefs_get_disable_workarounds (void);

 

 
meta_prefs_get_auto_raise ()

-
gboolean
+
gboolean
 meta_prefs_get_auto_raise (void);

 

@@ -640,32 +640,32 @@
 

 
meta_prefs_get_focus_change_on_pointer_rest ()

-
gboolean
+
gboolean
 meta_prefs_get_focus_change_on_pointer_rest
                                (void);

 

 
meta_prefs_get_gnome_accessibility ()

-
gboolean
+
gboolean
 meta_prefs_get_gnome_accessibility (void);

 

 
meta_prefs_get_gnome_animations ()

-
gboolean
+
gboolean
 meta_prefs_get_gnome_animations (void);

 

 
meta_prefs_get_edge_tiling ()

-
gboolean
+
gboolean
 meta_prefs_get_edge_tiling (void);

 

 
meta_prefs_get_auto_maximize ()

-
gboolean
+
gboolean
 meta_prefs_get_auto_maximize (void);

 

@@ -744,25 +744,25 @@
 

 
meta_prefs_get_compositing_manager ()

-
gboolean
+
gboolean
 meta_prefs_get_compositing_manager (void);

 

 
meta_prefs_get_force_fullscreen ()

-
gboolean
+
gboolean
 meta_prefs_get_force_fullscreen (void);

 

 
meta_prefs_set_force_fullscreen ()

 
void
-meta_prefs_set_force_fullscreen (gboolean whether);

+meta_prefs_set_force_fullscreen (gboolean whether);
 

 
meta_prefs_get_workspaces_only_on_primary ()

-
gboolean
+
gboolean
 meta_prefs_get_workspaces_only_on_primary
                                (void);

 

@@ -775,7 +775,7 @@
 

 
meta_prefs_get_ignore_request_hide_titlebar ()

-
gboolean
+
gboolean
 meta_prefs_get_ignore_request_hide_titlebar
                                (void);

 

@@ -784,7 +784,7 @@
 
meta_prefs_set_ignore_request_hide_titlebar ()
void
 meta_prefs_set_ignore_request_hide_titlebar
-                               (gboolean whether);

+                               (gboolean whether);

@@ -795,7 +795,7 @@
                        MetaWindow *window,
                        XIDeviceEvent *event,
                        MetaKeyBinding *binding,
-                       gpointer user_data);
+                       gpointer user_data);
 

 
Parameters

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

@@ -856,13 +856,13 @@
 

 
meta_prefs_get_visual_bell ()

-
gboolean
+
gboolean
 meta_prefs_get_visual_bell (void);

 

 
meta_prefs_bell_is_audible ()

-
gboolean
+
gboolean
 meta_prefs_bell_is_audible (void);

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaRectangle.html mutter-3.12.2/doc/reference/html/MetaRectangle.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaRectangle.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaRectangle.html	2014-05-14 08:43:38.000000000 +0000
@@ -74,7 +74,7 @@
 
-
-
-
-
-
-
-
-
+
+
-
-
+

 
 
 
 
 

 
-gboolean
+gboolean
 
 
 meta_rectangle_intersect ()
@@ -82,7 +82,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_equal ()
@@ -98,7 +98,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_overlap ()
@@ -106,7 +106,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_vert_overlap ()
@@ -114,7 +114,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_horiz_overlap ()
@@ -122,7 +122,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_could_fit_rect ()
@@ -130,7 +130,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_rectangle_contains_rect ()
@@ -206,7 +206,7 @@
 

 

 
meta_rectangle_intersect ()

-
gboolean
+
gboolean
 meta_rectangle_intersect (const MetaRectangle *src1,
                           const MetaRectangle *src2,
                           MetaRectangle *dest);

@@ -248,7 +248,7 @@
 

 

 
meta_rectangle_equal ()

-
gboolean
+
gboolean
 meta_rectangle_equal (const MetaRectangle *src1,
                       const MetaRectangle *src2);

 

@@ -291,35 +291,35 @@
 

 

 
meta_rectangle_overlap ()

-
gboolean
+
gboolean
 meta_rectangle_overlap (const MetaRectangle *rect1,
                         const MetaRectangle *rect2);

 

 

 

 
meta_rectangle_vert_overlap ()

-
gboolean
+
gboolean
 meta_rectangle_vert_overlap (const MetaRectangle *rect1,
                              const MetaRectangle *rect2);

 

 

 

 
meta_rectangle_horiz_overlap ()

-
gboolean
+
gboolean
 meta_rectangle_horiz_overlap (const MetaRectangle *rect1,
                               const MetaRectangle *rect2);

 

 

 

 
meta_rectangle_could_fit_rect ()

-
gboolean
+
gboolean
 meta_rectangle_could_fit_rect (const MetaRectangle *outer_rect,
                                const MetaRectangle *inner_rect);

 

 

 

 
meta_rectangle_contains_rect ()

-
gboolean
+
gboolean
 meta_rectangle_contains_rect (const MetaRectangle *outer_rect,
                               const MetaRectangle *inner_rect);

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaScreen.html mutter-3.12.2/doc/reference/html/MetaScreen.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaScreen.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaScreen.html	2014-05-14 08:43:38.000000000 +0000
@@ -76,7 +76,7 @@
 

 

 
-gpointer
+gpointer
 
 
 meta_screen_get_compositor_data ()
@@ -116,7 +116,7 @@
 

 

 
-GSList *
+GSList *
 
 
 meta_screen_get_startup_sequences ()
@@ -124,7 +124,7 @@
 

 

 
-GList *
+GList *
 
 
 meta_screen_get_workspaces ()
@@ -245,18 +245,11 @@
 

 
 
gbooleankeyboard-grabbedRead
gint
gint
 n-workspaces
 Read

 

 

 

@@ -346,7 +339,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaScreen
 

 

@@ -447,7 +440,7 @@
 

 

 
meta_screen_get_compositor_data ()

-
gpointer
+
gpointer
 meta_screen_get_compositor_data (MetaScreen *screen);

 

 
Parameters

@@ -470,7 +463,7 @@
 
meta_screen_set_compositor_data ()

 
void
 meta_screen_set_compositor_data (MetaScreen *screen,
-                                 gpointer info);

+                                 gpointer info);

 

 

 

@@ -496,7 +489,7 @@
 

 
Returns

 
 the MetaScreen for the X screen
-NULL if Metacity is not managing the screen. 

+NULL if Metacity is not managing the screen. 

 
[transfer none]

 

 

@@ -515,7 +508,7 @@
 

 

 
meta_screen_get_startup_sequences ()

-
GSList *
+
GSList *
 meta_screen_get_startup_sequences (MetaScreen *screen);

 

 
Returns

@@ -526,7 +519,7 @@
 

 

 
meta_screen_get_workspaces ()

-
GList *
+
GList *
 meta_screen_get_workspaces (MetaScreen *screen);

 

 
Parameters

@@ -564,7 +557,7 @@
                                     int index);

 
Gets the workspace object for one of a screen's workspaces given the workspace
 index. It's valid to call this function with an out-of-range index and it
-will robustly return NULL.

+will robustly return NULL.

 

 
Parameters

 

@@ -589,7 +582,7 @@
 

 
Returns

-
 the workspace object with specified index, or NULL
+
 the workspace object with specified index, or NULL
 if the index is out of range. 

 
[transfer none]

 

@@ -607,7 +600,7 @@
 
meta_screen_append_new_workspace ()
MetaWorkspace *
 meta_screen_append_new_workspace (MetaScreen *screen,
-                                  gboolean activate,
+                                  gboolean activate,
                                   guint32 timestamp);
Append a new workspace to the screen and (optionally) switch to that
 screen.

@@ -627,7 +620,7 @@
 
-
+
@@ -820,7 +813,7 @@
 
void
 meta_screen_override_workspace_layout (MetaScreen *screen,
                                        MetaScreenCorner starting_corner,
-                                       gboolean vertical_layout,
+                                       gboolean vertical_layout,
                                        int n_rows,
                                        int n_columns);
Explicitly set the layout of workspaces. Once this has been called, the contents of the
@@ -846,7 +839,7 @@
 

-
+
@@ -927,16 +920,8 @@
 

 
Property Details

 

-
The “keyboard-grabbed” property

-
  “keyboard-grabbed”         gboolean

-
Whether the keyboard is grabbed.

-
Flags: Read

-
Default value: FALSE

-

-

-

 
The “n-workspaces” property

-
  “n-workspaces”             gint

+
  “n-workspaces”             gint

 
Number of workspaces.

 
Flags: Read

 
Allowed values: >= 1

@@ -949,7 +934,7 @@
 
The “in-fullscreen-changed” signal

 
void
 user_function (MetaScreen *metascreen,
-               gpointer    user_data)

+               gpointer    user_data)
 
Flags: Run Last

 

 

@@ -957,7 +942,7 @@
 
The “monitors-changed” signal

 
void
 user_function (MetaScreen *metascreen,
-               gpointer    user_data)

+               gpointer    user_data)
 
Flags: Run Last

 

@@ -965,7 +950,7 @@
 
The “restacked” signal
void
 user_function (MetaScreen *metascreen,
-               gpointer    user_data)

+               gpointer    user_data)
Flags: Run Last

@@ -973,8 +958,8 @@
 
The “startup-sequence-changed” signal
void
 user_function (MetaScreen *metascreen,
-               gpointer    arg1,
-               gpointer    user_data)

+               gpointer    arg1,
+               gpointer    user_data)
Flags: Run Last

@@ -982,9 +967,9 @@
 
The “window-entered-monitor” signal
void
 user_function (MetaScreen *metascreen,
-               gint        arg1,
+               gint        arg1,
                MetaWindow *arg2,
-               gpointer    user_data)

+               gpointer    user_data)
Flags: Run Last

@@ -992,9 +977,9 @@
 
The “window-left-monitor” signal
void
 user_function (MetaScreen *metascreen,
-               gint        arg1,
+               gint        arg1,
                MetaWindow *arg2,
-               gpointer    user_data)

+               gpointer    user_data)
Flags: Run Last

@@ -1002,7 +987,7 @@
 
The “workareas-changed” signal
void
 user_function (MetaScreen *metascreen,
-               gpointer    user_data)

+               gpointer    user_data)
Flags: Run Last

@@ -1010,8 +995,8 @@
 
The “workspace-added” signal
void
 user_function (MetaScreen *metascreen,
-               gint        arg1,
-               gpointer    user_data)

+               gint        arg1,
+               gpointer    user_data)
Flags: Run Last

@@ -1019,8 +1004,8 @@
 
The “workspace-removed” signal
void
 user_function (MetaScreen *metascreen,
-               gint        arg1,
-               gpointer    user_data)

+               gint        arg1,
+               gpointer    user_data)
Flags: Run Last

@@ -1028,10 +1013,10 @@
 
The “workspace-switched” signal
void
 user_function (MetaScreen         *metascreen,
-               gint                arg1,
-               gint                arg2,
+               gint                arg1,
+               gint                arg2,
                MetaMotionDirection arg3,
-               gpointer            user_data)

+               gpointer            user_data)
Flags: Run Last

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaShadowFactory.html mutter-3.12.2/doc/reference/html/MetaShadowFactory.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaShadowFactory.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaShadowFactory.html	2014-05-14 08:43:38.000000000 +0000
@@ -108,7 +108,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaShadowFactory
 

 

@@ -133,7 +133,7 @@
 
void
 meta_shadow_factory_set_params (MetaShadowFactory *factory,
                                 const char *class_name,
-                                gboolean focused,
+                                gboolean focused,
                                 MetaShadowParams *params);
Updates the shadow parameters for a particular class of shadows
 for either the focused or unfocused state. If the class name
@@ -183,7 +183,7 @@
 
void
 meta_shadow_factory_get_params (MetaShadowFactory *factory,
                                 const char *class_name,
-                                gboolean focused,
+                                gboolean focused,
                                 MetaShadowParams *params);
Gets the shadow parameters for a particular class of shadows
 for either the focused or unfocused state. If the class name
@@ -298,7 +298,7 @@
 
The “changed” signal
void
 user_function (MetaShadowFactory *metashadowfactory,
-               gpointer           user_data)

+               gpointer           user_data)
Flags: Run Last

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaShapedTexture.html mutter-3.12.2/doc/reference/html/MetaShapedTexture.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaShapedTexture.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaShapedTexture.html	2014-05-14 08:43:38.000000000 +0000
@@ -43,7 +43,7 @@
 

 
 
 
 

 
activate
TRUE if the workspace should be switched to after creation
TRUE if the workspace should be switched to after creation

  
 

 

 

 

 
vertical_layout
if TRUE the workspaces are laid out in columns rather than rows
if TRUE the workspaces are laid out in columns rather than rows

  
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 

 
-ClutterActor *
+ClutterActor *
 
 
 meta_shaped_texture_new ()
@@ -59,7 +59,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_shaped_texture_update_area ()
@@ -67,7 +67,7 @@
 

 

 
-CoglTexture *
+CoglTexture *
 
 
 meta_shaped_texture_get_texture ()
@@ -83,7 +83,7 @@
 

 

 
-cairo_surface_t *
+cairo_surface_t *
 
 
 meta_shaped_texture_get_image ()
@@ -113,9 +113,9 @@
 
 

 
Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── ClutterActor
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── ClutterActor
             ╰── MetaShapedTexture
 

 

@@ -123,7 +123,7 @@
 
Implemented Interfaces

 

 MetaShapedTexture implements
- ClutterContainer,  ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  MetaCullable.

+ ClutterContainer,  ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  MetaCullable.

 
 

 
Description

@@ -132,7 +132,7 @@
 
Functions

 

 
meta_shaped_texture_new ()

-
ClutterActor *
+
ClutterActor *
 meta_shaped_texture_new (void);

 

 

@@ -141,12 +141,12 @@
 
void
 meta_shaped_texture_set_create_mipmaps
                                (MetaShapedTexture *stex,
-                                gboolean create_mipmaps);

+                                gboolean create_mipmaps);
 

 

 

 
meta_shaped_texture_update_area ()

-
gboolean
+
gboolean
 meta_shaped_texture_update_area (MetaShapedTexture *stex,
                                  int x,
                                  int y,
@@ -204,7 +204,7 @@
 

 

 
meta_shaped_texture_get_texture ()

-
CoglTexture *
+
CoglTexture *
 meta_shaped_texture_get_texture (MetaShapedTexture *stex);

 

 
Parameters

@@ -232,14 +232,14 @@
 
meta_shaped_texture_set_mask_texture ()

 
void
 meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
-                                      CoglTexture *mask_texture);

+                                      CoglTexture *mask_texture);

 

 

 

 
meta_shaped_texture_get_image ()

-
cairo_surface_t *
+
cairo_surface_t *
 meta_shaped_texture_get_image (MetaShapedTexture *stex,
-                               cairo_rectangle_int_t *clip);

+                               cairo_rectangle_int_t *clip);

 
Flattens the two layers of the shaped texture into one ARGB32
 image by alpha blending the two images, and returns the flattened
 image.

@@ -270,7 +270,7 @@
 

 
Returns

 
 a new cairo surface to be freed with
-cairo_surface_destroy(). 

+cairo_surface_destroy(). 

 
[transfer full]

 

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Utility-functions.html mutter-3.12.2/doc/reference/html/meta-Utility-functions.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/meta-Utility-functions.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/meta-Utility-functions.html	2014-05-14 08:43:38.000000000 +0000
@@ -41,7 +41,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_is_verbose ()
@@ -57,7 +57,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_is_debugging ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_is_syncing ()
@@ -177,7 +177,7 @@
 

 

 
-gint
+gint
 
 
 meta_unsigned_long_equal ()
@@ -185,7 +185,7 @@
 

 

 
-guint
+guint
 
 
 meta_unsigned_long_hash ()
@@ -231,7 +231,7 @@
 

 

 
-guint
+guint
 
 
 meta_later_add ()
@@ -286,31 +286,31 @@
 
Functions

 

 
meta_is_verbose ()

-
gboolean
+
gboolean
 meta_is_verbose (void);

 

 

 

 
meta_set_verbose ()

 
void
-meta_set_verbose (gboolean setting);

+meta_set_verbose (gboolean setting);
 

 

 

 
meta_is_debugging ()

-
gboolean
+
gboolean
 meta_is_debugging (void);

 

 

 

 
meta_set_debugging ()

 
void
-meta_set_debugging (gboolean setting);

+meta_set_debugging (gboolean setting);
 

 

 

 
meta_is_syncing ()

-
gboolean
+
gboolean
 meta_is_syncing (void);

 
Returns whether X synchronisation is currently enabled.

 
FIXME: This is *only* called by meta_display_open(), but by that time
@@ -319,8 +319,8 @@
 pointless.

 

 
Returns

-
 TRUE if we must wait for events whenever we send X requests;
-FALSE otherwise.

+
 TRUE if we must wait for events whenever we send X requests;
+FALSE otherwise.

 

 

 

@@ -328,7 +328,7 @@
 

 
meta_set_syncing ()

 
void
-meta_set_syncing (gboolean setting);

+meta_set_syncing (gboolean setting);
 
A handy way to turn on synchronisation on or off for every display.

 

 
Parameters

@@ -350,7 +350,7 @@
 

 
meta_set_replace_current_wm ()

 
void
-meta_set_replace_current_wm (gboolean setting);

+meta_set_replace_current_wm (gboolean setting);
 

 

 

@@ -461,15 +461,15 @@
 

 

 
meta_unsigned_long_equal ()

-
gint
-meta_unsigned_long_equal (gconstpointer v1,
-                          gconstpointer v2);

+
gint
+meta_unsigned_long_equal (gconstpointer v1,
+                          gconstpointer v2);

 

 

 

 
meta_unsigned_long_hash ()

-
guint
-meta_unsigned_long_hash (gconstpointer v);

+
guint
+meta_unsigned_long_hash (gconstpointer v);

 

 

 

@@ -509,14 +509,14 @@
 

 
meta_g_utf8_strndup ()

 
char *
-meta_g_utf8_strndup (const gchar *src,
+meta_g_utf8_strndup (const gchar *src,
                      gsize n);

 

 

 

 
meta_free_gslist_and_elements ()

 
void
-meta_free_gslist_and_elements (GSList *list_to_deep_free);

+meta_free_gslist_and_elements (GSList *list_to_deep_free);
 

 
Parameters

 

@@ -545,8 +545,8 @@
                   const char *cancel_text,
                   const char *icon_name,
                   const int transient_for,
-                  GSList *columns,
-                  GSList *entries);
+                  GSList *columns,
+                  GSList *entries);

 
Parameters

 

 

@@ -613,14 +613,14 @@
 

 
meta_later_add ()

-
guint
+
guint
 meta_later_add (MetaLaterType when,
-                GSourceFunc func,
-                gpointer data,
-                GDestroyNotify notify);

+                GSourceFunc func,
+                gpointer data,
+                GDestroyNotify notify);

 
Sets up a callback  to be called at some later time. when
  determines the
-particular later occasion at which it is called. This is much like g_idle_add(),
+particular later occasion at which it is called. This is much like g_idle_add(),
 except that the functions interact properly with clutter event handling.
 If a "later" function is added from a clutter event handler, and is supposed
 to be run before the stage is redrawn, it will be run before that redraw
@@ -652,7 +652,7 @@
 

+when it is no longer in use, or NULL

@@ -669,7 +669,7 @@
 

 
meta_later_remove ()

 
void
-meta_later_remove (guint later_id);

+meta_later_remove (guint later_id);
 
Removes a callback added with meta_later_add()

 

 
Parameters

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWindowActor.html mutter-3.12.2/doc/reference/html/MetaWindowActor.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWindowActor.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaWindowActor.html	2014-05-14 08:43:38.000000000 +0000
@@ -60,7 +60,7 @@
 
 

-
+
+gchar *
@@ -127,9 +127,9 @@
 

 
Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── ClutterActor
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── ClutterActor
             ╰── MetaWindowActor
 

 

@@ -137,7 +137,7 @@
 
Implemented Interfaces

 MetaWindowActor implements
- ClutterContainer,  ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  MetaCullable.

+ ClutterContainer,  ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  MetaCullable.

 
Description

@@ -179,7 +179,7 @@
 

 

 
meta_window_actor_get_texture ()

-
ClutterActor *
+
ClutterActor *
 meta_window_actor_get_texture (MetaWindowActor *self);

 
Gets the ClutterActor that is used to display the contents of the window

 

@@ -199,14 +199,14 @@
 

 

 
Returns

-
 the ClutterActor for the contents. 

+
 the ClutterActor for the contents. 

 
[transfer none]

 

 

 

 

 
meta_window_actor_is_destroyed ()

-
gboolean
+
gboolean
 meta_window_actor_is_destroyed (MetaWindowActor *self);

 
Gets whether the X window that the actor was displaying has been destroyed

 

@@ -226,7 +226,7 @@
 

 

 
Returns

-
 TRUE when the window is destroyed, otherwise FALSE

+
 TRUE when the window is destroyed, otherwise FALSE

 

 

 

@@ -256,7 +256,7 @@
 

 

 
The “no-shadow” property

-
  “no-shadow”                gboolean

+
  “no-shadow”                gboolean

 
Do not add shaddow to this window.

 
Flags: Read / Write

 
Default value: FALSE

@@ -264,7 +264,7 @@
 

 

 
The “shadow-class” property

-
  “shadow-class”             gchar *

+
  “shadow-class”             gchar *

 
NULL means to use the default shadow class for this window type.

 
Flags: Read / Write

 
Default value: NULL

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWindow.html mutter-3.12.2/doc/reference/html/MetaWindow.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWindow.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaWindow.html	2014-05-14 08:43:38.000000000 +0000
@@ -52,7 +52,7 @@
 
 

-
+
-
+
-
+
-
+
-
+
+gchar *
+gchar *
+gchar *
+gchar *
+gchar *
+gchar *
+GdkPixbuf *
-
+
-
+
+GdkPixbuf *
-
+
+gchar *
-
+
-
+
+gchar *
-
+
-
+
@@ -951,7 +951,7 @@
 
+gchar *
@@ -1029,7 +1029,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaWindow
 

 

@@ -1061,13 +1061,13 @@
 

 
meta_window_has_focus ()

-
gboolean
+
gboolean
 meta_window_has_focus (MetaWindow *window);

 

 
meta_window_appears_focused ()

-
gboolean
+
gboolean
 meta_window_appears_focused (MetaWindow *window);

 
Determines if the window should be drawn with a focused appearance. This is
 true for focused windows but also true for windows with a focused modal
@@ -1089,20 +1089,20 @@
 

 
Returns

-
 TRUE if the window should be drawn with a focused frame

+
 TRUE if the window should be drawn with a focused frame

 

 

 
meta_window_is_shaded ()

-
gboolean
+
gboolean
 meta_window_is_shaded (MetaWindow *window);

 

 
meta_window_is_monitor_sized ()

-
gboolean
+
gboolean
 meta_window_is_monitor_sized (MetaWindow *window);

 

 
Parameters

@@ -1121,7 +1121,7 @@
 

 

 
Returns

-
 TRUE if the window is occupies an entire monitor or
+
 TRUE if the window is occupies an entire monitor or
 the whole screen.

 

 

@@ -1129,7 +1129,7 @@
 

 

 
meta_window_is_override_redirect ()

-
gboolean
+
gboolean
 meta_window_is_override_redirect (MetaWindow *window);

 

 
Parameters

@@ -1148,7 +1148,7 @@
 

 

 
Returns

-
 TRUE if this window isn't managed by mutter; it will
+
 TRUE if this window isn't managed by mutter; it will
 control its own positioning and mutter won't draw decorations
 among other things.  In X terminology this is "override redirect".

 

@@ -1157,7 +1157,7 @@
 

 

 
meta_window_is_skip_taskbar ()

-
gboolean
+
gboolean
 meta_window_is_skip_taskbar (MetaWindow *window);

 
Gets whether this window should be ignored by task lists.

 

@@ -1177,7 +1177,7 @@
 

 

 
Returns

-
 TRUE if the skip bar hint is set.

+
 TRUE if the skip bar hint is set.

 

 

 

@@ -1560,13 +1560,13 @@
 

 

 
meta_window_is_on_all_workspaces ()

-
gboolean
+
gboolean
 meta_window_is_on_all_workspaces (MetaWindow *window);

 

 

 

 
meta_window_located_on_workspace ()

-
gboolean
+
gboolean
 meta_window_located_on_workspace (MetaWindow *window,
                                   MetaWorkspace *workspace);

 

@@ -1603,7 +1603,7 @@
 

 

 
meta_window_is_hidden ()

-
gboolean
+
gboolean
 meta_window_is_hidden (MetaWindow *window);

 

 

@@ -1674,7 +1674,7 @@
 

 

 
meta_window_showing_on_its_workspace ()

-
gboolean
+
gboolean
 meta_window_showing_on_its_workspace (MetaWindow *window);

 

 
Parameters

@@ -1693,7 +1693,7 @@
 

 

 
Returns

-
 TRUE if window would be visible, if its workspace was current

+
 TRUE if window would be visible, if its workspace was current

 

 

 

@@ -1862,7 +1862,7 @@
 
meta_window_move ()

 
void
 meta_window_move (MetaWindow *window,
-                  gboolean user_op,
+                  gboolean user_op,
                   int root_x_nw,
                   int root_y_nw);

 
Moves the window to the desired location on window's assigned workspace.
@@ -1907,7 +1907,7 @@
 
meta_window_move_frame ()

 
void
 meta_window_move_frame (MetaWindow *window,
-                        gboolean user_op,
+                        gboolean user_op,
                         int root_x_nw,
                         int root_y_nw);

 
Moves the window to the desired location on window's assigned
@@ -1952,7 +1952,7 @@
 
meta_window_move_resize_frame ()

 
void
 meta_window_move_resize_frame (MetaWindow *window,
-                               gboolean user_op,
+                               gboolean user_op,
                                int root_x_nw,
                                int root_y_nw,
                                int w,
@@ -2039,7 +2039,7 @@
 
meta_window_resize ()

 
void
 meta_window_resize (MetaWindow *window,
-                    gboolean user_op,
+                    gboolean user_op,
                     int w,
                     int h);

 
Resize the window to the desired size.

@@ -2099,8 +2099,8 @@
 
meta_window_change_workspace_by_index ()

 
void
 meta_window_change_workspace_by_index (MetaWindow *window,
-                                       gint space_index,
-                                       gboolean append);

+                                       gint space_index,
+                                       gboolean append);

 

 

 

@@ -2112,7 +2112,7 @@
 

 

 
meta_window_get_compositor_private ()

-
GObject *
+
GObject *
 meta_window_get_compositor_private (MetaWindow *window);

 
Gets the compositor's wrapper object for window
 .

@@ -2142,7 +2142,7 @@
 
meta_window_set_compositor_private ()

 
void
 meta_window_set_compositor_private (MetaWindow *window,
-                                    GObject *priv);

+                                    GObject *priv);

 

 

 

@@ -2219,7 +2219,7 @@
 

 

 
meta_window_is_ancestor_of_transient ()

-
gboolean
+
gboolean
 meta_window_is_ancestor_of_transient (MetaWindow *window,
                                       MetaWindow *transient);

 
The function determines whether window
@@ -2253,14 +2253,14 @@
 

 

 
Returns

-
 TRUE if window is an ancestor of transient. 

+
 TRUE if window is an ancestor of transient. 

 
[transfer none]

 

 

 

 

 
MetaWindowForeachFunc ()

-
gboolean
+
gboolean
 (*MetaWindowForeachFunc) (MetaWindow *window,
                           void *user_data);

 

@@ -2278,7 +2278,7 @@
 .
 The order of window enumeration is not defined.

 
Iteration will stop if func
- at any point returns FALSE.

+ at any point returns FALSE.

 

 
Parameters

 

 

 
notify

 
function to call to destroy data
-when it is no longer in use, or NULL

  
 

 

 
-ClutterActor *
+ClutterActor *
 
 
 meta_window_actor_get_texture ()
@@ -68,7 +68,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_actor_is_destroyed ()
@@ -93,13 +93,13 @@
 Read / Write / Construct Only
 

 
gbooleangboolean
 no-shadow
 Read / Write
 

 

 
-gchar *
 shadow-class
 Read / Write
 

 
 
 
 

 
-gboolean
+gboolean
 
 
 meta_window_has_focus ()
@@ -60,7 +60,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_appears_focused ()
@@ -68,7 +68,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_shaded ()
@@ -76,7 +76,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_monitor_sized ()
@@ -84,7 +84,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_override_redirect ()
@@ -92,7 +92,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_skip_taskbar ()
@@ -204,7 +204,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_on_all_workspaces ()
@@ -212,7 +212,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_located_on_workspace ()
@@ -220,7 +220,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_hidden ()
@@ -265,7 +265,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_showing_on_its_workspace ()
@@ -394,7 +394,7 @@
 

 

 
-GObject *
+GObject *
 
 
 meta_window_get_compositor_private ()
@@ -441,7 +441,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_ancestor_of_transient ()
@@ -449,7 +449,7 @@
 

 

 
-gboolean
+gboolean
 
 
 (*MetaWindowForeachFunc) ()
@@ -481,7 +481,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_fullscreen ()
@@ -489,7 +489,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_on_primary_monitor ()
@@ -497,7 +497,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_requested_bypass_compositor ()
@@ -505,7 +505,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_requested_dont_bypass_compositor ()
@@ -513,7 +513,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_get_icon_geometry ()
@@ -608,7 +608,7 @@
 

 

 
-guint
+guint
 
 
 meta_window_get_stable_sequence ()
@@ -639,7 +639,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_remote ()
@@ -647,7 +647,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_modal ()
@@ -655,7 +655,7 @@
 

 

 
-gboolean
+gboolean
 
 
 meta_window_is_attached_dialog ()
@@ -678,7 +678,7 @@
 

 

 
-cairo_region_t *
+cairo_region_t *
 
 
 meta_window_get_frame_bounds ()
@@ -825,122 +825,122 @@
 
 

 
gbooleangboolean
 above
 Read
 

 
gbooleangboolean
 appears-focused
 Read
 

 
gbooleangboolean
 decorated
 Read
 

 
gbooleangboolean
 demands-attention
 Read
 

 
gbooleangboolean
 fullscreen
 Read
 

 

 
-gchar *
 gtk-app-menu-object-path
 Read
 

 

 
-gchar *
 gtk-application-id
 Read
 

 

 
-gchar *
 gtk-application-object-path
 Read
 

 

 
-gchar *
 gtk-menubar-object-path
 Read
 

 

 
-gchar *
 gtk-unique-bus-name
 Read
 

 

 
-gchar *
 gtk-window-object-path
 Read
 

 

 
-GdkPixbuf *
 icon
 Read
 

 
gbooleangboolean
 maximized-horizontally
 Read
 

 
gbooleangboolean
 maximized-vertically
 Read
 

 

 
-GdkPixbuf *
 mini-icon
 Read
 

 
gbooleangboolean
 minimized
 Read
 

 

 
-gchar *
 mutter-hints
 Read
 

 
gbooleangboolean
 resizeable
 Read
 

 
gbooleangboolean
 skip-taskbar
 Read
 

 

 
-gchar *
 title
 Read
 

 
gbooleangboolean
 urgent
 Read
 

 
guintguint
 user-time
 Read
 

 

 
-gchar *
 wm-class
 Read
 

 
 
 
 
 
 
 
 
 
 

@@ -2319,7 +2319,7 @@
  is transient, call func
  with the window for which it's transient,
 repeatedly until either we find a non-transient window, or func
- returns FALSE.

+ returns FALSE.

 
Parameters

 

 

@@ -2380,7 +2380,7 @@
 

 
meta_window_is_fullscreen ()

-
gboolean
+
gboolean
 meta_window_is_fullscreen (MetaWindow *window);

 

 
Parameters

@@ -2399,14 +2399,14 @@
 

 

 
Returns

-
 TRUE if the window is currently fullscreen

+
 TRUE if the window is currently fullscreen

 

 

 

 
meta_window_is_on_primary_monitor ()

-
gboolean
+
gboolean
 meta_window_is_on_primary_monitor (MetaWindow *window);

 

 
Parameters

@@ -2425,14 +2425,14 @@
 

 

 
Returns

-
 TRUE if the window is on the primary monitor

+
 TRUE if the window is on the primary monitor

 

 

 

 
meta_window_requested_bypass_compositor ()

-
gboolean
+
gboolean
 meta_window_requested_bypass_compositor
                                (MetaWindow *window);

 

@@ -2452,14 +2452,14 @@
 

 

 
Returns

-
 TRUE if the window requested to bypass the compositor

+
 TRUE if the window requested to bypass the compositor

 

 

 

 
meta_window_requested_dont_bypass_compositor ()

-
gboolean
+
gboolean
 meta_window_requested_dont_bypass_compositor
                                (MetaWindow *window);

 

@@ -2479,14 +2479,14 @@
 

 

 
Returns

-
 TRUE if the window requested to opt out of unredirecting

+
 TRUE if the window requested to opt out of unredirecting

 

 

 

 
meta_window_get_icon_geometry ()

-
gboolean
+
gboolean
 meta_window_get_icon_geometry (MetaWindow *window,
                                MetaRectangle *rect);

 
Gets the location of the icon corresponding to the window. The location
@@ -2516,7 +2516,7 @@
 

 
Returns

-
 TRUE if the icon geometry was succesfully retrieved.

+
 TRUE if the icon geometry was succesfully retrieved.

 

 

@@ -2545,7 +2545,7 @@
 
-
+
@@ -2644,7 +2644,7 @@
 

 
Returns

 
 the window this window is transient for, or
-NULL if the WM_TRANSIENT_FOR hint is unset or does not point to a toplevel
+NULL if the WM_TRANSIENT_FOR hint is unset or does not point to a toplevel
 window that Metacity knows about. 

 
[transfer none]

 

@@ -2691,7 +2691,7 @@
 

 
meta_window_get_stable_sequence ()

-
guint
+
guint
 meta_window_get_stable_sequence (MetaWindow *window);

 
The stable sequence number is a monotonicially increasing
 unique integer assigned to each MetaWindow upon creation.

@@ -2812,7 +2812,7 @@
 

 

 
meta_window_is_remote ()

-
gboolean
+
gboolean
 meta_window_is_remote (MetaWindow *window);

 

 
Parameters

@@ -2831,7 +2831,7 @@
 

 

 
Returns

-
 TRUE if this window originates from a host
+
 TRUE if this window originates from a host
 different from the one running mutter.

 

 

@@ -2839,7 +2839,7 @@
 

 

 
meta_window_is_modal ()

-
gboolean
+
gboolean
 meta_window_is_modal (MetaWindow *window);

 
Queries whether the window is in a modal state as described by the
 _NET_WM_STATE protocol.

@@ -2867,12 +2867,12 @@
 

 

 
meta_window_is_attached_dialog ()

-
gboolean
+
gboolean
 meta_window_is_attached_dialog (MetaWindow *window);

 
Tests if window
  is should be attached to its parent window.
 (If the "attach_modal_dialogs" option is not enabled, this will
-always return FALSE.)

+always return FALSE.)

 

 
Parameters

 

 
 
 
 
 
 
 
 
 
 
 
 

 
rect
 rectangle with the desired geometry or NULL. 
 rectangle with the desired geometry or NULL. 

 [allow-none]
 

 
 

@@ -2925,7 +2925,7 @@
 

 
Returns

-
 the _MUTTER_HINTS string, or NULL if no hints
+
 the _MUTTER_HINTS string, or NULL if no hints
 are set. 

 
[transfer none]

 

@@ -2960,7 +2960,7 @@
 

 
meta_window_get_frame_bounds ()

-
cairo_region_t *
+
cairo_region_t *
 meta_window_get_frame_bounds (MetaWindow *window);

 
Gets a region representing the outer bounds of the window's frame.

 

@@ -2980,8 +2980,8 @@
 

 

 
Returns

-
 a cairo_region_t
-holding the outer bounds of the window, or NULL if the window
+
 a cairo_region_t
+holding the outer bounds of the window, or NULL if the window
 doesn't have a frame. 

 
[transfer none][allow-none]

 

@@ -3019,7 +3019,7 @@
 

 
Returns

 
 the matching tiled window or
-NULL if it doesn't exist. 

+NULL if it doesn't exist. 

 
[transfer none][allow-none]

 

 

@@ -3202,7 +3202,7 @@
 
void
 meta_window_begin_grab_op (MetaWindow *window,
                            MetaGrabOp op,
-                           gboolean frame_action,
+                           gboolean frame_action,
                            guint32 timestamp);

@@ -3387,7 +3387,7 @@
 
Property Details

 
The “above” property

-
  “above”                    gboolean

+
  “above”                    gboolean

 
Whether the window is shown as always-on-top.

 
Flags: Read

 
Default value: FALSE

@@ -3395,7 +3395,7 @@
 

 

 
The “appears-focused” property

-
  “appears-focused”          gboolean

+
  “appears-focused”          gboolean

 
Whether the window is drawn as being focused.

 
Flags: Read

 
Default value: FALSE

@@ -3403,7 +3403,7 @@
 

 

 
The “decorated” property

-
  “decorated”                gboolean

+
  “decorated”                gboolean

 
Whether window is decorated.

 
Flags: Read

 
Default value: TRUE

@@ -3411,7 +3411,7 @@
 

 

 
The “demands-attention” property

-
  “demands-attention”        gboolean

+
  “demands-attention”        gboolean

 
Whether the window has _NET_WM_STATE_DEMANDS_ATTENTION set.

 
Flags: Read

 
Default value: FALSE

@@ -3419,7 +3419,7 @@
 

 

 
The “fullscreen” property

-
  “fullscreen”               gboolean

+
  “fullscreen”               gboolean

 
Whether window is fullscreened.

 
Flags: Read

 
Default value: FALSE

@@ -3427,7 +3427,7 @@
 

 

 
The “gtk-app-menu-object-path” property

-
  “gtk-app-menu-object-path” gchar *

+
  “gtk-app-menu-object-path” gchar *

 
Contents of the _GTK_APP_MENU_OBJECT_PATH property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3435,7 +3435,7 @@
 

 

 
The “gtk-application-id” property

-
  “gtk-application-id”       gchar *

+
  “gtk-application-id”       gchar *

 
Contents of the _GTK_APPLICATION_ID property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3443,7 +3443,7 @@
 

 

 
The “gtk-application-object-path” property

-
  “gtk-application-object-path” gchar *

+
  “gtk-application-object-path” gchar *

 
Contents of the _GTK_APPLICATION_OBJECT_PATH property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3451,7 +3451,7 @@
 

 

 
The “gtk-menubar-object-path” property

-
  “gtk-menubar-object-path”  gchar *

+
  “gtk-menubar-object-path”  gchar *

 
Contents of the _GTK_MENUBAR_OBJECT_PATH property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3459,7 +3459,7 @@
 

 

 
The “gtk-unique-bus-name” property

-
  “gtk-unique-bus-name”      gchar *

+
  “gtk-unique-bus-name”      gchar *

 
Contents of the _GTK_UNIQUE_BUS_NAME property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3467,7 +3467,7 @@
 

 

 
The “gtk-window-object-path” property

-
  “gtk-window-object-path”   gchar *

+
  “gtk-window-object-path”   gchar *

 
Contents of the _GTK_WINDOW_OBJECT_PATH property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3475,14 +3475,14 @@
 

 

 
The “icon” property

-
  “icon”                     GdkPixbuf *

+
  “icon”                     GdkPixbuf *

 
96 pixel sized icon.

 
Flags: Read

 

 

 

 
The “maximized-horizontally” property

-
  “maximized-horizontally”   gboolean

+
  “maximized-horizontally”   gboolean

 
Whether window is maximized horizontally.

 
Flags: Read

 
Default value: FALSE

@@ -3490,7 +3490,7 @@
 

 

 
The “maximized-vertically” property

-
  “maximized-vertically”     gboolean

+
  “maximized-vertically”     gboolean

 
Whether window is maximized vertically.

 
Flags: Read

 
Default value: FALSE

@@ -3498,14 +3498,14 @@
 

 

 
The “mini-icon” property

-
  “mini-icon”                GdkPixbuf *

+
  “mini-icon”                GdkPixbuf *

 
16 pixel sized icon.

 
Flags: Read

 

 

 

 
The “minimized” property

-
  “minimized”                gboolean

+
  “minimized”                gboolean

 
Whether window is minimized.

 
Flags: Read

 
Default value: FALSE

@@ -3513,7 +3513,7 @@
 

 

 
The “mutter-hints” property

-
  “mutter-hints”             gchar *

+
  “mutter-hints”             gchar *

 
Contents of the _MUTTER_HINTS property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3521,7 +3521,7 @@
 

 

 
The “resizeable” property

-
  “resizeable”               gboolean

+
  “resizeable”               gboolean

 
Whether the window can be resized.

 
Flags: Read

 
Default value: FALSE

@@ -3529,7 +3529,7 @@
 

 

 
The “skip-taskbar” property

-
  “skip-taskbar”             gboolean

+
  “skip-taskbar”             gboolean

 
Whether the skip-taskbar flag of WM_HINTS is set.

 
Flags: Read

 
Default value: FALSE

@@ -3537,7 +3537,7 @@
 

 

 
The “title” property

-
  “title”                    gchar *

+
  “title”                    gchar *

 
The title of the window.

 
Flags: Read

 
Default value: NULL

@@ -3545,7 +3545,7 @@
 

 

 
The “urgent” property

-
  “urgent”                   gboolean

+
  “urgent”                   gboolean

 
Whether the urgent flag of WM_HINTS is set.

 
Flags: Read

 
Default value: FALSE

@@ -3553,7 +3553,7 @@
 

 

 
The “user-time” property

-
  “user-time”                guint

+
  “user-time”                guint

 
Timestamp of last user interaction.

 
Flags: Read

 
Default value: 0

@@ -3569,7 +3569,7 @@
 

 

 
The “wm-class” property

-
  “wm-class”                 gchar *

+
  “wm-class”                 gchar *

 
Contents of the WM_CLASS property of this window.

 
Flags: Read

 
Default value: NULL

@@ -3581,7 +3581,7 @@
 
The “focus” signal

 
void
 user_function (MetaWindow *metawindow,
-               gpointer    user_data)

+               gpointer    user_data)
 
Flags: Run Last

 

 

@@ -3589,7 +3589,7 @@
 
The “position-changed” signal

 
void
 user_function (MetaWindow *window,
-               gpointer    user_data)

+               gpointer    user_data)
 
This is emitted when the position of a window might
 have changed. Specifically, this is emitted when the
 position of the toplevel window has changed, or when
@@ -3623,7 +3623,7 @@
 
The “raised” signal

 
void
 user_function (MetaWindow *metawindow,
-               gpointer    user_data)

+               gpointer    user_data)
 
Flags: Run Last

 

 

@@ -3631,7 +3631,7 @@
 
The “size-changed” signal

 
void
 user_function (MetaWindow *window,
-               gpointer    user_data)

+               gpointer    user_data)
 
This is emitted when the position of a window might
 have changed. Specifically, this is emitted when the
 size of the toplevel window has changed, or when the
@@ -3665,7 +3665,7 @@
 
The “unmanaged” signal

 
void
 user_function (MetaWindow *metawindow,
-               gpointer    user_data)

+               gpointer    user_data)
 
Flags: Run Last

 

 

@@ -3673,8 +3673,8 @@
 
The “workspace-changed” signal

 
void
 user_function (MetaWindow *metawindow,
-               gint        arg1,
-               gpointer    user_data)

+               gint        arg1,
+               gpointer    user_data)
 
Flags: Run Last

 

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWorkspace.html mutter-3.12.2/doc/reference/html/MetaWorkspace.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/MetaWorkspace.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/MetaWorkspace.html	2014-05-14 08:43:38.000000000 +0000
@@ -60,7 +60,7 @@
 
 

-
+
@@ -183,7 +183,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── MetaWorkspace
 

 

@@ -232,7 +232,7 @@
 

 
meta_workspace_list_windows ()

-
GList *
+
GList *
 meta_workspace_list_windows (MetaWorkspace *workspace);

 
Gets windows contained on the workspace, including workspace->windows
 and also sticky windows. Override-redirect windows are not included.

@@ -374,7 +374,7 @@
 
 

-
+
@@ -398,7 +398,7 @@
 
meta_workspace_set_builtin_struts ()
void
 meta_workspace_set_builtin_struts (MetaWorkspace *workspace,
-                                   GSList *struts);

+                                   GSList *struts);
Sets a list of struts that will be used in addition to the struts
 of the windows in the workspace when computing the work area of
 the workspace.

@@ -485,7 +485,7 @@
 
Property Details

 
The “n-windows” property

-
  “n-windows”                guint

+
  “n-windows”                guint

 
Number of windows.

 
Flags: Read

 
Default value: 0

@@ -498,7 +498,7 @@
 
void
 user_function (MetaWorkspace *metaworkspace,
                MetaWindow    *arg1,
-               gpointer       user_data)

+               gpointer       user_data)
 
Flags: Run Last

 

@@ -507,7 +507,7 @@
 
void
 user_function (MetaWorkspace *metaworkspace,
                MetaWindow    *arg1,
-               gpointer       user_data)

+               gpointer       user_data)
Flags: Run Last

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/mutter-overview.html mutter-3.12.2/doc/reference/html/mutter-overview.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/mutter-overview.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/mutter-overview.html	2014-05-14 08:43:38.000000000 +0000
@@ -25,7 +25,7 @@
 

 

 
Mutter is a GObject-based library for creating compositing window managers.

-
Compositors that wish to use Mutter must implement a subclass of MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().

+
Compositors that wish to use Mutter must implement a subclass of MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().

 
MetaPlugin provides virtual functions that allow to override default behavior in the window management code, such as the effect to perform when a window is created or when switching workspaces.

 

diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/object-tree.html mutter-3.12.2/doc/reference/html/object-tree.html
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/html/object-tree.html	2014-03-16 09:40:19.000000000 +0000
+++ mutter-3.12.2/doc/reference/html/object-tree.html	2014-05-14 08:43:38.000000000 +0000
@@ -23,9 +23,9 @@
 

 Object Hierarchy
-    GObject
-    ├── GInitiallyUnowned
-    │   ╰── ClutterActor
+    GObject
+    ├── GInitiallyUnowned
+    │   ╰── ClutterActor
     │       ├── MetaBackgroundActor
     │       ├── MetaShapedTexture
     │       ╰── MetaWindowActor
diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/Makefile.in mutter-3.12.2/doc/reference/Makefile.in
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/Makefile.in	2014-03-16 09:39:13.000000000 +0000
+++ mutter-3.12.2/doc/reference/Makefile.in	2014-05-14 08:27:53.000000000 +0000
@@ -559,9 +559,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/reference/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/reference/Makefile
+	  $(AUTOMAKE) --foreign doc/reference/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff -Nru mutter-3.11.91+git20140314.4f9872c0/doc/reference/meta-docs.sgml mutter-3.12.2/doc/reference/meta-docs.sgml
--- mutter-3.11.91+git20140314.4f9872c0/doc/reference/meta-docs.sgml	2014-03-16 09:39:22.000000000 +0000
+++ mutter-3.12.2/doc/reference/meta-docs.sgml	2014-05-14 08:28:21.000000000 +0000
@@ -3,7 +3,7 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   
-  
+  
 ]>
 
   
diff -Nru mutter-3.11.91+git20140314.4f9872c0/INSTALL mutter-3.12.2/INSTALL
--- mutter-3.11.91+git20140314.4f9872c0/INSTALL	2014-03-16 09:39:13.000000000 +0000
+++ mutter-3.12.2/INSTALL	1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
diff -Nru mutter-3.11.91+git20140314.4f9872c0/ltmain.sh mutter-3.12.2/ltmain.sh
--- mutter-3.11.91+git20140314.4f9872c0/ltmain.sh	2014-03-16 09:39:07.000000000 +0000
+++ mutter-3.12.2/ltmain.sh	2014-05-02 10:03:54.000000000 +0000
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
+VERSION=2.4.2
 TIMESTAMP=""
 package_revision=1.3337
 
@@ -6124,10 +6124,7 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6444,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -7352,9 +7349,6 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)
diff -Nru mutter-3.11.91+git20140314.4f9872c0/m4/libtool.m4 mutter-3.12.2/m4/libtool.m4
--- mutter-3.11.91+git20140314.4f9872c0/m4/libtool.m4	2014-03-16 09:39:07.000000000 +0000
+++ mutter-3.12.2/m4/libtool.m4	2014-05-02 10:03:55.000000000 +0000
@@ -1324,19 +1324,12 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
+	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpc64le-*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc64-*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1355,10 +1348,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  powerpcle-*)
+	  powerpcle-*linux*)
 	    LD="${LD-ld} -m elf64lppc"
 	    ;;
-	  powerpc-*)
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1701,8 +1694,7 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-	test undefined != "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2526,6 +2518,17 @@
   esac
   ;;
 
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2642,7 +2645,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -2672,10 +2675,14 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2687,18 +2694,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3258,6 +3253,10 @@
   fi
   ;;
 
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3296,11 +3295,11 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4048,7 +4047,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4112,7 +4111,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4347,7 +4346,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4589,9 +4588,6 @@
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -4654,9 +4650,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4878,7 +4871,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5055,7 +5048,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5360,7 +5352,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6240,6 +6232,9 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
+      gnu*)
+        ;;
+
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6401,7 +6396,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Nru mutter-3.11.91+git20140314.4f9872c0/Makefile.in mutter-3.12.2/Makefile.in
--- mutter-3.11.91+git20140314.4f9872c0/Makefile.in	2014-03-16 09:39:13.000000000 +0000
+++ mutter-3.12.2/Makefile.in	2014-05-14 08:27:53.000000000 +0000
@@ -78,11 +78,11 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in COPYING compile config.guess config.sub \
-	install-sh missing ltmain.sh
+	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog NEWS README \
+	compile config.guess config.sub depcomp install-sh missing \
+	ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -405,15 +405,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff -Nru mutter-3.11.91+git20140314.4f9872c0/NEWS mutter-3.12.2/NEWS
--- mutter-3.11.91+git20140314.4f9872c0/NEWS	2014-03-09 08:21:09.000000000 +0000
+++ mutter-3.12.2/NEWS	2014-05-14 08:43:21.000000000 +0000
@@ -1,3 +1,47 @@
+3.12.2
+======
+* Fix in-fullscreen state when moving between monitors [Florian; #728395]
+* Fix crash when monitors change during suspend [Giovanni; #725637]
+* Misc. bug fixes [Florian, Giovanni; #728423, #729732]
+
+Contributors:
+  Giovanni Campagna, Florian Müllner
+
+Translations:
+  Christian Kirbach [de], Pau Iranzo [ca]
+
+3.12.1
+======
+* Fix opacity values from _NET_WM_WINDOW_OPACITY [Nirbheek; #727874]
+* Misc. cleanups [Jasper; #720631]
+
+Contributors:
+  Nirbheek Chauhan, Jasper St. Pierre
+
+Translations:
+  Inaki Larranaga Murgoitio [eu], marablack3 [el]
+
+3.12.0
+======
+
+Translations:
+  Ask H. Larsen [da], Мирослав Николић [sr, sr@latin], Andika Triwidada [id],
+  Daniel Korostil [uk], Petr Kovar [cs]
+
+3.11.92
+=======
+* Fix identification of CSD windows [Owen; #723029]
+* Add minimal handling of touch events [Carlos; #723552]
+* Misc bug fixes and cleanups [Owen, Adel, Jasper; #723580, #726352]
+
+Contributors:
+  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Changwoo Ryu [ko], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Yuri Myasoedov [ru], Tiagosdot [pt],
+  Claude Paroz [fr], Duarte Loreto [pt], A S Alam [pa]
+
 3.11.91
 =======
 * Don't use keysym to match keybindings [Rui; #678001]
diff -Nru mutter-3.11.91+git20140314.4f9872c0/po/ca.po mutter-3.12.2/po/ca.po
--- mutter-3.11.91+git20140314.4f9872c0/po/ca.po	2014-03-14 06:31:19.000000000 +0000
+++ mutter-3.12.2/po/ca.po	2014-05-14 08:22:03.000000000 +0000
@@ -13,11 +13,11 @@
 "Project-Id-Version: metacity 2.24\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-18 20:03+0000\n"
-"PO-Revision-Date: 2013-08-31 22:15+0200\n"
-"Last-Translator: Gil Forcada \n"
+"POT-Creation-Date: 2014-04-30 21:36+0000\n"
+"PO-Revision-Date: 2014-03-21 06:39+0100\n"
+"Last-Translator: Pau Iranzo \n"
 "Language-Team: Catalan \n"
-"Language: \n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -60,66 +60,82 @@
 msgstr "Mou la finestra un espai de treball avall"
 
 #: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Move window one monitor to the left"
+msgstr "Mou la finestra un monitor a l'esquerra"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Move window one monitor to the right"
+msgstr "Mou la finestra un monitor a la dreta"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+msgid "Move window one monitor up"
+msgstr "Mou la finestra un monitor amunt"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+msgid "Move window one monitor down"
+msgstr "Mou la finestra un monitor avall"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
 msgid "Switch applications"
 msgstr "Canvia d'aplicacions"
 
-#: ../src/50-mutter-navigation.xml.in.h:11
+#: ../src/50-mutter-navigation.xml.in.h:15
 msgid "Switch windows"
 msgstr "Canvia de finestres"
 
-#: ../src/50-mutter-navigation.xml.in.h:12
+#: ../src/50-mutter-navigation.xml.in.h:16
 msgid "Switch windows of an application"
 msgstr "Canvia entre les finestres d'una aplicació"
 
-#: ../src/50-mutter-navigation.xml.in.h:13
+#: ../src/50-mutter-navigation.xml.in.h:17
 msgid "Switch system controls"
 msgstr "Canvia entre els controls del sistema"
 
-#: ../src/50-mutter-navigation.xml.in.h:14
+#: ../src/50-mutter-navigation.xml.in.h:18
 msgid "Switch windows directly"
 msgstr "Canvia immediatament entre finestres"
 
-#: ../src/50-mutter-navigation.xml.in.h:15
+#: ../src/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an app directly"
 msgstr "Canvia immediatament entre les finestres d'una aplicació"
 
-#: ../src/50-mutter-navigation.xml.in.h:16
+#: ../src/50-mutter-navigation.xml.in.h:20
 msgid "Switch system controls directly"
 msgstr "Canvia immediatament entre els controls del sistema"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
+#: ../src/50-mutter-navigation.xml.in.h:21
 msgid "Hide all normal windows"
 msgstr "Oculta totes les finestres normals"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
+#: ../src/50-mutter-navigation.xml.in.h:22
 msgid "Switch to workspace 1"
 msgstr "Canvia a l'espai de treball 1"
 
-#: ../src/50-mutter-navigation.xml.in.h:19
+#: ../src/50-mutter-navigation.xml.in.h:23
 msgid "Switch to workspace 2"
 msgstr "Canvia a l'espai de treball 2"
 
-#: ../src/50-mutter-navigation.xml.in.h:20
+#: ../src/50-mutter-navigation.xml.in.h:24
 msgid "Switch to workspace 3"
 msgstr "Canvia a l'espai de treball 3"
 
-#: ../src/50-mutter-navigation.xml.in.h:21
+#: ../src/50-mutter-navigation.xml.in.h:25
 msgid "Switch to workspace 4"
 msgstr "Canvia a l'espai de treball 4"
 
-#: ../src/50-mutter-navigation.xml.in.h:22
+#: ../src/50-mutter-navigation.xml.in.h:26
 msgid "Move to workspace left"
 msgstr "Mou a l'espai de treball de l'esquerra"
 
-#: ../src/50-mutter-navigation.xml.in.h:23
+#: ../src/50-mutter-navigation.xml.in.h:27
 msgid "Move to workspace right"
 msgstr "Mou a l'espai de treball de la dreta"
 
-#: ../src/50-mutter-navigation.xml.in.h:24
+#: ../src/50-mutter-navigation.xml.in.h:28
 msgid "Move to workspace above"
 msgstr "Mou a l'espai de treball de sobre"
 
-#: ../src/50-mutter-navigation.xml.in.h:25
+#: ../src/50-mutter-navigation.xml.in.h:29
 msgid "Move to workspace below"
 msgstr "Mou a l'espai de treball de sota"
 
@@ -215,7 +231,7 @@
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:589
+#: ../src/compositor/compositor.c:534
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -224,29 +240,29 @@
 "Ja s'està executant un altre gestor de composició a la pantalla %i a la "
 "visualització «%s»."
 
-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1074
 msgid "background texture could not be created from file"
 msgstr "No s'ha pogut crear la textura del fons a partir del fitxer"
 
-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:321
 msgid "Bell event"
 msgstr "Esdeveniment de campana"
 
-#: ../src/core/core.c:157
+#: ../src/core/core.c:156
 #, c-format
 msgid "Unknown window information request: %d"
 msgstr "Es desconeix la informació demanada sobre la finestra: %d"
 
-#: ../src/core/delete.c:111
+#: ../src/core/delete.c:109
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no està responent."
 
-#: ../src/core/delete.c:113
+#: ../src/core/delete.c:111
 msgid "Application is not responding."
 msgstr "L'aplicació no està responent."
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:116
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -254,26 +270,26 @@
 "Podeu esperar un moment perquè continuï o podeu forçar-ne la sortida "
 "completa."
 
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:123
 msgid "_Wait"
 msgstr "_Espera"
 
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:123
 msgid "_Force Quit"
 msgstr "_Força'n la sortida"
 
-#: ../src/core/display.c:421
+#: ../src/core/display.c:405
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Manca l'extensió %s necessària per a la composició"
 
-#: ../src/core/display.c:513
+#: ../src/core/display.c:497
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 "S'ha produït un error en obrir la pantalla del sistema de finestres X «%s»\n"
 
-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:1105
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -282,41 +298,41 @@
 "Ja hi ha algun altre programa utilitzant la clau %s amb els modificadors %x "
 "com a vinculació\n"
 
-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1308
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "«%s» no és un accelerador vàlid\n"
 
-#: ../src/core/main.c:197
+#: ../src/core/main.c:195
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"
 
-#: ../src/core/main.c:203
+#: ../src/core/main.c:201
 msgid "Replace the running window manager"
 msgstr "Reemplaça el gestor de finestres en execució"
 
-#: ../src/core/main.c:209
+#: ../src/core/main.c:207
 msgid "Specify session management ID"
 msgstr "Especifica l'ID de gestió de sessió"
 
-#: ../src/core/main.c:214
+#: ../src/core/main.c:212
 msgid "X Display to use"
 msgstr "Visualització X per usar"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:218
 msgid "Initialize session from savefile"
 msgstr "Inicialitza la sessió des del fitxer desat"
 
-#: ../src/core/main.c:226
+#: ../src/core/main.c:224
 msgid "Make X calls synchronous"
 msgstr "Fes que les crides a l'X siguin síncrones"
 
-#: ../src/core/main.c:534
+#: ../src/core/main.c:544
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "No s'ha pogut analitzar el directori de temes: %s\n"
 
-#: ../src/core/main.c:550
+#: ../src/core/main.c:560
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -324,20 +340,27 @@
 "No s'ha trobat cap tema. Assegureu-vos que %s existeix i conté els temes "
 "habituals.\n"
 
-#: ../src/core/monitor.c:711
+#: ../src/core/monitor.c:699
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
+#: ../src/core/monitor.c:724
+msgid "Unknown"
+msgstr "Desconeguda"
+
+#: ../src/core/monitor.c:726
+msgid "Unknown Display"
+msgstr "Pantalla desconeguda"
+
+#. TRANSLATORS: this is a monitor vendor name, followed by a
+#. * size in inches, like 'Dell 15"'
 #.
-#: ../src/core/monitor.c:739
+#: ../src/core/monitor.c:734
 #, c-format
-msgid "Unknown %s"
-msgstr "%s desconeguda"
+msgid "%s %s"
+msgstr "%s %s"
 
-#: ../src/core/mutter.c:40
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -353,15 +376,15 @@
 "No hi ha CAP garantia; ni tan sols la garantia implícita de COMERCIABILITAT\n"
 "o ADEQUACIÓ A PER UN PROPÒSIT PARTICULAR.\n"
 
-#: ../src/core/mutter.c:54
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Escriu versió"
 
-#: ../src/core/mutter.c:60
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Connector del Mutter a utilitzar"
 
-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1190
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -369,14 +392,14 @@
 "Les solucions temporals per a aplicacions amb errors estan inhabilitades. "
 "Pot ser que certes aplicacions no funcionin correctament.\n"
 
-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1265
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "No s'ha pogut analitzar la descripció de tipus de lletra «%s» de la clau %s "
 "del GSettings\n"
 
-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1331
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -385,7 +408,7 @@
 "«%s», trobat a la base de dades de la configuració, no és un valor vàlid per "
 "al modificador del botó del ratolí\n"
 
-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1894
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -394,17 +417,17 @@
 "«%s» trobat a la base de dades de la configuració no és un valor vàlid per a "
 "la vinculació de tecla «%s»\n"
 
-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1984
 #, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
-#: ../src/core/screen.c:534
+#: ../src/core/screen.c:539
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La pantalla %d en la visualització '%s' no és vàlida\n"
 
-#: ../src/core/screen.c:550
+#: ../src/core/screen.c:555
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -413,7 +436,7 @@
 "La pantalla %d en la visualització «%s» ja té un gestor de finestres; proveu "
 "l'opció --replace per reemplaçar el gestor de finestres actual.\n"
 
-#: ../src/core/screen.c:577
+#: ../src/core/screen.c:582
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -421,66 +444,66 @@
 "No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d "
 "visualització «%s»\n"
 
-#: ../src/core/screen.c:655
+#: ../src/core/screen.c:660
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "La pantalla %d en la visualització «%s» ja té un gestor de finestres\n"
 
-#: ../src/core/screen.c:846
+#: ../src/core/screen.c:848
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "No s'ha pogut alliberar la pantalla %d en la visualització «%s»\n"
 
-#: ../src/core/session.c:843 ../src/core/session.c:850
+#: ../src/core/session.c:842 ../src/core/session.c:849
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "No s'ha pogut crear el directori «%s»: %s\n"
 
-#: ../src/core/session.c:860
+#: ../src/core/session.c:859
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "No s'ha pogut obrir el fitxer de sessió «%s» per a l'escriptura: %s\n"
 
-#: ../src/core/session.c:1001
+#: ../src/core/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "S'ha produït un error en escriure el fitxer de sessió «%s»: %s\n"
 
-#: ../src/core/session.c:1006
+#: ../src/core/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "S'ha produït un error en tancar el fitxer de sessió «%s»: %s\n"
 
-#: ../src/core/session.c:1136
+#: ../src/core/session.c:1135
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "No s'ha pogut analitzar el fitxer de sessió desat: %s\n"
 
-#: ../src/core/session.c:1185
+#: ../src/core/session.c:1184
 #, c-format
 msgid " attribute seen but we already have the session ID"
 msgstr ""
 "S'ha vist l'atribut  però encara hi ha l'identificador de "
 "sessió"
 
-#: ../src/core/session.c:1198 ../src/core/session.c:1273
-#: ../src/core/session.c:1305 ../src/core/session.c:1377
-#: ../src/core/session.c:1437
+#: ../src/core/session.c:1197 ../src/core/session.c:1272
+#: ../src/core/session.c:1304 ../src/core/session.c:1376
+#: ../src/core/session.c:1436
 #, c-format
 msgid "Unknown attribute %s on <%s> element"
 msgstr "Atribut %s desconegut a l'element <%s>"
 
-#: ../src/core/session.c:1215
+#: ../src/core/session.c:1214
 #, c-format
 msgid "nested  tag"
 msgstr "etiqueta  imbricada"
 
-#: ../src/core/session.c:1457
+#: ../src/core/session.c:1456
 #, c-format
 msgid "Unknown element %s"
 msgstr "Element %s desconegut"
 
-#: ../src/core/session.c:1809
+#: ../src/core/session.c:1808
 msgid ""
 "These windows do not support "save current setup" and will have to "
 "be restarted manually next time you log in."
@@ -488,43 +511,43 @@
 "Aquestes finestres no implementen «desa la configuració actual» i s'hauran "
 "de reiniciar manualment la pròxima vegada que entreu."
 
-#: ../src/core/util.c:84
+#: ../src/core/util.c:82
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "No s'ha pogut obrir el registre de depuració: %s\n"
 
-#: ../src/core/util.c:94
+#: ../src/core/util.c:92
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "No s'ha pogut executar fdopen() sobre el fitxer de registre %s: %s\n"
 
-#: ../src/core/util.c:100
+#: ../src/core/util.c:98
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "S'ha obert el fitxer de registre %s\n"
 
-#: ../src/core/util.c:119
+#: ../src/core/util.c:117
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"
 
-#: ../src/core/util.c:264
+#: ../src/core/util.c:262
 msgid "Window manager: "
 msgstr "Gestor de finestres: "
 
-#: ../src/core/util.c:414
+#: ../src/core/util.c:412
 msgid "Bug in window manager: "
 msgstr "Error en el gestor de finestres: "
 
-#: ../src/core/util.c:445
+#: ../src/core/util.c:443
 msgid "Window manager warning: "
 msgstr "Avís del gestor de finestres: "
 
-#: ../src/core/util.c:473
+#: ../src/core/util.c:471
 msgid "Window manager error: "
 msgstr "Error del gestor de finestres: "
 
 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7565
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -540,7 +563,7 @@
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8490
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -550,28 +573,28 @@
 "redimensionable, però estableix una mida mínima %d x %d i una mida màxima %d "
 "x %d; això no té massa sentit.\n"
 
-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:349
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "L'aplicació ha definit un _NET_WM_PID %lu fals\n"
 
-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:465
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (a %s)"
 
-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1548
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "WM_TRANSIENT_FOR no vàlid per a la finestra 0x%lx especificat per a %s.\n"
 
-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1559
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR per a la finestra 0x%lx per a %s crearia un bucle.\n"
 
-#: ../src/core/xprops.c:155
+#: ../src/core/xprops.c:153
 #, c-format
 msgid ""
 "Window 0x%lx has property %s\n"
@@ -588,12 +611,12 @@
 "La finestra té el títol=«%s» classe=«%s» nom=«%s»\n"
 "\n"
 
-#: ../src/core/xprops.c:411
+#: ../src/core/xprops.c:409
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "La propietat %s en la finestra 0x%lx contenia un UTF-8 no vàlid\n"
 
-#: ../src/core/xprops.c:494
+#: ../src/core/xprops.c:492
 #, c-format
 msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
@@ -743,103 +766,103 @@
 msgstr "Cancel·lació de les finestres emergents a les pestanyes"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:65
 msgid "Mi_nimize"
 msgstr "Mi_nimitza"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:67
 msgid "Ma_ximize"
 msgstr "Ma_ximitza"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:69
 msgid "Unma_ximize"
 msgstr "Desma_ximitza"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:71
 msgid "Roll _Up"
 msgstr "_Enrotlla"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:73
 msgid "_Unroll"
 msgstr "Desenro_tlla"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:75
 msgid "_Move"
 msgstr "_Mou"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:77
 msgid "_Resize"
 msgstr "_Redimensiona"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:79
 msgid "Move Titlebar On_screen"
 msgstr "Mou la _barra de títol en pantalla"
 
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:82 ../src/ui/menu.c:84
 msgid "Always on _Top"
 msgstr "Sempre per _damunt"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:86
 msgid "_Always on Visible Workspace"
 msgstr "Sempre a l'espai de treball _visible"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:88
 msgid "_Only on This Workspace"
 msgstr "Només en _aquest espai de treball"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:90
 msgid "Move to Workspace _Left"
 msgstr "Mou a l'espai de treball de l'es_querra"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:92
 msgid "Move to Workspace R_ight"
 msgstr "Mou a l'espai de treball de la _dreta"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Up"
 msgstr "Mou a l'espai de treball de _sobre"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace _Down"
 msgstr "Mou a l'espai de treball de s_ota"
 
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:100
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:200
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Espai de treball %d%n"
 
-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:210
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Espai de treball 1_0"
 
-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:212
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Espai de treball %s%d"
 
-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:382
 msgid "Move to Another _Workspace"
 msgstr "Mou a un altre es_pai de treball"
 
@@ -848,7 +871,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:77
+#: ../src/ui/metaaccellabel.c:75
 msgid "Shift"
 msgstr "Maj"
 
@@ -857,7 +880,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:83
+#: ../src/ui/metaaccellabel.c:81
 msgid "Ctrl"
 msgstr "Ctrl"
 
@@ -866,7 +889,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:89
+#: ../src/ui/metaaccellabel.c:87
 msgid "Alt"
 msgstr "Alt"
 
@@ -875,7 +898,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:95
+#: ../src/ui/metaaccellabel.c:93
 msgid "Meta"
 msgstr "Meta"
 
@@ -884,7 +907,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:101
+#: ../src/ui/metaaccellabel.c:99
 msgid "Super"
 msgstr "Super"
 
@@ -893,7 +916,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:107
+#: ../src/ui/metaaccellabel.c:105
 msgid "Hyper"
 msgstr "Hiper"
 
@@ -902,7 +925,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:113
+#: ../src/ui/metaaccellabel.c:111
 msgid "Mod2"
 msgstr "Mod2"
 
@@ -911,7 +934,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:119
+#: ../src/ui/metaaccellabel.c:117
 msgid "Mod3"
 msgstr "Mod3"
 
@@ -920,7 +943,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:125
+#: ../src/ui/metaaccellabel.c:123
 msgid "Mod4"
 msgstr "Mod4"
 
@@ -929,89 +952,89 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../src/ui/metaaccellabel.c:131
+#: ../src/ui/metaaccellabel.c:129
 msgid "Mod5"
 msgstr "Mod5"
 
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:134
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "superior"
 
-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "inferior"
 
-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "esquerra"
 
-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "dreta"
 
-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "la geometria del marc no especifica la dimensió «%s»"
 
-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "la geometria del marc no especifica la dimensió «%s» per al contorn «%s»"
 
-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "El ràtio d'aspecte dels botons %g no és raonable"
 
-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "La geometria del marc no especifica la mida dels botons"
 
-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Els degradats han de tenir almenys dos colors"
 
-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr ""
-"L'especificació personalitzada de color de GTK ha de tenir un nom de color i "
-"un alternatiu en parèntesis, p.e. gtk:personalitzat(foo,bar); no s'ha pogut "
+"L'especificació personalitzada de color de la GTK ha de tenir un nom de color i "
+"un alternatiu en parèntesis, p.e. gtk:custom(foo,bar); no s'ha pogut "
 "analitzar «%s»"
 
-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr ""
-"El caràcter «%c» no és vàlid en el paràmetre color_name de gtk:"
+"El caràcter «%c» no és vàlid en el paràmetre color_name de la GTK:"
 "personalitzat, només són vàlids A-Za-z0-9-_"
 
-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr ""
-"El format de Gtk:personalitzat és «gtk:personalitzat(color_name,"
+"El format de la GTK:personalitzat és «gtk:personalitzat(color_name,"
 "alternatiu)», «%s» no s'ajusta al format"
 
-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1020,7 +1043,7 @@
 "L'especificació de color GTK ha de tenir l'estat entre claudàtors, p.e. gtk:"
 "fg[NORMAL] on NORMAL és l'estat; no s'ha pogut analitzar \"%s\""
 
-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1030,17 +1053,17 @@
 "de l'estat, p.e. gtk:fg[NORMAL] on NORMAL és l'estat; no s'ha pogut "
 "analitzar «%s»"
 
-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "No s'entén l'estat «%s» en l'especificació del color"
 
-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "No s'entén l'element de color «%s» en l'especificació del color"
 
-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1049,44 +1072,44 @@
 "El format de barreja és «blend/bg_color/fg_color/alpha», «%s» no s'ajusta al "
 "format"
 
-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "No s'ha pogut analitzar el valor d'opacitat «%s» en el color barrejat"
 
-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "El valor alfa «%s» en el color barrejat no està entre 0,0 i 1,0"
 
-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "El format d'ombrejat és «shade/base_color/factor», «%s» no s'ajusta al format"
 
-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "No s'ha pogut analitzar el factor d'ombrejat «%s» en el color ombrejat"
 
-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "El factor d'ombrejat «%s» en el color ombrejat és negatiu"
 
-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "No s'ha pogut analitzar el color «%s»"
 
-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "L'expressió coordinada conté el caràcter '%s', el qual no és permès"
 
-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1095,12 +1118,12 @@
 "L'expressió coordinada conté el número '%s' de punt flotant el qual no es "
 "pot analitzar"
 
-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "L'expressió coordinada conté l'enter '%s' el qual no es pot analitzar"
 
-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1109,17 +1132,17 @@
 "L'expressió coordinada conté un operador desconegut a l'inici d'aquest text: "
 "«%s»"
 
-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "L'expressió coordinada estava buida o no s'ha entès"
 
-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "L'expressió coordinada dóna una divisió per zero"
 
-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -1127,25 +1150,25 @@
 "L'expressió coordinada intenta utilitzar l'operador de mode en un número de "
 "punt flotant"
 
-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "L'expressió coordinada té un operador «%s» on hi hauria d'anar un operand"
 
-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "L'expressió coordinada té un operand on hi hauria d'anar un operador"
 
-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "L'expressió coordinada ha finalitzat amb un operador en lloc d'un operand"
 
-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1154,39 +1177,39 @@
 "L'expressió coordinada té un operador «%c» seguit de l'operador «%c» sense "
 "cap operand enmig"
 
-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "L'expressió coordinada té una variable o constant desconeguda «%s»"
 
-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr ""
 "L'analitzador d'expressions de coordinades ha desbordat la seva memòria "
 "intermèdia."
 
-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "L'expressió coordinada té un parèntesi de tancament i cap d'obertura"
 
-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "L'expressió coordinada té un parèntesi d'obertura i cap de tancament"
 
-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "L'expressió coordinada no sembla tenir cap operador o operand"
 
-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "El tema conté una expressió que ha provocat un error: %s\n"
 
-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "

 
 
 
 
 

 
-GList *
+GList *
 
 
 meta_workspace_list_windows ()
@@ -134,7 +134,7 @@
 

 
 
guintguint
 n-windows
 Read
 

 
 

 
focus_this
the MetaWindow to be focused, or NULL
the MetaWindow to be focused, or NULL