diff -Nru vte2.91-0.48.3/aclocal.m4 vte2.91-0.48.4/aclocal.m4
--- vte2.91-0.48.3/aclocal.m4 2017-05-10 20:25:57.000000000 +0000
+++ vte2.91-0.48.4/aclocal.m4 2017-10-03 13:55:16.000000000 +0000
@@ -58,1255 +58,1140 @@
m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
])dnl AX_REQUIRE_DEFINED
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper , 1995, 1996
+#
+# Modified to never use included libintl.
+# Owen Taylor , 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor , 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
+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
-case "$am__api_version" in
- 1.[01234])
- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
- ;;
- *)
- ;;
-esac
+# 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])
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
- AC_MSG_CHECKING([for intltool >= $1])
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+# 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
+])
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
-if test -z "$AM_DEFAULT_VERBOSITY"; then
- AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
+ gt_cv_have_gettext=no
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
-else
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ #
+ # 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
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
+ #
+ # 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)])])
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
- AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
- s/^[[].*] *//
- /^[ ]*$/d
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
- ' "$1/Makefile.in" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-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
-
-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
-
- 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
-
- AC_MSG_CHECKING([for gobject-introspection])
-
- 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
-
- AC_MSG_RESULT([$found_introspection])
-
- 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)
-
- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-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])
+ 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"
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
+ 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
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
-dnl Foundation, 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 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 is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
+ 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
+ ])
-dnl Authors:
-dnl Ulrich Drepper , 1995-2000.
-dnl Bruno Haible , 2000-2003.
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
+ fi
-AC_PREREQ([2.50])
+ 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
-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])
-])
+ # We need to process the po/ directory.
+ POSUB=po
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
-dnl Copyright © 2004 Scott James Remnant .
-dnl Copyright © 2012-2015 Dan Nicholson
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
+ 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 PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
- [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
+ 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)
+ ])
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
+# 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
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-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])
+AU_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
-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
-])dnl PKG_PROG_PKG_CONFIG
+ 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 PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl 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])
+ 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 _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-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
-])dnl _PKG_CONFIG
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-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
+ 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
+ ],
+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
+
+# 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
- _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
+ 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 PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
+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
-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
+# 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])
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-$$1_PKG_ERRORS
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
-_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.
+case "$am__api_version" in
+ 1.[01234])
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+ ;;
+ *)
+ ;;
+esac
-_PKG_TEXT
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+ AC_MSG_CHECKING([for intltool >= $1])
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+fi
-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
-])dnl PKG_CHECK_MODULES
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl 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
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --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
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+ AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl 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
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
+IT_PO_SUBDIR([po])
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
+])
-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------
-dnl
-dnl Prepare a "--with-" configure option using the lowercase
-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-dnl PKG_CHECK_MODULES in a single macro.
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-m4_pushdef([description],
- [m4_default([$5], [build with ]with_arg[ support])])
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+ s/^[[].*] *//
+ /^[ ]*$/d
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+ ' "$1/Makefile.in" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+])dnl
+])
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
- [yes],[m4_pushdef([with_without], [--without-]with_arg)],
- [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
- AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
- [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
- [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
- [auto],[PKG_CHECK_MODULES([$1],[$2],
- [m4_n([def_action_if_found]) $3],
- [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-])dnl PKG_WITH_MODULES
-
-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl [DESCRIPTION], [DEFAULT])
-dnl -----------------------------------------------
-dnl
-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-dnl check._[VARIABLE-PREFIX] is exported as make variable.
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
-AM_CONDITIONAL([HAVE_][$1],
- [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])dnl PKG_HAVE_WITH_MODULES
-
-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------------------
-dnl
-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-dnl and preprocessor variable.
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
- [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])dnl PKG_HAVE_DEFINE_WITH_MODULES
-dnl vapigen.m4
-dnl
-dnl Copyright 2012 Evan Nemerson
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
+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
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT])
-# --------------------------------------
-# Check vapigen existence and version
-#
-# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
-AC_DEFUN([VAPIGEN_CHECK],
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
[
- AS_IF([test "x$3" != "xyes"], [
- m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [
- m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [
- AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]])
- ])
- ])
- ])
+ 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_ARG_ENABLE([vala],
- [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
- AS_IF([test "x$4" = "x"], [
- enable_vala=auto
- ], [
- enable_vala=$4
- ])
- ])
+ 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
- AS_CASE([$enable_vala], [no], [enable_vala=no],
- [yes], [
- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
- AC_MSG_ERROR([Vala bindings require GObject Introspection])
- ])
- ], [auto], [
- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
- enable_vala=no
- ])
- ], [
- AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
- ])
+ AC_MSG_CHECKING([for gobject-introspection])
- AS_IF([test "x$2" = "x"], [
- vapigen_pkg_name=vapigen
- ], [
- vapigen_pkg_name=vapigen-$2
- ])
- AS_IF([test "x$1" = "x"], [
- vapigen_pkg="$vapigen_pkg_name"
- ], [
- vapigen_pkg="$vapigen_pkg_name >= $1"
- ])
+ 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
- PKG_PROG_PKG_CONFIG
+ AC_MSG_RESULT([$found_introspection])
- PKG_CHECK_EXISTS([$vapigen_pkg], [
- AS_IF([test "$enable_vala" = "auto"], [
- enable_vala=yes
- ])
- ], [
- AS_CASE([$enable_vala], [yes], [
- AC_MSG_ERROR([$vapigen_pkg not found])
- ], [auto], [
- enable_vala=no
- ])
- ])
+ 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)
- AC_MSG_CHECKING([for vapigen])
+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
- AS_CASE([$enable_vala],
- [yes], [
- VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
- VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
- AS_IF([test "x$2" = "x"], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
- ], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
- ])
- ])
- AC_MSG_RESULT([$enable_vala])
+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])
+])
+
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, 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 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 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.
- AC_SUBST([VAPIGEN])
- AC_SUBST([VAPIGEN_VAPIDIR])
- AC_SUBST([VAPIGEN_MAKEFILE])
+AC_PREREQ([2.50])
- AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
+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) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper , 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor , 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor , 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant .
+dnl Copyright © 2012-2015 Dan Nicholson
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
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 Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
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 See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+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])
-# 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])
+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
+])dnl PKG_PROG_PKG_CONFIG
-# 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)
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl 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])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+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
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+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
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
+ _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
dnl
-dnl Copied from intlmacosx.m4 in gettext, GPL.
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
-glib_DEFUN([glib_gt_INTL_MACOSX],
-[
- dnl Check for API introduced in Mac OS X 10.2.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- [gt_cv_func_CFPreferencesCopyAppValue],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include ]],
- [[CFPreferencesCopyAppValue(NULL, NULL)]])],
- [gt_cv_func_CFPreferencesCopyAppValue=yes],
- [gt_cv_func_CFPreferencesCopyAppValue=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
- fi
- dnl Check for API introduced in Mac OS X 10.3.
- AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include ]],
- [[CFLocaleCopyCurrent();]])],
- [gt_cv_func_CFLocaleCopyCurrent=yes],
- [gt_cv_func_CFLocaleCopyCurrent=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
+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.])
- gt_cv_have_gettext=no
+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
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
- glib_gt_INTL_MACOSX
+$$1_PKG_ERRORS
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
- #
- # 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)
+_PKG_TEXT])[]dnl
])
-
- 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
+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.
- #
- # 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)])])
+_PKG_TEXT
- 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
+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
+])dnl PKG_CHECK_MODULES
- #
- # 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
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
- 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 $INTL_MACOSX_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 PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl 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
- 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
- # We need to process the po/ directory.
- POSUB=po
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --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
+
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl 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
- 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
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
- 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)
- ])
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
-# 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 vapigen.m4
dnl
-AU_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
+dnl Copyright 2012 Evan Nemerson
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- 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
+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT])
+# --------------------------------------
+# Check vapigen existence and version
+#
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
+AC_DEFUN([VAPIGEN_CHECK],
+[
+ AS_IF([test "x$3" != "xyes"], [
+ m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [
+ m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [
+ AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]])
+ ])
+ ])
+ ])
- 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
+ AC_ARG_ENABLE([vala],
+ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
+ AS_IF([test "x$4" = "x"], [
+ enable_vala=auto
+ ], [
+ enable_vala=$4
+ ])
+ ])
- 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)
+ AS_CASE([$enable_vala], [no], [enable_vala=no],
+ [yes], [
+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
+ AC_MSG_ERROR([Vala bindings require GObject Introspection])
+ ])
+ ], [auto], [
+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
+ enable_vala=no
+ ])
+ ], [
+ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
+ ])
- 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
- ],
- [[$0: This macro is deprecated. You should use upstream gettext instead.]])
+ AS_IF([test "x$2" = "x"], [
+ vapigen_pkg_name=vapigen
+ ], [
+ vapigen_pkg_name=vapigen-$2
+ ])
+ AS_IF([test "x$1" = "x"], [
+ vapigen_pkg="$vapigen_pkg_name"
+ ], [
+ vapigen_pkg="$vapigen_pkg_name >= $1"
+ ])
-# 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])
-])
+ PKG_PROG_PKG_CONFIG
-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
+ PKG_CHECK_EXISTS([$vapigen_pkg], [
+ AS_IF([test "$enable_vala" = "auto"], [
+ enable_vala=yes
+ ])
+ ], [
+ AS_CASE([$enable_vala], [yes], [
+ AC_MSG_ERROR([$vapigen_pkg not found])
+ ], [auto], [
+ enable_vala=no
+ ])
+ ])
-# 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])
+ AC_MSG_CHECKING([for vapigen])
+
+ AS_CASE([$enable_vala],
+ [yes], [
+ VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
+ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
+ AS_IF([test "x$2" = "x"], [
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
+ ], [
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
+ ])
+ ])
+ AC_MSG_RESULT([$enable_vala])
+
+ AC_SUBST([VAPIGEN])
+ AC_SUBST([VAPIGEN_VAPIDIR])
+ AC_SUBST([VAPIGEN_MAKEFILE])
+
+ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
+])
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff -Nru vte2.91-0.48.3/bindings/gir/Makefile.in vte2.91-0.48.4/bindings/gir/Makefile.in
--- vte2.91-0.48.3/bindings/gir/Makefile.in 2017-05-10 20:25:58.000000000 +0000
+++ vte2.91-0.48.4/bindings/gir/Makefile.in 2017-10-03 13:55:19.000000000 +0000
@@ -238,7 +238,6 @@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
diff -Nru vte2.91-0.48.3/bindings/Makefile.in vte2.91-0.48.4/bindings/Makefile.in
--- vte2.91-0.48.3/bindings/Makefile.in 2017-05-10 20:25:58.000000000 +0000
+++ vte2.91-0.48.4/bindings/Makefile.in 2017-10-03 13:55:18.000000000 +0000
@@ -270,7 +270,6 @@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
diff -Nru vte2.91-0.48.3/bindings/vala/app.c vte2.91-0.48.4/bindings/vala/app.c
--- vte2.91-0.48.3/bindings/vala/app.c 2017-05-10 20:26:41.000000000 +0000
+++ vte2.91-0.48.4/bindings/vala/app.c 2017-10-03 13:56:09.000000000 +0000
@@ -1,4 +1,4 @@
-/* app.c generated by valac 0.36.3, the Vala compiler
+/* app.c generated by valac 0.34.9, the Vala compiler
* generated from app.vala, do not modify */
/*
@@ -272,7 +272,7 @@
static void test_search_popover_update_sensitivity (TestSearchPopover* self);
static gboolean test_search_popover_have_regex (TestSearchPopover* self);
void test_search_popover_set_terminal (TestSearchPopover* self, VteTerminal* value);
-static void test_search_popover_finalize (GObject * obj);
+static void test_search_popover_finalize (GObject* obj);
static void _vala_test_search_popover_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _vala_test_search_popover_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
GType test_window_get_type (void) G_GNUC_CONST;
@@ -368,7 +368,7 @@
static void test_window_fork (TestWindow* self, GError** error);
void test_window_launch (TestWindow* self);
static gboolean test_window_show_context_menu (TestWindow* self, guint button, guint32 timestamp, GdkEvent* event);
-static void test_window_finalize (GObject * obj);
+static void test_window_finalize (GObject* obj);
enum {
TEST_APP_DUMMY_PROPERTY
};
@@ -481,10 +481,10 @@
static void __lambda17_ (TestSearchPopover* self) {
- VteTerminal* _tmp0_;
- GtkToggleButton* _tmp1_;
- gboolean _tmp2_;
- gboolean _tmp3_;
+ VteTerminal* _tmp0_ = NULL;
+ GtkToggleButton* _tmp1_ = NULL;
+ gboolean _tmp2_ = FALSE;
+ gboolean _tmp3_ = FALSE;
_tmp0_ = self->priv->_terminal;
_tmp1_ = self->priv->wrap_around_checkbutton;
_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
@@ -500,20 +500,20 @@
TestSearchPopover* test_search_popover_construct (GType object_type, VteTerminal* term, GtkWidget* relative_to) {
TestSearchPopover * self = NULL;
- GtkWidget* _tmp0_;
- VteTerminal* _tmp1_;
- GtkButton* _tmp2_;
- GtkButton* _tmp3_;
- GtkRevealer* _tmp4_;
- GtkSearchEntry* _tmp5_;
- GtkSearchEntry* _tmp6_;
- GtkSearchEntry* _tmp7_;
- GtkButton* _tmp8_;
- GtkButton* _tmp9_;
- GtkToggleButton* _tmp10_;
- GtkToggleButton* _tmp11_;
- GtkToggleButton* _tmp12_;
- GtkToggleButton* _tmp13_;
+ GtkWidget* _tmp0_ = NULL;
+ VteTerminal* _tmp1_ = NULL;
+ GtkButton* _tmp2_ = NULL;
+ GtkButton* _tmp3_ = NULL;
+ GtkRevealer* _tmp4_ = NULL;
+ GtkSearchEntry* _tmp5_ = NULL;
+ GtkSearchEntry* _tmp6_ = NULL;
+ GtkSearchEntry* _tmp7_ = NULL;
+ GtkButton* _tmp8_ = NULL;
+ GtkButton* _tmp9_ = NULL;
+ GtkToggleButton* _tmp10_ = NULL;
+ GtkToggleButton* _tmp11_ = NULL;
+ GtkToggleButton* _tmp12_ = NULL;
+ GtkToggleButton* _tmp13_ = NULL;
g_return_val_if_fail (term != NULL, NULL);
g_return_val_if_fail (relative_to != NULL, NULL);
_tmp0_ = relative_to;
@@ -554,7 +554,7 @@
static gboolean test_search_popover_have_regex (TestSearchPopover* self) {
gboolean result = FALSE;
- gboolean _tmp0_;
+ gboolean _tmp0_ = FALSE;
g_return_val_if_fail (self != NULL, FALSE);
_tmp0_ = self->priv->has_regex;
result = _tmp0_;
@@ -564,9 +564,9 @@
static void test_search_popover_update_sensitivity (TestSearchPopover* self) {
gboolean can_search = FALSE;
- gboolean _tmp0_;
- GtkButton* _tmp1_;
- GtkButton* _tmp2_;
+ gboolean _tmp0_ = FALSE;
+ GtkButton* _tmp1_ = NULL;
+ GtkButton* _tmp2_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = test_search_popover_have_regex (self);
can_search = _tmp0_;
@@ -583,26 +583,26 @@
gboolean caseless = FALSE;
GRegex* gregex = NULL;
VteRegex* regex = NULL;
- GtkSearchEntry* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- GtkToggleButton* _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp5_;
- GtkToggleButton* _tmp6_;
- gboolean _tmp7_;
- gboolean _tmp8_;
- GtkToggleButton* _tmp13_;
- gboolean _tmp14_;
- gboolean _tmp15_;
+ GtkSearchEntry* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+ gchar* _tmp2_ = NULL;
+ GtkToggleButton* _tmp3_ = NULL;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
+ GtkToggleButton* _tmp6_ = NULL;
+ gboolean _tmp7_ = FALSE;
+ gboolean _tmp8_ = FALSE;
+ GtkToggleButton* _tmp13_ = NULL;
+ gboolean _tmp14_ = FALSE;
+ gboolean _tmp15_ = FALSE;
gboolean _tmp20_ = FALSE;
- gboolean _tmp21_;
- gboolean _tmp22_;
- gboolean _tmp25_;
- const gchar* _tmp26_;
- gint _tmp27_;
- gint _tmp28_;
- gboolean _tmp61_;
+ gboolean _tmp21_ = FALSE;
+ gboolean _tmp22_ = FALSE;
+ gboolean _tmp25_ = FALSE;
+ const gchar* _tmp26_ = NULL;
+ gint _tmp27_ = 0;
+ gint _tmp28_ = 0;
+ gboolean _tmp61_ = FALSE;
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
pattern = NULL;
@@ -622,15 +622,15 @@
_tmp7_ = gtk_toggle_button_get_active (_tmp6_);
_tmp8_ = _tmp7_;
if (_tmp8_) {
- const gchar* _tmp9_;
- gchar* _tmp10_;
+ const gchar* _tmp9_ = NULL;
+ gchar* _tmp10_ = NULL;
_tmp9_ = search_text;
_tmp10_ = g_strdup (_tmp9_);
_g_free0 (pattern);
pattern = _tmp10_;
} else {
- const gchar* _tmp11_;
- gchar* _tmp12_;
+ const gchar* _tmp11_ = NULL;
+ gchar* _tmp12_ = NULL;
_tmp11_ = search_text;
_tmp12_ = g_regex_escape_string (_tmp11_, -1);
_g_free0 (pattern);
@@ -640,10 +640,10 @@
_tmp14_ = gtk_toggle_button_get_active (_tmp13_);
_tmp15_ = _tmp14_;
if (_tmp15_) {
- const gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
+ const gchar* _tmp16_ = NULL;
+ gchar* _tmp17_ = NULL;
+ gchar* _tmp18_ = NULL;
+ gchar* _tmp19_ = NULL;
_tmp16_ = pattern;
_tmp17_ = g_strconcat ("\\b", _tmp16_, NULL);
_tmp18_ = _tmp17_;
@@ -655,8 +655,8 @@
_tmp21_ = caseless;
_tmp22_ = self->priv->regex_caseless;
if (_tmp21_ == _tmp22_) {
- const gchar* _tmp23_;
- const gchar* _tmp24_;
+ const gchar* _tmp23_ = NULL;
+ const gchar* _tmp24_ = NULL;
_tmp23_ = pattern;
_tmp24_ = self->priv->regex_pattern;
_tmp20_ = g_strcmp0 (_tmp23_, _tmp24_) == 0;
@@ -679,26 +679,26 @@
_tmp28_ = _tmp27_;
if (_tmp28_ != 0) {
{
- gboolean _tmp29_;
- const gchar* _tmp54_;
- gchar* _tmp55_;
- GtkSearchEntry* _tmp56_;
+ gboolean _tmp29_ = FALSE;
+ const gchar* _tmp54_ = NULL;
+ gchar* _tmp55_ = NULL;
+ GtkSearchEntry* _tmp56_ = NULL;
_tmp29_ = test_app_options_no_pcre;
if (!_tmp29_) {
guint32 flags = 0U;
- gboolean _tmp30_;
+ gboolean _tmp30_ = FALSE;
VteRegex* _tmp32_ = NULL;
- const gchar* _tmp33_;
- const gchar* _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
- guint32 _tmp37_;
- VteRegex* _tmp38_;
- VteRegex* _tmp39_;
+ const gchar* _tmp33_ = NULL;
+ const gchar* _tmp34_ = NULL;
+ gint _tmp35_ = 0;
+ gint _tmp36_ = 0;
+ guint32 _tmp37_ = 0U;
+ VteRegex* _tmp38_ = NULL;
+ VteRegex* _tmp39_ = NULL;
flags = (guint32) 0x40080400U;
_tmp30_ = caseless;
if (_tmp30_) {
- guint32 _tmp31_;
+ guint32 _tmp31_ = 0U;
_tmp31_ = flags;
flags = _tmp31_ | 0x00000008U;
}
@@ -717,8 +717,8 @@
_vte_regex_unref0 (regex);
regex = _tmp39_;
{
- VteRegex* _tmp40_;
- VteRegex* _tmp41_;
+ VteRegex* _tmp40_ = NULL;
+ VteRegex* _tmp41_ = NULL;
_tmp40_ = regex;
vte_regex_jit (_tmp40_, (guint32) 0x00000001U, &_inner_error_);
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -734,16 +734,16 @@
__catch1_g_error:
{
GError* e = NULL;
- GError* _tmp42_;
- gint _tmp43_;
+ GError* _tmp42_ = NULL;
+ gint _tmp43_ = 0;
e = _inner_error_;
_inner_error_ = NULL;
_tmp42_ = e;
_tmp43_ = _tmp42_->code;
if (_tmp43_ != -45) {
- const gchar* _tmp44_;
- GError* _tmp45_;
- const gchar* _tmp46_;
+ const gchar* _tmp44_ = NULL;
+ GError* _tmp45_ = NULL;
+ const gchar* _tmp46_ = NULL;
_tmp44_ = pattern;
_tmp45_ = e;
_tmp46_ = _tmp45_->message;
@@ -759,16 +759,16 @@
_vte_regex_unref0 (_tmp32_);
} else {
GRegexCompileFlags flags = 0;
- gboolean _tmp47_;
+ gboolean _tmp47_ = FALSE;
GRegex* _tmp49_ = NULL;
- const gchar* _tmp50_;
- GRegexCompileFlags _tmp51_;
- GRegex* _tmp52_;
- GRegex* _tmp53_;
+ const gchar* _tmp50_ = NULL;
+ GRegexCompileFlags _tmp51_ = 0;
+ GRegex* _tmp52_ = NULL;
+ GRegex* _tmp53_ = NULL;
flags = G_REGEX_OPTIMIZE | G_REGEX_MULTILINE;
_tmp47_ = caseless;
if (_tmp47_) {
- GRegexCompileFlags _tmp48_;
+ GRegexCompileFlags _tmp48_ = 0;
_tmp48_ = flags;
flags = _tmp48_ | G_REGEX_CASELESS;
}
@@ -796,9 +796,9 @@
__catch0_g_error:
{
GError* e = NULL;
- GtkSearchEntry* _tmp57_;
- GError* _tmp58_;
- const gchar* _tmp59_;
+ GtkSearchEntry* _tmp57_ = NULL;
+ GError* _tmp58_ = NULL;
+ const gchar* _tmp59_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_vte_regex_unref0 (regex);
@@ -822,7 +822,7 @@
return;
}
} else {
- GtkSearchEntry* _tmp60_;
+ GtkSearchEntry* _tmp60_ = NULL;
_vte_regex_unref0 (regex);
regex = NULL;
_g_regex_unref0 (gregex);
@@ -832,18 +832,18 @@
}
_tmp61_ = test_app_options_no_pcre;
if (!_tmp61_) {
- VteRegex* _tmp62_;
- VteTerminal* _tmp63_;
- VteRegex* _tmp64_;
+ VteRegex* _tmp62_ = NULL;
+ VteTerminal* _tmp63_ = NULL;
+ VteRegex* _tmp64_ = NULL;
_tmp62_ = regex;
self->priv->has_regex = _tmp62_ != NULL;
_tmp63_ = self->priv->_terminal;
_tmp64_ = regex;
vte_terminal_search_set_regex (_tmp63_, _tmp64_, (guint32) 0);
} else {
- GRegex* _tmp65_;
- VteTerminal* _tmp66_;
- GRegex* _tmp67_;
+ GRegex* _tmp65_ = NULL;
+ VteTerminal* _tmp66_ = NULL;
+ GRegex* _tmp67_ = NULL;
_tmp65_ = gregex;
self->priv->has_regex = _tmp65_ != NULL;
_tmp66_ = self->priv->_terminal;
@@ -859,8 +859,8 @@
static void test_search_popover_search (TestSearchPopover* self, gboolean backward) {
- gboolean _tmp0_;
- gboolean _tmp1_;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_ = FALSE;
g_return_if_fail (self != NULL);
_tmp0_ = test_search_popover_have_regex (self);
if (!_tmp0_) {
@@ -868,11 +868,11 @@
}
_tmp1_ = backward;
if (_tmp1_) {
- VteTerminal* _tmp2_;
+ VteTerminal* _tmp2_ = NULL;
_tmp2_ = self->priv->_terminal;
vte_terminal_search_find_previous (_tmp2_);
} else {
- VteTerminal* _tmp3_;
+ VteTerminal* _tmp3_ = NULL;
_tmp3_ = self->priv->_terminal;
vte_terminal_search_find_next (_tmp3_);
}
@@ -881,7 +881,7 @@
VteTerminal* test_search_popover_get_terminal (TestSearchPopover* self) {
VteTerminal* result;
- VteTerminal* _tmp0_;
+ VteTerminal* _tmp0_ = NULL;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_terminal;
result = _tmp0_;
@@ -895,16 +895,14 @@
void test_search_popover_set_terminal (TestSearchPopover* self, VteTerminal* value) {
+ VteTerminal* _tmp0_ = NULL;
+ VteTerminal* _tmp1_ = NULL;
g_return_if_fail (self != NULL);
- if (test_search_popover_get_terminal (self) != value) {
- VteTerminal* _tmp0_;
- VteTerminal* _tmp1_;
- _tmp0_ = value;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->_terminal);
- self->priv->_terminal = _tmp1_;
- g_object_notify ((GObject *) self, "terminal");
- }
+ _tmp0_ = value;
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+ _g_object_unref0 (self->priv->_terminal);
+ self->priv->_terminal = _tmp1_;
+ g_object_notify ((GObject *) self, "terminal");
}
@@ -940,7 +938,7 @@
}
-static void test_search_popover_finalize (GObject * obj) {
+static void test_search_popover_finalize (GObject* obj) {
TestSearchPopover * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TEST_TYPE_SEARCH_POPOVER, TestSearchPopover);
_g_object_unref0 (self->priv->_terminal);
@@ -1031,13 +1029,13 @@
static void __lambda8_ (TestWindow* self, GObject* obj, GParamSpec* pspec) {
GAction* a = NULL;
- GObject* _tmp0_;
- GAction* _tmp1_;
- GtkWidget* _tmp2_;
- GVariant* _tmp3_;
- GVariant* _tmp4_;
- GVariant* _tmp5_;
- gboolean _tmp6_;
+ GObject* _tmp0_ = NULL;
+ GAction* _tmp1_ = NULL;
+ GtkWidget* _tmp2_ = NULL;
+ GVariant* _tmp3_ = NULL;
+ GVariant* _tmp4_ = NULL;
+ GVariant* _tmp5_ = NULL;
+ gboolean _tmp6_ = FALSE;
g_return_if_fail (obj != NULL);
g_return_if_fail (pspec != NULL);
_tmp0_ = obj;
@@ -1060,14 +1058,14 @@
static void __lambda9_ (TestWindow* self) {
- GtkToggleButton* _tmp0_;
- gboolean _tmp1_;
- gboolean _tmp2_;
+ GtkToggleButton* _tmp0_ = NULL;
+ gboolean _tmp1_ = FALSE;
+ gboolean _tmp2_ = FALSE;
_tmp0_ = self->priv->find_button;
_tmp1_ = gtk_toggle_button_get_active (_tmp0_);
_tmp2_ = _tmp1_;
if (_tmp2_) {
- GtkToggleButton* _tmp3_;
+ GtkToggleButton* _tmp3_ = NULL;
_tmp3_ = self->priv->find_button;
gtk_toggle_button_set_active (_tmp3_, FALSE);
}
@@ -1081,13 +1079,13 @@
static void __lambda10_ (TestWindow* self) {
gboolean active = FALSE;
- GtkToggleButton* _tmp0_;
- gboolean _tmp1_;
- gboolean _tmp2_;
- TestSearchPopover* _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_;
+ GtkToggleButton* _tmp0_ = NULL;
+ gboolean _tmp1_ = FALSE;
+ gboolean _tmp2_ = FALSE;
+ TestSearchPopover* _tmp3_ = NULL;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
+ gboolean _tmp6_ = FALSE;
_tmp0_ = self->priv->find_button;
_tmp1_ = gtk_toggle_button_get_active (_tmp0_);
_tmp2_ = _tmp1_;
@@ -1097,8 +1095,8 @@
_tmp5_ = _tmp4_;
_tmp6_ = active;
if (_tmp5_ != _tmp6_) {
- TestSearchPopover* _tmp7_;
- gboolean _tmp8_;
+ TestSearchPopover* _tmp7_ = NULL;
+ gboolean _tmp8_ = FALSE;
_tmp7_ = self->priv->search_popover;
_tmp8_ = active;
gtk_widget_set_visible ((GtkWidget*) _tmp7_, _tmp8_);
@@ -1227,111 +1225,111 @@
TestWindow* test_window_construct (GType object_type, TestApp* app) {
TestWindow * self = NULL;
- TestApp* _tmp0_;
- VteTerminal* _tmp1_;
+ TestApp* _tmp0_ = NULL;
+ VteTerminal* _tmp1_ = NULL;
gint margin = 0;
- gint _tmp2_;
- gint _tmp3_;
- GtkScrollbar* _tmp9_;
- VteTerminal* _tmp10_;
- GtkAdjustment* _tmp11_;
+ gint _tmp2_ = 0;
+ gint _tmp3_ = 0;
+ GtkScrollbar* _tmp9_ = NULL;
+ VteTerminal* _tmp10_ = NULL;
+ GtkAdjustment* _tmp11_ = NULL;
GPropertyAction* action = NULL;
- VteTerminal* _tmp12_;
- GPropertyAction* _tmp13_;
- GPropertyAction* _tmp14_;
- GPropertyAction* _tmp15_;
- VteTerminal* _tmp16_;
- GtkToggleButton* _tmp17_;
- TestSearchPopover* _tmp18_;
- TestSearchPopover* _tmp19_;
- GtkToggleButton* _tmp20_;
+ VteTerminal* _tmp12_ = NULL;
+ GPropertyAction* _tmp13_ = NULL;
+ GPropertyAction* _tmp14_ = NULL;
+ GPropertyAction* _tmp15_ = NULL;
+ VteTerminal* _tmp16_ = NULL;
+ GtkToggleButton* _tmp17_ = NULL;
+ TestSearchPopover* _tmp18_ = NULL;
+ TestSearchPopover* _tmp19_ = NULL;
+ GtkToggleButton* _tmp20_ = NULL;
GMenu* menu = NULL;
- GMenu* _tmp21_;
+ GMenu* _tmp21_ = NULL;
GMenu* section = NULL;
- GMenu* _tmp22_;
- GMenu* _tmp23_;
- GMenu* _tmp24_;
- GMenu* _tmp25_;
- GMenu* _tmp26_;
- GMenu* _tmp27_;
- GMenu* _tmp28_;
- GMenu* _tmp29_;
- GMenu* _tmp30_;
- GMenu* _tmp31_;
- GMenu* _tmp32_;
- GMenu* _tmp33_;
- GMenu* _tmp34_;
- GMenu* _tmp35_;
- GMenu* _tmp36_;
- GMenu* _tmp37_;
- GtkMenuButton* _tmp38_;
- GMenu* _tmp39_;
- GtkClipboard* _tmp40_;
- GtkClipboard* _tmp41_;
- GtkClipboard* _tmp42_;
- gint _tmp43_;
- VteTerminal* _tmp52_;
- VteTerminal* _tmp53_;
- VteTerminal* _tmp54_;
- VteTerminal* _tmp55_;
- VteTerminal* _tmp56_;
- VteTerminal* _tmp57_;
- VteTerminal* _tmp58_;
- VteTerminal* _tmp59_;
- VteTerminal* _tmp60_;
- VteTerminal* _tmp61_;
- VteTerminal* _tmp62_;
- VteTerminal* _tmp63_;
- VteTerminal* _tmp64_;
- VteTerminal* _tmp65_;
- VteTerminal* _tmp66_;
- VteTerminal* _tmp67_;
- VteTerminal* _tmp68_;
- VteTerminal* _tmp69_;
- VteTerminal* _tmp70_;
- gboolean _tmp71_;
- gboolean _tmp73_;
- const gchar* _tmp75_;
- const gchar* _tmp80_;
- VteTerminal* _tmp83_;
- gboolean _tmp84_;
- VteTerminal* _tmp85_;
- gint _tmp86_;
- VteTerminal* _tmp87_;
- VteCursorBlinkMode _tmp88_;
- VteTerminal* _tmp89_;
- VteCursorShape _tmp90_;
- VteTerminal* _tmp91_;
- VteTerminal* _tmp92_;
- gboolean _tmp93_;
- VteTerminal* _tmp94_;
- VteTerminal* _tmp95_;
- VteTerminal* _tmp96_;
- gint _tmp97_;
- const gchar* _tmp98_;
- VteTerminal* _tmp103_;
+ GMenu* _tmp22_ = NULL;
+ GMenu* _tmp23_ = NULL;
+ GMenu* _tmp24_ = NULL;
+ GMenu* _tmp25_ = NULL;
+ GMenu* _tmp26_ = NULL;
+ GMenu* _tmp27_ = NULL;
+ GMenu* _tmp28_ = NULL;
+ GMenu* _tmp29_ = NULL;
+ GMenu* _tmp30_ = NULL;
+ GMenu* _tmp31_ = NULL;
+ GMenu* _tmp32_ = NULL;
+ GMenu* _tmp33_ = NULL;
+ GMenu* _tmp34_ = NULL;
+ GMenu* _tmp35_ = NULL;
+ GMenu* _tmp36_ = NULL;
+ GMenu* _tmp37_ = NULL;
+ GtkMenuButton* _tmp38_ = NULL;
+ GMenu* _tmp39_ = NULL;
+ GtkClipboard* _tmp40_ = NULL;
+ GtkClipboard* _tmp41_ = NULL;
+ GtkClipboard* _tmp42_ = NULL;
+ gint _tmp43_ = 0;
+ VteTerminal* _tmp52_ = NULL;
+ VteTerminal* _tmp53_ = NULL;
+ VteTerminal* _tmp54_ = NULL;
+ VteTerminal* _tmp55_ = NULL;
+ VteTerminal* _tmp56_ = NULL;
+ VteTerminal* _tmp57_ = NULL;
+ VteTerminal* _tmp58_ = NULL;
+ VteTerminal* _tmp59_ = NULL;
+ VteTerminal* _tmp60_ = NULL;
+ VteTerminal* _tmp61_ = NULL;
+ VteTerminal* _tmp62_ = NULL;
+ VteTerminal* _tmp63_ = NULL;
+ VteTerminal* _tmp64_ = NULL;
+ VteTerminal* _tmp65_ = NULL;
+ VteTerminal* _tmp66_ = NULL;
+ VteTerminal* _tmp67_ = NULL;
+ VteTerminal* _tmp68_ = NULL;
+ VteTerminal* _tmp69_ = NULL;
+ VteTerminal* _tmp70_ = NULL;
+ gboolean _tmp71_ = FALSE;
+ gboolean _tmp73_ = FALSE;
+ const gchar* _tmp75_ = NULL;
+ const gchar* _tmp80_ = NULL;
+ VteTerminal* _tmp83_ = NULL;
+ gboolean _tmp84_ = FALSE;
+ VteTerminal* _tmp85_ = NULL;
+ gint _tmp86_ = 0;
+ VteTerminal* _tmp87_ = NULL;
+ VteCursorBlinkMode _tmp88_ = 0;
+ VteTerminal* _tmp89_ = NULL;
+ VteCursorShape _tmp90_ = 0;
+ VteTerminal* _tmp91_ = NULL;
+ VteTerminal* _tmp92_ = NULL;
+ gboolean _tmp93_ = FALSE;
+ VteTerminal* _tmp94_ = NULL;
+ VteTerminal* _tmp95_ = NULL;
+ VteTerminal* _tmp96_ = NULL;
+ gint _tmp97_ = 0;
+ const gchar* _tmp98_ = NULL;
+ VteTerminal* _tmp103_ = NULL;
GdkRGBA _tmp104_ = {0};
GdkRGBA _tmp105_ = {0};
- VteTerminal* _tmp106_;
- GdkRGBA* _tmp107_;
- GdkRGBA* _tmp108_;
- VteTerminal* _tmp109_;
- GdkRGBA* _tmp110_;
- GdkRGBA* _tmp111_;
- VteTerminal* _tmp112_;
- GdkRGBA* _tmp113_;
- GdkRGBA* _tmp114_;
- VteTerminal* _tmp115_;
- GdkRGBA* _tmp116_;
- GdkRGBA* _tmp117_;
- gboolean _tmp118_;
- gchar** _tmp120_;
- gint _tmp120__length1;
- GtkBox* _tmp122_;
- VteTerminal* _tmp123_;
- VteTerminal* _tmp124_;
- VteTerminal* _tmp125_;
- gboolean _tmp126_;
+ VteTerminal* _tmp106_ = NULL;
+ GdkRGBA* _tmp107_ = NULL;
+ GdkRGBA* _tmp108_ = NULL;
+ VteTerminal* _tmp109_ = NULL;
+ GdkRGBA* _tmp110_ = NULL;
+ GdkRGBA* _tmp111_ = NULL;
+ VteTerminal* _tmp112_ = NULL;
+ GdkRGBA* _tmp113_ = NULL;
+ GdkRGBA* _tmp114_ = NULL;
+ VteTerminal* _tmp115_ = NULL;
+ GdkRGBA* _tmp116_ = NULL;
+ GdkRGBA* _tmp117_ = NULL;
+ gboolean _tmp118_ = FALSE;
+ gchar** _tmp120_ = NULL;
+ gint _tmp120__length1 = 0;
+ GtkBox* _tmp122_ = NULL;
+ VteTerminal* _tmp123_ = NULL;
+ VteTerminal* _tmp124_ = NULL;
+ VteTerminal* _tmp125_ = NULL;
+ gboolean _tmp126_ = FALSE;
GError * _inner_error_ = NULL;
g_return_val_if_fail (app != NULL, NULL);
_tmp0_ = app;
@@ -1344,11 +1342,11 @@
margin = _tmp2_;
_tmp3_ = margin;
if (_tmp3_ > 0) {
- VteTerminal* _tmp4_;
- VteTerminal* _tmp5_;
- VteTerminal* _tmp6_;
- VteTerminal* _tmp7_;
- gint _tmp8_;
+ VteTerminal* _tmp4_ = NULL;
+ VteTerminal* _tmp5_ = NULL;
+ VteTerminal* _tmp6_ = NULL;
+ VteTerminal* _tmp7_ = NULL;
+ gint _tmp8_ = 0;
_tmp4_ = self->priv->terminal;
_tmp5_ = self->priv->terminal;
_tmp6_ = self->priv->terminal;
@@ -1426,17 +1424,17 @@
gtk_window_set_title ((GtkWindow*) self, "Terminal");
_tmp43_ = test_app_options_transparency_percent;
if (_tmp43_ != 0) {
- gboolean _tmp44_;
+ gboolean _tmp44_ = FALSE;
_tmp44_ = test_app_options_no_argb_visual;
if (!_tmp44_) {
GdkScreen* screen = NULL;
- GdkScreen* _tmp45_;
- GdkScreen* _tmp46_;
+ GdkScreen* _tmp45_ = NULL;
+ GdkScreen* _tmp46_ = NULL;
GdkVisual* visual = NULL;
- GdkScreen* _tmp47_;
- GdkVisual* _tmp48_;
- GdkVisual* _tmp49_;
- GdkVisual* _tmp50_;
+ GdkScreen* _tmp47_ = NULL;
+ GdkVisual* _tmp48_ = NULL;
+ GdkVisual* _tmp49_ = NULL;
+ GdkVisual* _tmp50_ = NULL;
_tmp45_ = gtk_window_get_screen ((GtkWindow*) self);
_tmp46_ = _g_object_ref0 (_tmp45_);
screen = _tmp46_;
@@ -1446,7 +1444,7 @@
visual = _tmp49_;
_tmp50_ = visual;
if (_tmp50_ != NULL) {
- GdkVisual* _tmp51_;
+ GdkVisual* _tmp51_ = NULL;
_tmp51_ = visual;
gtk_widget_set_visual ((GtkWidget*) self, _tmp51_);
}
@@ -1495,21 +1493,21 @@
g_signal_connect_object (_tmp70_, "window-title-changed", (GCallback) _test_window_window_title_changed_cb_vte_terminal_window_title_changed, self, 0);
_tmp71_ = test_app_options_object_notifications;
if (_tmp71_) {
- VteTerminal* _tmp72_;
+ VteTerminal* _tmp72_ = NULL;
_tmp72_ = self->priv->terminal;
g_signal_connect_object ((GObject*) _tmp72_, "notify", (GCallback) _test_window_notify_cb_g_object_notify, self, 0);
}
_tmp73_ = test_app_options_no_double_buffer;
if (_tmp73_) {
- VteTerminal* _tmp74_;
+ VteTerminal* _tmp74_ = NULL;
_tmp74_ = self->priv->terminal;
gtk_widget_set_double_buffered ((GtkWidget*) _tmp74_, FALSE);
}
_tmp75_ = test_app_options_encoding;
if (_tmp75_ != NULL) {
{
- VteTerminal* _tmp76_;
- const gchar* _tmp77_;
+ VteTerminal* _tmp76_ = NULL;
+ const gchar* _tmp77_ = NULL;
_tmp76_ = self->priv->terminal;
_tmp77_ = test_app_options_encoding;
vte_terminal_set_encoding (_tmp76_, _tmp77_, &_inner_error_);
@@ -1521,8 +1519,8 @@
__catch2_g_error:
{
GError* e = NULL;
- GError* _tmp78_;
- const gchar* _tmp79_;
+ GError* _tmp78_ = NULL;
+ const gchar* _tmp79_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp78_ = e;
@@ -1542,8 +1540,8 @@
}
_tmp80_ = test_app_options_word_char_exceptions;
if (_tmp80_ != NULL) {
- VteTerminal* _tmp81_;
- const gchar* _tmp82_;
+ VteTerminal* _tmp81_ = NULL;
+ const gchar* _tmp82_ = NULL;
_tmp81_ = self->priv->terminal;
_tmp82_ = test_app_options_word_char_exceptions;
vte_terminal_set_word_char_exceptions (_tmp81_, _tmp82_);
@@ -1575,10 +1573,10 @@
_tmp98_ = test_app_options_font_string;
if (_tmp98_ != NULL) {
PangoFontDescription* desc = NULL;
- const gchar* _tmp99_;
- PangoFontDescription* _tmp100_;
- VteTerminal* _tmp101_;
- PangoFontDescription* _tmp102_;
+ const gchar* _tmp99_ = NULL;
+ PangoFontDescription* _tmp100_ = NULL;
+ VteTerminal* _tmp101_ = NULL;
+ PangoFontDescription* _tmp102_ = NULL;
_tmp99_ = test_app_options_font_string;
_tmp100_ = pango_font_description_from_string (_tmp99_);
desc = _tmp100_;
@@ -1613,8 +1611,8 @@
_g_free0 (_tmp117_);
_tmp118_ = test_app_options_no_builtin_dingus;
if (!_tmp118_) {
- gchar** _tmp119_;
- gint _tmp119__length1;
+ gchar** _tmp119_ = NULL;
+ gint _tmp119__length1 = 0;
_tmp119_ = self->priv->builtin_dingus;
_tmp119__length1 = self->priv->builtin_dingus_length1;
test_window_add_dingus (self, _tmp119_, _tmp119__length1);
@@ -1622,8 +1620,8 @@
_tmp120_ = test_app_options_dingus;
_tmp120__length1 = test_app_options_dingus_length1;
if (_tmp120_ != NULL) {
- gchar** _tmp121_;
- gint _tmp121__length1;
+ gchar** _tmp121_ = NULL;
+ gint _tmp121__length1 = 0;
_tmp121_ = test_app_options_dingus;
_tmp121__length1 = test_app_options_dingus_length1;
test_window_add_dingus (self, _tmp121_, _tmp121__length1);
@@ -1662,11 +1660,11 @@
gboolean _tmp0_ = FALSE;
_tmp0_ = TRUE;
while (TRUE) {
- gint _tmp2_;
- gchar** _tmp3_;
- gint _tmp3__length1;
+ gint _tmp2_ = 0;
+ gchar** _tmp3_ = NULL;
+ gint _tmp3__length1 = 0;
if (!_tmp0_) {
- gint _tmp1_;
+ gint _tmp1_ = 0;
_tmp1_ = i;
i = _tmp1_ + 1;
}
@@ -1679,30 +1677,30 @@
}
{
gint tag = 0;
- gboolean _tmp4_;
- VteTerminal* _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
- GdkCursorType _tmp40_;
+ gboolean _tmp4_ = FALSE;
+ VteTerminal* _tmp37_ = NULL;
+ gint _tmp38_ = 0;
+ gint _tmp39_ = 0;
+ GdkCursorType _tmp40_ = 0;
_tmp4_ = test_app_options_no_pcre;
if (!_tmp4_) {
VteRegex* regex = NULL;
VteRegex* _tmp5_ = NULL;
- gchar** _tmp6_;
- gint _tmp6__length1;
- gint _tmp7_;
- const gchar* _tmp8_;
- gchar** _tmp9_;
- gint _tmp9__length1;
- gint _tmp10_;
- const gchar* _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
- VteRegex* _tmp14_;
- VteRegex* _tmp15_;
- VteTerminal* _tmp25_;
- VteRegex* _tmp26_;
- gint _tmp27_;
+ gchar** _tmp6_ = NULL;
+ gint _tmp6__length1 = 0;
+ gint _tmp7_ = 0;
+ const gchar* _tmp8_ = NULL;
+ gchar** _tmp9_ = NULL;
+ gint _tmp9__length1 = 0;
+ gint _tmp10_ = 0;
+ const gchar* _tmp11_ = NULL;
+ gint _tmp12_ = 0;
+ gint _tmp13_ = 0;
+ VteRegex* _tmp14_ = NULL;
+ VteRegex* _tmp15_ = NULL;
+ VteTerminal* _tmp25_ = NULL;
+ VteRegex* _tmp26_ = NULL;
+ gint _tmp27_ = 0;
_tmp6_ = dingus;
_tmp6__length1 = dingus_length1;
_tmp7_ = i;
@@ -1724,8 +1722,8 @@
_vte_regex_unref0 (regex);
regex = _tmp15_;
{
- VteRegex* _tmp16_;
- VteRegex* _tmp17_;
+ VteRegex* _tmp16_ = NULL;
+ VteRegex* _tmp17_ = NULL;
_tmp16_ = regex;
vte_regex_jit (_tmp16_, (guint32) 0x00000001U, &_inner_error_);
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -1741,19 +1739,19 @@
__catch4_g_error:
{
GError* e = NULL;
- GError* _tmp18_;
- gint _tmp19_;
+ GError* _tmp18_ = NULL;
+ gint _tmp19_ = 0;
e = _inner_error_;
_inner_error_ = NULL;
_tmp18_ = e;
_tmp19_ = _tmp18_->code;
if (_tmp19_ != -45) {
- gchar** _tmp20_;
- gint _tmp20__length1;
- gint _tmp21_;
- const gchar* _tmp22_;
- GError* _tmp23_;
- const gchar* _tmp24_;
+ gchar** _tmp20_ = NULL;
+ gint _tmp20__length1 = 0;
+ gint _tmp21_ = 0;
+ const gchar* _tmp22_ = NULL;
+ GError* _tmp23_ = NULL;
+ const gchar* _tmp24_ = NULL;
_tmp20_ = dingus;
_tmp20__length1 = dingus_length1;
_tmp21_ = i;
@@ -1779,15 +1777,15 @@
} else {
GRegex* regex = NULL;
GRegex* _tmp28_ = NULL;
- gchar** _tmp29_;
- gint _tmp29__length1;
- gint _tmp30_;
- const gchar* _tmp31_;
- GRegex* _tmp32_;
- GRegex* _tmp33_;
- VteTerminal* _tmp34_;
- GRegex* _tmp35_;
- gint _tmp36_;
+ gchar** _tmp29_ = NULL;
+ gint _tmp29__length1 = 0;
+ gint _tmp30_ = 0;
+ const gchar* _tmp31_ = NULL;
+ GRegex* _tmp32_ = NULL;
+ GRegex* _tmp33_ = NULL;
+ VteTerminal* _tmp34_ = NULL;
+ GRegex* _tmp35_ = NULL;
+ gint _tmp36_ = 0;
_tmp29_ = dingus;
_tmp29__length1 = dingus_length1;
_tmp30_ = i;
@@ -1819,12 +1817,12 @@
__catch3_g_error:
{
GError* e = NULL;
- gchar** _tmp41_;
- gint _tmp41__length1;
- gint _tmp42_;
- const gchar* _tmp43_;
- GError* _tmp44_;
- const gchar* _tmp45_;
+ gchar** _tmp41_ = NULL;
+ gint _tmp41__length1 = 0;
+ gint _tmp42_ = 0;
+ const gchar* _tmp43_ = NULL;
+ GError* _tmp44_ = NULL;
+ const gchar* _tmp45_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp41_ = dingus;
@@ -1850,15 +1848,15 @@
static void test_window_adjust_font_size (TestWindow* self, gdouble factor) {
glong columns = 0L;
- VteTerminal* _tmp0_;
- glong _tmp1_;
+ VteTerminal* _tmp0_ = NULL;
+ glong _tmp1_ = 0L;
glong rows = 0L;
- VteTerminal* _tmp2_;
- glong _tmp3_;
- VteTerminal* _tmp4_;
- VteTerminal* _tmp5_;
- gdouble _tmp6_;
- gdouble _tmp7_;
+ VteTerminal* _tmp2_ = NULL;
+ glong _tmp3_ = 0L;
+ VteTerminal* _tmp4_ = NULL;
+ VteTerminal* _tmp5_ = NULL;
+ gdouble _tmp6_ = 0.0;
+ gdouble _tmp7_ = 0.0;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->terminal;
_tmp1_ = vte_terminal_get_column_count (_tmp0_);
@@ -1877,15 +1875,15 @@
void test_window_apply_geometry (TestWindow* self) {
- VteTerminal* _tmp0_;
- const gchar* _tmp1_;
+ VteTerminal* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->terminal;
gtk_widget_realize ((GtkWidget*) _tmp0_);
_tmp1_ = test_app_options_geometry;
if (_tmp1_ != NULL) {
- const gchar* _tmp2_;
- gboolean _tmp3_;
+ const gchar* _tmp2_ = NULL;
+ gboolean _tmp3_ = FALSE;
_tmp2_ = test_app_options_geometry;
_tmp3_ = gtk_window_parse_geometry ((GtkWindow*) self, _tmp2_);
if (_tmp3_) {
@@ -1893,11 +1891,11 @@
gint rows = 0;
gint _tmp4_ = 0;
gint _tmp5_ = 0;
- VteTerminal* _tmp6_;
- gint _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ VteTerminal* _tmp6_ = NULL;
+ gint _tmp7_ = 0;
+ gint _tmp8_ = 0;
+ gint _tmp9_ = 0;
+ gint _tmp10_ = 0;
gtk_window_get_default_size ((GtkWindow*) self, &_tmp4_, &_tmp5_);
columns = _tmp4_;
rows = _tmp5_;
@@ -1909,15 +1907,15 @@
_tmp10_ = rows;
gtk_window_resize_to_geometry ((GtkWindow*) self, _tmp9_, _tmp10_);
} else {
- const gchar* _tmp11_;
+ const gchar* _tmp11_ = NULL;
_tmp11_ = test_app_options_geometry;
g_printerr ("Failed to parse geometry spec \"%s\"\n", _tmp11_);
}
} else {
- VteTerminal* _tmp12_;
- glong _tmp13_;
- VteTerminal* _tmp14_;
- glong _tmp15_;
+ VteTerminal* _tmp12_ = NULL;
+ glong _tmp13_ = 0L;
+ VteTerminal* _tmp14_ = NULL;
+ glong _tmp15_ = 0L;
_tmp12_ = self->priv->terminal;
_tmp13_ = vte_terminal_get_column_count (_tmp12_);
_tmp14_ = self->priv->terminal;
@@ -1952,12 +1950,12 @@
GError * _inner_error_ = NULL;
self = _data1_->self;
{
- VteTerminal* _tmp0_;
- const gchar* _tmp1_;
- gchar** _tmp2_;
- gint _tmp2__length1;
+ VteTerminal* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+ gchar** _tmp2_ = NULL;
+ gint _tmp2__length1 = 0;
GPid _tmp3_ = 0;
- GPid _tmp4_;
+ GPid _tmp4_ = 0;
_tmp0_ = self->priv->terminal;
_tmp1_ = test_app_options_working_directory;
_tmp2_ = test_app_options_environment;
@@ -1974,8 +1972,8 @@
__catch5_g_error:
{
GError* e = NULL;
- GError* _tmp5_;
- const gchar* _tmp6_;
+ GError* _tmp5_ = NULL;
+ const gchar* _tmp6_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp5_ = e;
@@ -2005,10 +2003,10 @@
static void test_window_launch_command (TestWindow* self, const gchar* command, GError** error) {
Block1Data* _data1_;
- const gchar* _tmp0_;
+ const gchar* _tmp0_ = NULL;
gchar** _tmp1_ = NULL;
- gint _tmp2_;
- guint _tmp3_;
+ gint _tmp2_ = 0;
+ guint _tmp3_ = 0U;
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (command != NULL);
@@ -2036,8 +2034,8 @@
static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
- glong _tmp0_;
- gchar _tmp1_;
+ glong _tmp0_ = 0L;
+ gchar _tmp1_ = '\0';
g_return_val_if_fail (self != NULL, '\0');
_tmp0_ = index;
_tmp1_ = ((gchar*) self)[_tmp0_];
@@ -2048,12 +2046,12 @@
static void test_window_launch_shell (TestWindow* self, GError** error) {
gchar* shell = NULL;
- gchar* _tmp0_;
+ gchar* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
- const gchar* _tmp2_;
+ const gchar* _tmp2_ = NULL;
gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
- const gchar* _tmp12_;
+ const gchar* _tmp8_ = NULL;
+ const gchar* _tmp12_ = NULL;
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = vte_get_user_shell ();
@@ -2063,15 +2061,15 @@
if (_tmp2_ == NULL) {
_tmp1_ = TRUE;
} else {
- const gchar* _tmp3_;
- gchar _tmp4_;
+ const gchar* _tmp3_ = NULL;
+ gchar _tmp4_ = '\0';
_tmp3_ = shell;
_tmp4_ = string_get (_tmp3_, (glong) 0);
_tmp1_ = _tmp4_ == '\0';
}
if (_tmp1_) {
- const gchar* _tmp5_;
- gchar* _tmp6_;
+ const gchar* _tmp5_ = NULL;
+ gchar* _tmp6_ = NULL;
_tmp5_ = g_getenv ("SHELL");
_tmp6_ = g_strdup (_tmp5_);
_g_free0 (shell);
@@ -2081,14 +2079,14 @@
if (_tmp8_ == NULL) {
_tmp7_ = TRUE;
} else {
- const gchar* _tmp9_;
- gchar _tmp10_;
+ const gchar* _tmp9_ = NULL;
+ gchar _tmp10_ = '\0';
_tmp9_ = shell;
_tmp10_ = string_get (_tmp9_, (glong) 0);
_tmp7_ = _tmp10_ == '\0';
}
if (_tmp7_) {
- gchar* _tmp11_;
+ gchar* _tmp11_ = NULL;
_tmp11_ = g_strdup ("/bin/sh");
_g_free0 (shell);
shell = _tmp11_;
@@ -2108,10 +2106,10 @@
VtePty* pty = NULL;
pid_t pid = 0;
VtePty* _tmp0_ = NULL;
- VtePty* _tmp1_;
- VtePty* _tmp2_;
- pid_t _tmp3_;
- pid_t _tmp4_;
+ VtePty* _tmp1_ = NULL;
+ VtePty* _tmp2_ = NULL;
+ pid_t _tmp3_ = 0;
+ pid_t _tmp4_ = 0;
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
_tmp1_ = vte_pty_new_sync (VTE_PTY_DEFAULT, NULL, &_inner_error_);
@@ -2137,7 +2135,7 @@
case 0:
{
{
- VtePty* _tmp5_;
+ VtePty* _tmp5_ = NULL;
_tmp5_ = pty;
vte_pty_child_setup (_tmp5_);
{
@@ -2147,9 +2145,9 @@
gboolean _tmp6_ = FALSE;
_tmp6_ = TRUE;
while (TRUE) {
- gint _tmp8_;
+ gint _tmp8_ = 0;
if (!_tmp6_) {
- gint _tmp7_;
+ gint _tmp7_ = 0;
_tmp7_ = i;
i = _tmp7_ + 1;
}
@@ -2159,14 +2157,14 @@
case 0:
case 1:
{
- gint _tmp9_;
+ gint _tmp9_ = 0;
_tmp9_ = i;
g_print ("%d\n", _tmp9_);
break;
}
case 2:
{
- gint _tmp10_;
+ gint _tmp10_ = 0;
_tmp10_ = i;
g_printerr ("%d\n", _tmp10_);
break;
@@ -2182,12 +2180,12 @@
}
default:
{
- VteTerminal* _tmp11_;
- VtePty* _tmp12_;
- VteTerminal* _tmp13_;
- pid_t _tmp14_;
- pid_t _tmp15_;
- pid_t _tmp16_;
+ VteTerminal* _tmp11_ = NULL;
+ VtePty* _tmp12_ = NULL;
+ VteTerminal* _tmp13_ = NULL;
+ pid_t _tmp14_ = 0;
+ pid_t _tmp15_ = 0;
+ pid_t _tmp16_ = 0;
_tmp11_ = self->priv->terminal;
_tmp12_ = pty;
vte_terminal_set_pty (_tmp11_, _tmp12_);
@@ -2209,17 +2207,17 @@
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
{
- const gchar* _tmp0_;
+ const gchar* _tmp0_ = NULL;
_tmp0_ = test_app_options_command;
if (_tmp0_ != NULL) {
- const gchar* _tmp1_;
+ const gchar* _tmp1_ = NULL;
_tmp1_ = test_app_options_command;
test_window_launch_command (self, _tmp1_, &_inner_error_);
if (G_UNLIKELY (_inner_error_ != NULL)) {
goto __catch6_g_error;
}
} else {
- gboolean _tmp2_;
+ gboolean _tmp2_ = FALSE;
_tmp2_ = test_app_options_no_shell;
if (!_tmp2_) {
test_window_launch_shell (self, &_inner_error_);
@@ -2238,8 +2236,8 @@
__catch6_g_error:
{
GError* e = NULL;
- GError* _tmp3_;
- const gchar* _tmp4_;
+ GError* _tmp3_ = NULL;
+ const gchar* _tmp4_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp3_ = e;
@@ -2258,10 +2256,10 @@
static void test_window_update_copy_sensitivity (TestWindow* self) {
GSimpleAction* action = NULL;
- GAction* _tmp0_;
- GSimpleAction* _tmp1_;
- VteTerminal* _tmp2_;
- gboolean _tmp3_;
+ GAction* _tmp0_ = NULL;
+ GSimpleAction* _tmp1_ = NULL;
+ VteTerminal* _tmp2_ = NULL;
+ gboolean _tmp3_ = FALSE;
g_return_if_fail (self != NULL);
_tmp0_ = g_action_map_lookup_action ((GActionMap*) self, "copy");
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL);
@@ -2278,14 +2276,14 @@
gint targets_length1 = 0;
gint _targets_size_ = 0;
gboolean can_paste = FALSE;
- GtkClipboard* _tmp0_;
+ GtkClipboard* _tmp0_ = NULL;
GdkAtom* _tmp1_ = NULL;
- gint _tmp2_;
- gboolean _tmp3_;
+ gint _tmp2_ = 0;
+ gboolean _tmp3_ = FALSE;
GSimpleAction* action = NULL;
- GAction* _tmp6_;
- GSimpleAction* _tmp7_;
- gboolean _tmp8_;
+ GAction* _tmp6_ = NULL;
+ GSimpleAction* _tmp7_ = NULL;
+ gboolean _tmp8_ = FALSE;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->clipboard;
_tmp3_ = gtk_clipboard_wait_for_targets (_tmp0_, &_tmp1_, &_tmp2_);
@@ -2294,9 +2292,9 @@
targets_length1 = _tmp2_;
_targets_size_ = targets_length1;
if (_tmp3_) {
- GdkAtom* _tmp4_;
- gint _tmp4__length1;
- gboolean _tmp5_;
+ GdkAtom* _tmp4_ = NULL;
+ gint _tmp4__length1 = 0;
+ gboolean _tmp5_ = FALSE;
_tmp4_ = targets;
_tmp4__length1 = targets_length1;
_tmp5_ = gtk_targets_include_text (_tmp4_, _tmp4__length1);
@@ -2315,10 +2313,10 @@
static void test_window_update_geometry (TestWindow* self) {
- gboolean _tmp0_;
- VteTerminal* _tmp1_;
- gboolean _tmp2_;
- VteTerminal* _tmp3_;
+ gboolean _tmp0_ = FALSE;
+ VteTerminal* _tmp1_ = NULL;
+ gboolean _tmp2_ = FALSE;
+ VteTerminal* _tmp3_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = test_app_options_no_geometry_hints;
if (_tmp0_) {
@@ -2335,7 +2333,7 @@
static void test_window_action_copy_cb (TestWindow* self) {
- VteTerminal* _tmp0_;
+ VteTerminal* _tmp0_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->terminal;
vte_terminal_copy_clipboard (_tmp0_);
@@ -2345,10 +2343,10 @@
static void test_window_action_copy_match_cb (TestWindow* self, GSimpleAction* action, GVariant* parameter) {
gsize len = 0UL;
const gchar* str = NULL;
- GVariant* _tmp0_;
+ GVariant* _tmp0_ = NULL;
gsize _tmp1_ = 0UL;
- const gchar* _tmp2_;
- GtkClipboard* _tmp3_;
+ const gchar* _tmp2_ = NULL;
+ GtkClipboard* _tmp3_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (action != NULL);
_tmp0_ = parameter;
@@ -2361,7 +2359,7 @@
static void test_window_action_paste_cb (TestWindow* self) {
- VteTerminal* _tmp0_;
+ VteTerminal* _tmp0_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->terminal;
vte_terminal_paste_clipboard (_tmp0_);
@@ -2371,25 +2369,25 @@
static void test_window_action_reset_cb (TestWindow* self, GSimpleAction* action, GVariant* parameter) {
gboolean clear = FALSE;
GdkModifierType modifiers = 0;
- GVariant* _tmp0_;
- VteTerminal* _tmp6_;
- gboolean _tmp7_;
+ GVariant* _tmp0_ = NULL;
+ VteTerminal* _tmp6_ = NULL;
+ gboolean _tmp7_ = FALSE;
g_return_if_fail (self != NULL);
g_return_if_fail (action != NULL);
_tmp0_ = parameter;
if (_tmp0_ != NULL) {
- GVariant* _tmp1_;
- gboolean _tmp2_;
+ GVariant* _tmp1_ = NULL;
+ gboolean _tmp2_ = FALSE;
_tmp1_ = parameter;
_tmp2_ = g_variant_get_boolean (_tmp1_);
clear = _tmp2_;
} else {
GdkModifierType _tmp3_ = 0;
- gboolean _tmp4_;
+ gboolean _tmp4_ = FALSE;
_tmp4_ = gtk_get_current_event_state (&_tmp3_);
modifiers = _tmp3_;
if (_tmp4_) {
- GdkModifierType _tmp5_;
+ GdkModifierType _tmp5_ = 0;
_tmp5_ = modifiers;
clear = (_tmp5_ & GDK_CONTROL_MASK) != 0;
} else {
@@ -2403,7 +2401,7 @@
static void test_window_action_find_cb (TestWindow* self) {
- GtkToggleButton* _tmp0_;
+ GtkToggleButton* _tmp0_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->find_button;
gtk_toggle_button_set_active (_tmp0_, TRUE);
@@ -2418,8 +2416,8 @@
static gboolean test_window_popup_menu_cb (TestWindow* self) {
gboolean result = FALSE;
- guint32 _tmp0_;
- gboolean _tmp1_;
+ guint32 _tmp0_ = 0U;
+ gboolean _tmp1_ = FALSE;
g_return_val_if_fail (self != NULL, FALSE);
_tmp0_ = gtk_get_current_event_time ();
_tmp1_ = test_window_show_context_menu (self, (guint) 0, _tmp0_, NULL);
@@ -2430,14 +2428,14 @@
static gboolean test_window_button_press_event_cb (TestWindow* self, GtkWidget* widget, GdkEventButton* event) {
gboolean result = FALSE;
- GdkEventButton* _tmp0_;
- guint _tmp1_;
- GdkEventButton* _tmp2_;
- guint _tmp3_;
- GdkEventButton* _tmp4_;
- guint32 _tmp5_;
- GdkEventButton* _tmp6_;
- gboolean _tmp7_;
+ GdkEventButton* _tmp0_ = NULL;
+ guint _tmp1_ = 0U;
+ GdkEventButton* _tmp2_ = NULL;
+ guint _tmp3_ = 0U;
+ GdkEventButton* _tmp4_ = NULL;
+ guint32 _tmp5_ = 0U;
+ GdkEventButton* _tmp6_ = NULL;
+ gboolean _tmp7_ = FALSE;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@@ -2460,20 +2458,20 @@
static gboolean test_window_show_context_menu (TestWindow* self, guint button, guint32 timestamp, GdkEvent* event) {
gboolean result = FALSE;
- gboolean _tmp0_;
+ gboolean _tmp0_ = FALSE;
GMenu* menu = NULL;
- GMenu* _tmp1_;
- GMenu* _tmp2_;
- GdkEvent* _tmp3_;
- GMenu* _tmp12_;
+ GMenu* _tmp1_ = NULL;
+ GMenu* _tmp2_ = NULL;
+ GdkEvent* _tmp3_ = NULL;
+ GMenu* _tmp12_ = NULL;
GtkMenu* popup = NULL;
- GMenu* _tmp13_;
- GtkMenu* _tmp14_;
- GtkMenu* _tmp15_;
- GtkMenu* _tmp16_;
- guint _tmp17_;
- guint32 _tmp18_;
- guint _tmp19_;
+ GMenu* _tmp13_ = NULL;
+ GtkMenu* _tmp14_ = NULL;
+ GtkMenu* _tmp15_ = NULL;
+ GtkMenu* _tmp16_ = NULL;
+ guint _tmp17_ = 0U;
+ guint32 _tmp18_ = 0U;
+ guint _tmp19_ = 0U;
g_return_val_if_fail (self != NULL, FALSE);
_tmp0_ = test_app_options_no_context_menu;
if (_tmp0_) {
@@ -2487,20 +2485,20 @@
_tmp3_ = event;
if (_tmp3_ != NULL) {
gchar* match = NULL;
- VteTerminal* _tmp4_;
- GdkEvent* _tmp5_;
- gchar* _tmp6_;
- const gchar* _tmp7_;
+ VteTerminal* _tmp4_ = NULL;
+ GdkEvent* _tmp5_ = NULL;
+ gchar* _tmp6_ = NULL;
+ const gchar* _tmp7_ = NULL;
_tmp4_ = self->priv->terminal;
_tmp5_ = event;
_tmp6_ = vte_terminal_match_check_event (_tmp4_, _tmp5_, NULL);
match = _tmp6_;
_tmp7_ = match;
if (_tmp7_ != NULL) {
- GMenu* _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
+ GMenu* _tmp8_ = NULL;
+ const gchar* _tmp9_ = NULL;
+ gchar* _tmp10_ = NULL;
+ gchar* _tmp11_ = NULL;
_tmp8_ = menu;
_tmp9_ = match;
_tmp10_ = g_strconcat ("win.copy-match::", _tmp9_, NULL);
@@ -2524,7 +2522,7 @@
gtk_menu_popup (_tmp16_, NULL, NULL, NULL, NULL, _tmp17_, _tmp18_);
_tmp19_ = button;
if (_tmp19_ == ((guint) 0)) {
- GtkMenu* _tmp20_;
+ GtkMenu* _tmp20_ = NULL;
_tmp20_ = popup;
gtk_menu_shell_select_first ((GtkMenuShell*) _tmp20_, TRUE);
}
@@ -2543,9 +2541,9 @@
static void test_window_child_exited_cb (TestWindow* self, VteTerminal* terminal, gint status) {
- gint _tmp0_;
- const gchar* _tmp1_;
- gboolean _tmp11_;
+ gint _tmp0_ = 0;
+ const gchar* _tmp1_ = NULL;
+ gboolean _tmp11_ = FALSE;
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
@@ -2555,13 +2553,13 @@
if (_tmp1_ != NULL) {
{
GFile* file = NULL;
- const gchar* _tmp2_;
- GFile* _tmp3_;
+ const gchar* _tmp2_ = NULL;
+ GFile* _tmp3_ = NULL;
GFileOutputStream* stream = NULL;
- GFile* _tmp4_;
- GFileOutputStream* _tmp5_;
- VteTerminal* _tmp6_;
- GFileOutputStream* _tmp7_;
+ GFile* _tmp4_ = NULL;
+ GFileOutputStream* _tmp5_ = NULL;
+ VteTerminal* _tmp6_ = NULL;
+ GFileOutputStream* _tmp7_ = NULL;
_tmp2_ = test_app_options_output_filename;
_tmp3_ = g_file_new_for_commandline_arg (_tmp2_);
file = _tmp3_;
@@ -2587,9 +2585,9 @@
__catch7_g_error:
{
GError* e = NULL;
- const gchar* _tmp8_;
- GError* _tmp9_;
- const gchar* _tmp10_;
+ const gchar* _tmp8_ = NULL;
+ GError* _tmp9_ = NULL;
+ const gchar* _tmp10_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp8_ = test_app_options_output_filename;
@@ -2636,9 +2634,9 @@
static void test_window_icon_title_changed_cb (TestWindow* self, VteTerminal* terminal) {
- GdkWindow* _tmp0_;
- VteTerminal* _tmp1_;
- const gchar* _tmp2_;
+ GdkWindow* _tmp0_ = NULL;
+ VteTerminal* _tmp1_ = NULL;
+ const gchar* _tmp2_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp0_ = gtk_widget_get_window ((GtkWidget*) self);
@@ -2663,8 +2661,8 @@
static void test_window_lower_window_cb (TestWindow* self, VteTerminal* terminal) {
- gboolean _tmp0_;
- GdkWindow* _tmp1_;
+ gboolean _tmp0_ = FALSE;
+ GdkWindow* _tmp1_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp0_ = gtk_widget_get_realized ((GtkWidget*) self);
@@ -2684,8 +2682,8 @@
static void test_window_move_window_cb (TestWindow* self, VteTerminal* terminal, guint x, guint y) {
- guint _tmp0_;
- guint _tmp1_;
+ guint _tmp0_ = 0U;
+ guint _tmp1_ = 0U;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp0_ = x;
@@ -2695,20 +2693,20 @@
static void test_window_notify_cb (TestWindow* self, GObject* object, GParamSpec* pspec) {
- GParamSpec* _tmp0_;
- GType _tmp1_;
+ GParamSpec* _tmp0_ = NULL;
+ GType _tmp1_ = 0UL;
GValue value = {0};
- GParamSpec* _tmp2_;
- GType _tmp3_;
+ GParamSpec* _tmp2_ = NULL;
+ GType _tmp3_ = 0UL;
GValue _tmp4_ = {0};
- GObject* _tmp5_;
- GParamSpec* _tmp6_;
- const gchar* _tmp7_;
+ GObject* _tmp5_ = NULL;
+ GParamSpec* _tmp6_ = NULL;
+ const gchar* _tmp7_ = NULL;
gchar* str = NULL;
- gchar* _tmp8_;
- GParamSpec* _tmp9_;
- const gchar* _tmp10_;
- const gchar* _tmp11_;
+ gchar* _tmp8_ = NULL;
+ GParamSpec* _tmp9_ = NULL;
+ const gchar* _tmp10_ = NULL;
+ const gchar* _tmp11_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (object != NULL);
g_return_if_fail (pspec != NULL);
@@ -2737,8 +2735,8 @@
static void test_window_raise_window_cb (TestWindow* self, VteTerminal* terminal) {
- gboolean _tmp0_;
- GdkWindow* _tmp1_;
+ gboolean _tmp0_ = FALSE;
+ GdkWindow* _tmp1_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp0_ = gtk_widget_get_realized ((GtkWidget*) self);
@@ -2766,19 +2764,19 @@
static void test_window_resize_window_cb (TestWindow* self, VteTerminal* terminal, guint columns, guint rows) {
gboolean _tmp0_ = FALSE;
- guint _tmp1_;
- VteTerminal* _tmp3_;
- guint _tmp4_;
- guint _tmp5_;
- guint _tmp6_;
- guint _tmp7_;
+ guint _tmp1_ = 0U;
+ VteTerminal* _tmp3_ = NULL;
+ guint _tmp4_ = 0U;
+ guint _tmp5_ = 0U;
+ guint _tmp6_ = 0U;
+ guint _tmp7_ = 0U;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp1_ = columns;
if (_tmp1_ < ((guint) 2)) {
_tmp0_ = TRUE;
} else {
- guint _tmp2_;
+ guint _tmp2_ = 0U;
_tmp2_ = rows;
_tmp0_ = _tmp2_ < ((guint) 2);
}
@@ -2810,8 +2808,8 @@
static void test_window_window_title_changed_cb (TestWindow* self, VteTerminal* terminal) {
- VteTerminal* _tmp0_;
- const gchar* _tmp1_;
+ VteTerminal* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (terminal != NULL);
_tmp0_ = terminal;
@@ -2836,9 +2834,9 @@
static void test_window_instance_init (TestWindow * self) {
- gchar* _tmp0_;
- gchar* _tmp1_;
- gchar** _tmp2_;
+ gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+ gchar** _tmp2_ = NULL;
self->priv = TEST_WINDOW_GET_PRIVATE (self);
_tmp0_ = g_strdup ("(((gopher|news|telnet|nntp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0" \
"-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?");
@@ -2855,7 +2853,7 @@
}
-static void test_window_finalize (GObject * obj) {
+static void test_window_finalize (GObject* obj) {
TestWindow * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TEST_TYPE_WINDOW, TestWindow);
_g_object_unref0 (self->priv->scrollbar);
@@ -2886,8 +2884,8 @@
TestApp* test_app_construct (GType object_type) {
TestApp * self = NULL;
GtkSettings* settings = NULL;
- GtkSettings* _tmp0_;
- GtkSettings* _tmp1_;
+ GtkSettings* _tmp0_ = NULL;
+ GtkSettings* _tmp1_ = NULL;
self = (TestApp*) g_object_new (object_type, "application-id", "org.gnome.Vte.Test.App", "flags", G_APPLICATION_NON_UNIQUE, NULL);
_tmp0_ = gtk_settings_get_default ();
_tmp1_ = _g_object_ref0 (_tmp0_);
@@ -2916,13 +2914,13 @@
gboolean _tmp0_ = FALSE;
_tmp0_ = TRUE;
while (TRUE) {
- guint _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
- TestWindow* _tmp5_;
- TestWindow* _tmp6_;
+ guint _tmp2_ = 0U;
+ gint _tmp3_ = 0;
+ gint _tmp4_ = 0;
+ TestWindow* _tmp5_ = NULL;
+ TestWindow* _tmp6_ = NULL;
if (!_tmp0_) {
- guint _tmp1_;
+ guint _tmp1_ = 0U;
_tmp1_ = i;
i = _tmp1_ + 1;
}
@@ -2945,7 +2943,7 @@
static void test_app_real_activate (GApplication* base) {
TestApp * self;
- GList* _tmp0_;
+ GList* _tmp0_ = NULL;
self = (TestApp*) base;
_tmp0_ = gtk_application_get_windows ((GtkApplication*) self);
{
@@ -2953,18 +2951,18 @@
GList* win_it = NULL;
win_collection = _tmp0_;
for (win_it = win_collection; win_it != NULL; win_it = win_it->next) {
- GtkWindow* _tmp1_;
+ GtkWindow* _tmp1_ = NULL;
GtkWindow* win = NULL;
_tmp1_ = _g_object_ref0 ((GtkWindow*) win_it->data);
win = _tmp1_;
{
- GtkWindow* _tmp2_;
+ GtkWindow* _tmp2_ = NULL;
TestWindow* window = NULL;
- GtkWindow* _tmp3_;
- TestWindow* _tmp4_;
- TestWindow* _tmp5_;
- TestWindow* _tmp6_;
- TestWindow* _tmp7_;
+ GtkWindow* _tmp3_ = NULL;
+ TestWindow* _tmp4_ = NULL;
+ TestWindow* _tmp5_ = NULL;
+ TestWindow* _tmp6_ = NULL;
+ TestWindow* _tmp7_ = NULL;
_tmp2_ = win;
if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TEST_TYPE_WINDOW)) {
_g_object_unref0 (win);
@@ -2989,14 +2987,14 @@
gint test_app_main (gchar** argv, int argv_length1) {
gint result = 0;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gboolean _tmp12_;
- gboolean _tmp13_;
+ const gchar* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+ gboolean _tmp12_ = FALSE;
+ gboolean _tmp13_ = FALSE;
TestApp* app = NULL;
- TestApp* _tmp15_;
- TestApp* _tmp16_;
- gint _tmp17_;
+ TestApp* _tmp15_ = NULL;
+ TestApp* _tmp16_ = NULL;
+ gint _tmp17_ = 0;
GError * _inner_error_ = NULL;
setlocale (LC_ALL, "");
_tmp0_ = g_getenv ("VTE_CJK_WIDTH");
@@ -3011,12 +3009,12 @@
g_set_application_name ("Terminal");
{
GOptionContext* context = NULL;
- GOptionContext* _tmp2_;
- GOptionContext* _tmp3_;
- GOptionContext* _tmp4_;
- GOptionContext* _tmp5_;
- GOptionGroup* _tmp6_;
- GOptionContext* _tmp7_;
+ GOptionContext* _tmp2_ = NULL;
+ GOptionContext* _tmp3_ = NULL;
+ GOptionContext* _tmp4_ = NULL;
+ GOptionContext* _tmp5_ = NULL;
+ GOptionGroup* _tmp6_ = NULL;
+ GOptionContext* _tmp7_ = NULL;
_tmp2_ = g_option_context_new ("— simple VTE test application");
context = _tmp2_;
_tmp3_ = context;
@@ -3045,8 +3043,8 @@
__catch8_g_option_error:
{
GError* e = NULL;
- GError* _tmp9_;
- const gchar* _tmp10_;
+ GError* _tmp9_ = NULL;
+ const gchar* _tmp10_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp9_ = e;
@@ -3071,7 +3069,7 @@
}
_tmp13_ = test_app_options_debug;
if (_tmp13_) {
- gboolean _tmp14_;
+ gboolean _tmp14_ = FALSE;
_tmp14_ = test_app_options_debug;
gdk_window_set_debug_updates (_tmp14_);
}
@@ -3097,13 +3095,13 @@
gint result = 0;
gint value = 0;
GEnumClass* enum_klass = NULL;
- GType _tmp0_;
- GTypeClass* _tmp1_;
+ GType _tmp0_ = 0UL;
+ GTypeClass* _tmp1_ = NULL;
GEnumValue* enum_value = NULL;
- GEnumClass* _tmp2_;
- const gchar* _tmp3_;
- GEnumValue* _tmp4_;
- GEnumValue* _tmp5_;
+ GEnumClass* _tmp2_ = NULL;
+ const gchar* _tmp3_ = NULL;
+ GEnumValue* _tmp4_ = NULL;
+ GEnumValue* _tmp5_ = NULL;
g_return_val_if_fail (str != NULL, 0);
value = 0;
_tmp0_ = type;
@@ -3115,16 +3113,16 @@
enum_value = _tmp4_;
_tmp5_ = enum_value;
if (_tmp5_ != NULL) {
- GEnumValue* _tmp6_;
- gint _tmp7_;
+ GEnumValue* _tmp6_ = NULL;
+ gint _tmp7_ = 0;
_tmp6_ = enum_value;
_tmp7_ = (*_tmp6_).value;
value = _tmp7_;
} else {
- const gchar* _tmp8_;
- GType _tmp9_;
- GQuark _tmp10_;
- const gchar* _tmp11_;
+ const gchar* _tmp8_ = NULL;
+ GType _tmp9_ = 0UL;
+ GQuark _tmp10_ = 0U;
+ const gchar* _tmp11_ = NULL;
_tmp8_ = str;
_tmp9_ = type;
_tmp10_ = g_type_qname (_tmp9_);
@@ -3139,10 +3137,10 @@
gint test_app_options_get_cjk_ambiguous_width (void) {
gint result = 0;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
+ const gchar* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+ const gchar* _tmp2_ = NULL;
+ const gchar* _tmp3_ = NULL;
_tmp0_ = test_app_options_cjk_ambiguous_width_string;
if (_tmp0_ == NULL) {
result = 1;
@@ -3168,25 +3166,25 @@
void test_app_options_get_color_bg (GdkRGBA* result) {
GdkRGBA color = {0};
- gint _tmp0_;
- gint _tmp1_;
- gboolean _tmp2_;
+ gint _tmp0_ = 0;
+ gint _tmp1_ = 0;
+ gboolean _tmp2_ = FALSE;
memset (&color, 0, sizeof (GdkRGBA));
_tmp0_ = test_app_options_transparency_percent;
_tmp1_ = CLAMP (_tmp0_, 0, 100);
color.alpha = ((gdouble) (100 - _tmp1_)) / 100.0;
_tmp2_ = test_app_options_reverse;
if (_tmp2_) {
- gdouble _tmp3_;
- gdouble _tmp4_;
+ gdouble _tmp3_ = 0.0;
+ gdouble _tmp4_ = 0.0;
color.blue = 1.0;
_tmp3_ = color.blue;
color.green = _tmp3_;
_tmp4_ = color.green;
color.red = _tmp4_;
} else {
- gdouble _tmp5_;
- gdouble _tmp6_;
+ gdouble _tmp5_ = 0.0;
+ gdouble _tmp6_ = 0.0;
color.blue = 0.0;
_tmp5_ = color.blue;
color.green = _tmp5_;
@@ -3200,21 +3198,21 @@
void test_app_options_get_color_fg (GdkRGBA* result) {
GdkRGBA color = {0};
- gboolean _tmp0_;
+ gboolean _tmp0_ = FALSE;
memset (&color, 0, sizeof (GdkRGBA));
color.alpha = 1.0;
_tmp0_ = test_app_options_reverse;
if (_tmp0_) {
- gdouble _tmp1_;
- gdouble _tmp2_;
+ gdouble _tmp1_ = 0.0;
+ gdouble _tmp2_ = 0.0;
color.blue = 0.0;
_tmp1_ = color.blue;
color.green = _tmp1_;
_tmp2_ = color.green;
color.red = _tmp2_;
} else {
- gdouble _tmp3_;
- gdouble _tmp4_;
+ gdouble _tmp3_ = 0.0;
+ gdouble _tmp4_ = 0.0;
color.blue = 1.0;
_tmp3_ = color.blue;
color.green = _tmp3_;
@@ -3241,11 +3239,11 @@
static GdkRGBA* test_app_options_get_color (const gchar* str) {
GdkRGBA* result = NULL;
- const gchar* _tmp0_;
+ const gchar* _tmp0_ = NULL;
GdkRGBA color = {0};
- const gchar* _tmp1_;
- gboolean _tmp2_;
- GdkRGBA* _tmp4_;
+ const gchar* _tmp1_ = NULL;
+ gboolean _tmp2_ = FALSE;
+ GdkRGBA* _tmp4_ = NULL;
_tmp0_ = str;
if (_tmp0_ == NULL) {
result = NULL;
@@ -3255,7 +3253,7 @@
_tmp1_ = str;
_tmp2_ = gdk_rgba_parse (&color, _tmp1_);
if (!_tmp2_) {
- const gchar* _tmp3_;
+ const gchar* _tmp3_ = NULL;
_tmp3_ = str;
g_printerr ("Failed to parse \"%s\" as color.\n", _tmp3_);
result = NULL;
@@ -3269,8 +3267,8 @@
GdkRGBA* test_app_options_get_color_cursor_background (void) {
GdkRGBA* result = NULL;
- const gchar* _tmp0_;
- GdkRGBA* _tmp1_;
+ const gchar* _tmp0_ = NULL;
+ GdkRGBA* _tmp1_ = NULL;
_tmp0_ = test_app_options_cursor_background_color_string;
_tmp1_ = test_app_options_get_color (_tmp0_);
result = _tmp1_;
@@ -3280,8 +3278,8 @@
GdkRGBA* test_app_options_get_color_cursor_foreground (void) {
GdkRGBA* result = NULL;
- const gchar* _tmp0_;
- GdkRGBA* _tmp1_;
+ const gchar* _tmp0_ = NULL;
+ GdkRGBA* _tmp1_ = NULL;
_tmp0_ = test_app_options_cursor_foreground_color_string;
_tmp1_ = test_app_options_get_color (_tmp0_);
result = _tmp1_;
@@ -3291,8 +3289,8 @@
GdkRGBA* test_app_options_get_color_hl_bg (void) {
GdkRGBA* result = NULL;
- const gchar* _tmp0_;
- GdkRGBA* _tmp1_;
+ const gchar* _tmp0_ = NULL;
+ GdkRGBA* _tmp1_ = NULL;
_tmp0_ = test_app_options_hl_bg_color_string;
_tmp1_ = test_app_options_get_color (_tmp0_);
result = _tmp1_;
@@ -3302,8 +3300,8 @@
GdkRGBA* test_app_options_get_color_hl_fg (void) {
GdkRGBA* result = NULL;
- const gchar* _tmp0_;
- GdkRGBA* _tmp1_;
+ const gchar* _tmp0_ = NULL;
+ GdkRGBA* _tmp1_ = NULL;
_tmp0_ = test_app_options_hl_fg_color_string;
_tmp1_ = test_app_options_get_color (_tmp0_);
result = _tmp1_;
@@ -3314,11 +3312,11 @@
VteCursorBlinkMode test_app_options_get_cursor_blink_mode (void) {
VteCursorBlinkMode result = 0;
VteCursorBlinkMode value = 0;
- const gchar* _tmp0_;
+ const gchar* _tmp0_ = NULL;
_tmp0_ = test_app_options_cursor_blink_mode_string;
if (_tmp0_ != NULL) {
- const gchar* _tmp1_;
- gint _tmp2_;
+ const gchar* _tmp1_ = NULL;
+ gint _tmp2_ = 0;
_tmp1_ = test_app_options_cursor_blink_mode_string;
_tmp2_ = test_app_options_parse_enum (vte_cursor_blink_mode_get_type (), _tmp1_);
value = (VteCursorBlinkMode) _tmp2_;
@@ -3333,11 +3331,11 @@
VteCursorShape test_app_options_get_cursor_shape (void) {
VteCursorShape result = 0;
VteCursorShape value = 0;
- const gchar* _tmp0_;
+ const gchar* _tmp0_ = NULL;
_tmp0_ = test_app_options_cursor_shape_string;
if (_tmp0_ != NULL) {
- const gchar* _tmp1_;
- gint _tmp2_;
+ const gchar* _tmp1_ = NULL;
+ gint _tmp2_ = 0;
_tmp1_ = test_app_options_cursor_shape_string;
_tmp2_ = test_app_options_parse_enum (vte_cursor_shape_get_type (), _tmp1_);
value = (VteCursorShape) _tmp2_;
@@ -3375,8 +3373,8 @@
static void test_app_class_init (TestAppClass * klass) {
test_app_parent_class = g_type_class_peek_parent (klass);
- ((GApplicationClass *) klass)->startup = (void (*) (GApplication *)) test_app_real_startup;
- ((GApplicationClass *) klass)->activate = (void (*) (GApplication *)) test_app_real_activate;
+ ((GApplicationClass *) klass)->startup = (void (*)(GApplication*)) test_app_real_startup;
+ ((GApplicationClass *) klass)->activate = (void (*)(GApplication*)) test_app_real_activate;
}
diff -Nru vte2.91-0.48.3/bindings/vala/Makefile.in vte2.91-0.48.4/bindings/vala/Makefile.in
--- vte2.91-0.48.3/bindings/vala/Makefile.in 2017-05-10 20:25:59.000000000 +0000
+++ vte2.91-0.48.4/bindings/vala/Makefile.in 2017-10-03 13:55:19.000000000 +0000
@@ -296,7 +296,6 @@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
diff -Nru vte2.91-0.48.3/bindings/vala/vte-2.91.vapi vte2.91-0.48.4/bindings/vala/vte-2.91.vapi
--- vte2.91-0.48.3/bindings/vala/vte-2.91.vapi 2017-05-10 20:26:41.000000000 +0000
+++ vte2.91-0.48.4/bindings/vala/vte-2.91.vapi 2017-10-03 13:56:08.000000000 +0000
@@ -1,4 +1,4 @@
-/* vte-2.91.vapi generated by vapigen-0.36, do not modify. */
+/* vte-2.91.vapi generated by vapigen-0.34, do not modify. */
[CCode (cprefix = "Vte", gir_namespace = "Vte", gir_version = "2.91", lower_case_cprefix = "vte_")]
namespace Vte {
diff -Nru vte2.91-0.48.3/ChangeLog vte2.91-0.48.4/ChangeLog
--- vte2.91-0.48.3/ChangeLog 2017-05-10 20:28:32.000000000 +0000
+++ vte2.91-0.48.4/ChangeLog 2017-10-03 13:56:50.000000000 +0000
@@ -1,3 +1,76 @@
+commit ba28429a692ab8f42f543c844862f66177b2003e
+Author: Egmont Koblinger
+Date: Fri Sep 29 14:26:40 2017 +0200
+
+ widget: Fix initial size in presence of non-default padding
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=787710
+ (cherry picked from commit 41f55bc1c2a978491b3fa3d23cb4aeb0c900e2b1)
+
+ src/vte.cc | 13 ++++++++++---
+ src/vtegtk.cc | 11 +++++++++++
+ src/vteinternal.hh | 1 +
+ 3 files changed, 22 insertions(+), 3 deletions(-)
+
+commit d854bc3b98018854dfdfbf54532e2deb5b662689
+Author: Egmont Koblinger
+Date: Thu Sep 28 16:03:04 2017 +0200
+
+ emulation: Add support for REP (repeat preceding graphic character)
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=787701
+ (cherry picked from commit 0656a5794c8d075c8e7c4b56b3b6142068433981)
+
+ src/vte.cc | 6 ++++++
+ src/vteinternal.hh | 1 +
+ src/vteseq-n.gperf | 2 +-
+ src/vteseq.cc | 18 ++++++++++++++++++
+ 4 files changed, 26 insertions(+), 1 deletion(-)
+
+commit 319f8a604d42d521d6f69bd66ccf6301ee3ee3f3
+Author: Christian Persch
+Date: Tue Jun 13 09:27:06 2017 +0200
+
+ emulation: Swallow iterm2 OSC 133
+
+ Accept OSC 133 but make it a no-op.
+
+ When sshing to an osx host the iterm2 integration may be active,
+ causing the remote shell to emit iterm2 OSC 133 sequences that
+ clutter the vte terminal since we don't ignore unknown sequences
+ (bug 403130).
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=783710
+ (cherry picked from commit af889244f9306d8686c6346da35f34694240882e)
+
+ src/caps.cc | 2 ++
+ src/vteseq-n.gperf | 1 +
+ src/vteseq.cc | 12 ++++++++++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 19b505453db707f33c2323aa4682ea36f0f52524
+Author: Debarshi Ray
+Date: Tue May 23 09:56:24 2017 +0200
+
+ pty: Removed unused variable
+
+ Fallout from b59d76a5073d789f2f948cf928e883cb70cc8a75
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=782977
+ (cherry picked from commit 965ac9144b5989859230cd859e675fd5dfb29eac)
+
+ src/pty.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit a39592b3ad53e756fc030d8d8553426c3aa5014a
+Author: Christian Persch
+Date: Wed May 10 00:01:13 2017 +0200
+
+ Post release version bump
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 992c481f21e266e7cdfcee1d425b18da4df9ef8d
Author: Egmont Koblinger
Date: Sun Apr 23 23:57:57 2017 +0200
diff -Nru vte2.91-0.48.3/config.guess vte2.91-0.48.4/config.guess
--- vte2.91-0.48.3/config.guess 2017-05-10 20:25:58.000000000 +0000
+++ vte2.91-0.48.4/config.guess 2017-10-03 13:55:18.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2016-10-02'
+timestamp='2015-01-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
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
# Please send patches to .
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,29 +168,19 @@
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
- echo unknown)`
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
- earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
- ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently (or will in the future) and ABI.
+ # to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
- earm*)
- os=netbsdelf
- ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -207,13 +197,6 @@
os=netbsd
;;
esac
- # Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
- earm*)
- expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
- ;;
- esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -224,13 +207,13 @@
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "${machine}-${os}${release}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -240,10 +223,6 @@
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
- *:LibertyBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
- exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -256,9 +235,6 @@
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
- *:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
- exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -275,42 +251,42 @@
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
- UNAME_MACHINE=alpha ;;
+ UNAME_MACHINE="alpha" ;;
"EV4.5 (21064)")
- UNAME_MACHINE=alpha ;;
+ UNAME_MACHINE="alpha" ;;
"LCA4 (21066/21068)")
- UNAME_MACHINE=alpha ;;
+ UNAME_MACHINE="alpha" ;;
"EV5 (21164)")
- UNAME_MACHINE=alphaev5 ;;
+ UNAME_MACHINE="alphaev5" ;;
"EV5.6 (21164A)")
- UNAME_MACHINE=alphaev56 ;;
+ UNAME_MACHINE="alphaev56" ;;
"EV5.6 (21164PC)")
- UNAME_MACHINE=alphapca56 ;;
+ UNAME_MACHINE="alphapca56" ;;
"EV5.7 (21164PC)")
- UNAME_MACHINE=alphapca57 ;;
+ UNAME_MACHINE="alphapca57" ;;
"EV6 (21264)")
- UNAME_MACHINE=alphaev6 ;;
+ UNAME_MACHINE="alphaev6" ;;
"EV6.7 (21264A)")
- UNAME_MACHINE=alphaev67 ;;
+ UNAME_MACHINE="alphaev67" ;;
"EV6.8CB (21264C)")
- UNAME_MACHINE=alphaev68 ;;
+ UNAME_MACHINE="alphaev68" ;;
"EV6.8AL (21264B)")
- UNAME_MACHINE=alphaev68 ;;
+ UNAME_MACHINE="alphaev68" ;;
"EV6.8CX (21264D)")
- UNAME_MACHINE=alphaev68 ;;
+ UNAME_MACHINE="alphaev68" ;;
"EV6.9A (21264/EV69A)")
- UNAME_MACHINE=alphaev69 ;;
+ UNAME_MACHINE="alphaev69" ;;
"EV7 (21364)")
- UNAME_MACHINE=alphaev7 ;;
+ UNAME_MACHINE="alphaev7" ;;
"EV7.9 (21364A)")
- UNAME_MACHINE=alphaev79 ;;
+ UNAME_MACHINE="alphaev79" ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
@@ -383,16 +359,16 @@
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
- SUN_ARCH=i386
+ SUN_ARCH="i386"
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
- SUN_ARCH=x86_64
+ SUN_ARCH="x86_64"
fi
fi
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -417,7 +393,7 @@
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
echo m68k-sun-sunos${UNAME_RELEASE}
@@ -642,13 +618,13 @@
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
- 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
- 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
case "${sc_kernel_bits}" in
- 32) HP_ARCH=hppa2.0n ;;
- 64) HP_ARCH=hppa2.0w ;;
- '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
fi
@@ -687,11 +663,11 @@
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = hppa2.0w ]
+ if [ ${HP_ARCH} = "hppa2.0w" ]
then
eval $set_cc_for_build
@@ -704,12 +680,12 @@
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
- if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
grep -q __LP64__
then
- HP_ARCH=hppa2.0w
+ HP_ARCH="hppa2.0w"
else
- HP_ARCH=hppa64
+ HP_ARCH="hppa64"
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -814,14 +790,14 @@
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
- FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -903,7 +879,7 @@
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
@@ -926,7 +902,7 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
@@ -957,9 +933,6 @@
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
- e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -972,9 +945,6 @@
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
- k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1000,9 +970,6 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- mips64el:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
@@ -1035,9 +1002,6 @@
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
- riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
@@ -1057,7 +1021,7 @@
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1136,7 +1100,7 @@
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configure will decide that
+ # prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1285,9 +1249,6 @@
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
- SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1301,9 +1262,9 @@
UNAME_PROCESSOR=powerpc
fi
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != no_compiler_found ]; 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) | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
@@ -1325,7 +1286,7 @@
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = x86; then
+ if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
@@ -1356,7 +1317,7 @@
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- if test "$cputype" = 386; then
+ if test "$cputype" = "386"; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
@@ -1398,7 +1359,7 @@
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
exit ;;
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
@@ -1409,25 +1370,23 @@
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
- amd64:Isilon\ OneFS:*:*)
- echo x86_64-unknown-onefs
- exit ;;
esac
cat >&2 < in order to provide the needed
+information to handle your system.
config.guess timestamp = $timestamp
diff -Nru vte2.91-0.48.3/config.h.in vte2.91-0.48.4/config.h.in
--- vte2.91-0.48.3/config.h.in 2017-05-10 20:25:58.000000000 +0000
+++ vte2.91-0.48.4/config.h.in 2017-10-03 13:55:18.000000000 +0000
@@ -15,17 +15,9 @@
/* Define to 1 if you have the `ceil' function. */
#undef HAVE_CEIL
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
/* Define to 1 if you have the `cfmakeraw' function. */
#undef HAVE_CFMAKERAW
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
- the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
/* define if the compiler supports basic C++11 syntax */
#undef HAVE_CXX11
diff -Nru vte2.91-0.48.3/config.sub vte2.91-0.48.4/config.sub
--- vte2.91-0.48.3/config.sub 2017-05-10 20:25:58.000000000 +0000
+++ vte2.91-0.48.4/config.sub 2017-10-03 13:55:18.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2016-09-05'
+timestamp='2015-01-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
@@ -33,7 +33,7 @@
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -53,7 +53,8 @@
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
Canonicalize a configuration name.
@@ -67,7 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -116,8 +117,8 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -254,12 +255,11 @@
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
- | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
+ | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
@@ -305,7 +305,7 @@
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,13 +376,12 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
- | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | e2k-* | elxsi-* \
+ | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -429,13 +428,12 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -520,9 +518,6 @@
basic_machine=i386-pc
os=-aros
;;
- asmjs)
- basic_machine=asmjs-unknown
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -643,14 +638,6 @@
basic_machine=m68k-bull
os=-sysv3
;;
- e500v[12])
- basic_machine=powerpc-unknown
- os=$os"spe"
- ;;
- e500v[12]-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=$os"spe"
- ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -1030,7 +1017,7 @@
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle)
+ ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
@@ -1040,7 +1027,7 @@
;;
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little)
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
@@ -1386,18 +1373,18 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1406,8 +1393,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1539,8 +1525,6 @@
;;
-nacl*)
;;
- -ios)
- ;;
-none)
;;
*)
diff -Nru vte2.91-0.48.3/configure vte2.91-0.48.4/configure
--- vte2.91-0.48.3/configure 2017-05-10 20:25:57.000000000 +0000
+++ vte2.91-0.48.4/configure 2017-10-03 13:55:17.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vte 0.48.3.
+# Generated by GNU Autoconf 2.69 for vte 0.48.4.
#
# Report bugs to .
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='vte'
PACKAGE_TARNAME='vte'
-PACKAGE_VERSION='0.48.3'
-PACKAGE_STRING='vte 0.48.3'
+PACKAGE_VERSION='0.48.4'
+PACKAGE_STRING='vte 0.48.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte'
PACKAGE_URL=''
@@ -784,7 +784,6 @@
CATOBJEXT
CATALOGS
MSGFMT_OPTS
-INTL_MACOSX_LIBS
GETTEXT_PACKAGE
ALL_LINGUAS
INTLTOOL_PERL
@@ -1561,7 +1560,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 vte 0.48.3 to adapt to many kinds of systems.
+\`configure' configures vte 0.48.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1631,7 +1630,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of vte 0.48.3:";;
+ short | recursive ) echo "Configuration of vte 0.48.4:";;
esac
cat <<\_ACEOF
@@ -1791,7 +1790,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-vte configure 0.48.3
+vte configure 0.48.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2381,7 +2380,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by vte $as_me 0.48.3, which was
+It was created by vte $as_me 0.48.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3250,7 +3249,7 @@
# Define the identity of the package.
PACKAGE='vte'
- VERSION='0.48.3'
+ VERSION='0.48.4'
cat >>confdefs.h <<_ACEOF
@@ -3480,7 +3479,7 @@
-LT_VERSION_INFO="4800:3:4800"
+LT_VERSION_INFO="4800:4:4800"
################################################################################
@@ -18500,82 +18499,6 @@
XGETTEXT=:
INTLLIBS=
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_CFPreferencesCopyAppValue=yes
-else
- gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-int
-main ()
-{
-CFLocaleCopyCurrent();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_CFLocaleCopyCurrent=yes
-else
- gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
-
-
-
ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
if test "x$ac_cv_header_libintl_h" = xyes; then :
gt_cv_func_dgettext_libintl="no"
@@ -18916,7 +18839,7 @@
fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
+ INTLLIBS="-lintl $libintl_extra_libs"
fi
if test "$gt_cv_have_gettext" = "yes"; then
@@ -21383,7 +21306,7 @@
VTE_MINOR_VERSION=48
-VTE_MICRO_VERSION=3
+VTE_MICRO_VERSION=4
@@ -22003,7 +21926,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by vte $as_me 0.48.3, which was
+This file was extended by vte $as_me 0.48.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22069,7 +21992,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-vte config.status 0.48.3
+vte config.status 0.48.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru vte2.91-0.48.3/configure.ac vte2.91-0.48.4/configure.ac
--- vte2.91-0.48.3/configure.ac 2017-05-10 19:24:25.000000000 +0000
+++ vte2.91-0.48.4/configure.ac 2017-10-03 13:54:51.000000000 +0000
@@ -1,6 +1,6 @@
m4_define([version_major],0)
m4_define([version_minor],48)
-m4_define([version_micro],3)
+m4_define([version_micro],4)
m4_define([version_triplet],version_major.version_minor.version_micro)
AC_PREREQ([2.63])
diff -Nru vte2.91-0.48.3/debian/changelog vte2.91-0.48.4/debian/changelog
--- vte2.91-0.48.3/debian/changelog 2017-05-20 12:37:48.000000000 +0000
+++ vte2.91-0.48.4/debian/changelog 2017-10-03 14:43:17.000000000 +0000
@@ -1,3 +1,9 @@
+vte2.91 (0.48.4-0ubuntu1) artful; urgency=medium
+
+ * New upstream release
+
+ -- Jeremy Bicha Tue, 03 Oct 2017 10:43:17 -0400
+
vte2.91 (0.48.3-0ubuntu1) artful; urgency=medium
* New upstream release
diff -Nru vte2.91-0.48.3/debian/control vte2.91-0.48.4/debian/control
--- vte2.91-0.48.3/debian/control 2017-05-20 12:37:48.000000000 +0000
+++ vte2.91-0.48.4/debian/control 2017-10-03 14:43:17.000000000 +0000
@@ -7,7 +7,7 @@
Priority: optional
Maintainer: Ubuntu Developers
XSBC-Original-Maintainer: Debian GNOME Maintainers
-Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Michael Biebl
+Uploaders: Debian GNOME Maintainers , Michael Biebl
Standards-Version: 3.9.8
Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
diff -Nru vte2.91-0.48.3/doc/Makefile.in vte2.91-0.48.4/doc/Makefile.in
--- vte2.91-0.48.3/doc/Makefile.in 2017-05-10 20:25:59.000000000 +0000
+++ vte2.91-0.48.4/doc/Makefile.in 2017-10-03 13:55:19.000000000 +0000
@@ -268,7 +268,6 @@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
diff -Nru vte2.91-0.48.3/doc/openi18n/Makefile.in vte2.91-0.48.4/doc/openi18n/Makefile.in
--- vte2.91-0.48.3/doc/openi18n/Makefile.in 2017-05-10 20:25:59.000000000 +0000
+++ vte2.91-0.48.4/doc/openi18n/Makefile.in 2017-10-03 13:55:19.000000000 +0000
@@ -258,7 +258,6 @@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
diff -Nru vte2.91-0.48.3/doc/reference/html/index.html vte2.91-0.48.4/doc/reference/html/index.html
--- vte2.91-0.48.3/doc/reference/html/index.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/index.html 2017-10-03 13:56:58.000000000 +0000
@@ -15,7 +15,7 @@
- Documentation for VTE version 0.48.3
+ Documentation for VTE version 0.48.4
.
The latest version of this documentation can be found on-line at the
GNOME Library.
diff -Nru vte2.91-0.48.3/doc/reference/html/object-hierarchy.html vte2.91-0.48.4/doc/reference/html/object-hierarchy.html
--- vte2.91-0.48.3/doc/reference/html/object-hierarchy.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/object-hierarchy.html 2017-10-03 13:56:58.000000000 +0000
@@ -23,10 +23,10 @@
- GObject
+ GObject
├── VtePty
- ╰── GInitiallyUnowned
- ╰── GtkWidget
+ ╰── GInitiallyUnowned
+ ╰── GtkWidget
╰── VteTerminal
GBoxed
╰── VteRegex
diff -Nru vte2.91-0.48.3/doc/reference/html/VteRegex.html vte2.91-0.48.4/doc/reference/html/VteRegex.html
--- vte2.91-0.48.3/doc/reference/html/VteRegex.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/VteRegex.html 2017-10-03 13:56:58.000000000 +0000
@@ -74,7 +74,7 @@
-gboolean
+gboolean
|
vte_regex_jit ()
@@ -132,7 +132,7 @@
@@ -146,9 +146,9 @@
vte_regex_new_for_match ()
VteRegex *
vte_regex_new_for_match (const char *pattern ,
- gssize pattern_length ,
- guint32 flags ,
- GError **error );
+ gssize pattern_length ,
+ guint32 flags ,
+ GError **error );
Compiles pattern
into a regex for use as a match regex
with vte_terminal_match_add_regex() or
@@ -186,7 +186,7 @@
|
error |
- return location for a GError, or NULL . |
+ return location for a GError, or NULL . |
[allow-none] |
@@ -194,7 +194,7 @@
Returns
-
a newly created VteRegex, or NULL
with error
+
a newly created VteRegex, or NULL
with error
filled in.
[transfer full]
@@ -204,9 +204,9 @@
vte_regex_new_for_search ()
VteRegex *
vte_regex_new_for_search (const char *pattern
,
- gssize pattern_length
,
- guint32 flags
,
- GError **error
);
+
gssize pattern_length
,
+
guint32 flags
,
+
GError **error
);
Compiles pattern
into a regex for use as a search regex
with vte_terminal_search_set_regex()
.
@@ -243,7 +243,7 @@
error |
- return location for a GError, or NULL . |
+ return location for a GError, or NULL . |
[allow-none] |
@@ -251,7 +251,7 @@
Returns
-
a newly created VteRegex, or NULL
with error
+
a newly created VteRegex, or NULL
with error
filled in.
[transfer full]
@@ -259,10 +259,10 @@
diff -Nru vte2.91-0.48.3/doc/reference/html/VteTerminal.html vte2.91-0.48.4/doc/reference/html/VteTerminal.html
--- vte2.91-0.48.3/doc/reference/html/VteTerminal.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/VteTerminal.html 2017-10-03 13:56:58.000000000 +0000
@@ -45,7 +45,7 @@
-gboolean
+gboolean
|
(*VteSelectionFunc) ()
@@ -53,7 +53,7 @@
|
-GtkWidget *
+GtkWidget *
|
vte_terminal_new ()
@@ -149,7 +149,7 @@
|
-gdouble
+gdouble
|
vte_terminal_get_font_scale ()
@@ -165,7 +165,7 @@
|
-gboolean
+gboolean
|
vte_terminal_get_audible_bell ()
@@ -181,7 +181,7 @@
|
-gboolean
+gboolean
|
vte_terminal_get_allow_bold ()
@@ -213,7 +213,7 @@
|
-gboolean
+gboolean
|
vte_terminal_get_rewrap_on_resize ()
@@ -340,7 +340,7 @@
|
-const PangoFontDescription *
+ | const PangoFontDescription *
|
vte_terminal_get_font ()
@@ -348,7 +348,7 @@
|
-gboolean
+gboolean
|
vte_terminal_get_has_selection ()
@@ -380,7 +380,7 @@
|
-gboolean
+gboolean
|
vte_terminal_get_mouse_autohide ()
@@ -500,7 +500,7 @@
|
-gboolean
+gboolean
|
vte_terminal_set_encoding ()
@@ -530,7 +530,7 @@
|
-gboolean
+gboolean
|
vte_terminal_write_contents_sync ()
@@ -538,7 +538,7 @@
|
-gboolean
+gboolean
|
vte_terminal_search_find_next ()
@@ -546,7 +546,7 @@
|
-gboolean
+gboolean
|
vte_terminal_search_find_previous ()
@@ -562,7 +562,7 @@
|
-gboolean
+gboolean
|
vte_terminal_search_get_wrap_around ()
@@ -586,7 +586,7 @@
|
-gboolean
+gboolean
|
vte_terminal_event_check_regex_simple ()
@@ -673,7 +673,7 @@
|
-glong
+glong
|
vte_terminal_get_char_height ()
@@ -681,7 +681,7 @@
|
-glong
+glong
|
vte_terminal_get_char_width ()
@@ -689,7 +689,7 @@
|
-glong
+glong
|
vte_terminal_get_column_count ()
@@ -704,7 +704,7 @@
|
-glong
+glong
|
vte_terminal_get_row_count ()
@@ -749,7 +749,7 @@
|
-GRegex *
+GRegex *
|
vte_terminal_search_get_gregex ()
@@ -765,7 +765,7 @@
|
-gboolean
+gboolean
|
vte_terminal_event_check_gregex_simple ()
@@ -773,7 +773,7 @@
|
-gboolean
+gboolean
|
vte_terminal_spawn_sync ()
@@ -792,12 +792,12 @@
|
-gboolean |
+gboolean |
allow-bold |
Read / Write |
-gboolean |
+gboolean |
audible-bell |
Read / Write |
@@ -807,19 +807,19 @@
Read / Write |
-gint |
+gint |
cjk-ambiguous-width |
Read / Write |
-gchar * |
+gchar *
current-directory-uri |
Read |
-gchar * |
+gchar *
current-file-uri |
Read |
@@ -840,34 +840,34 @@
-gchar * |
+gchar *
encoding |
Read / Write |
-PangoFontDescription * |
+PangoFontDescription *
font-desc |
Read / Write |
-gdouble |
+gdouble |
font-scale |
Read / Write |
-gchar * |
+gchar *
icon-title |
Read |
-gboolean |
+gboolean |
input-enabled |
Read / Write |
-gboolean |
+gboolean |
pointer-autohide |
Read / Write |
@@ -878,34 +878,34 @@
Read / Write |
-gboolean |
+gboolean |
rewrap-on-resize |
Read / Write |
-gboolean |
+gboolean |
scroll-on-keystroke |
Read / Write |
-gboolean |
+gboolean |
scroll-on-output |
Read / Write |
-guint |
+guint |
scrollback-lines |
Read / Write |
-gchar * |
+gchar *
window-title |
Read |
-gchar * |
+gchar *
word-char-exceptions |
Read |
@@ -924,152 +924,152 @@
void |
bell |
-Run Last |
+Run Last |
void |
char-size-changed |
-Run Last |
+Run Last |
void |
child-exited |
-Run Last |
+Run Last |
void |
commit |
-Run Last |
+Run Last |
void |
contents-changed |
-Run Last |
+Run Last |
void |
copy-clipboard |
-Action |
+Action |
void |
current-directory-uri-changed |
-Run Last |
+Run Last |
void |
current-file-uri-changed |
-Run Last |
+Run Last |
void |
cursor-moved |
-Run Last |
+Run Last |
void |
decrease-font-size |
-Run Last |
+Run Last |
void |
deiconify-window |
-Run Last |
+Run Last |
void |
encoding-changed |
-Run Last |
+Run Last |
void |
eof |
-Run Last |
+Run Last |
void |
icon-title-changed |
-Run Last |
+Run Last |
void |
iconify-window |
-Run Last |
+Run Last |
void |
increase-font-size |
-Run Last |
+Run Last |
void |
lower-window |
-Run Last |
+Run Last |
void |
maximize-window |
-Run Last |
+Run Last |
void |
move-window |
-Run Last |
+Run Last |
void |
paste-clipboard |
-Action |
+Action |
void |
raise-window |
-Run Last |
+Run Last |
void |
refresh-window |
-Run Last |
+Run Last |
void |
resize-window |
-Run Last |
+Run Last |
void |
restore-window |
-Run Last |
+Run Last |
void |
selection-changed |
-Run Last |
+Run Last |
void |
text-deleted |
-Run Last |
+Run Last |
void |
text-inserted |
-Run Last |
+Run Last |
void |
text-modified |
-Run Last |
+Run Last |
void |
text-scrolled |
-Run Last |
+Run Last |
void |
window-title-changed |
-Run Last |
+Run Last |
@@ -1112,9 +1112,9 @@
├── VteCursorShape
├── VteEraseBinding
╰── VteWriteFlags
- GObject
- ╰── GInitiallyUnowned
- ╰── GtkWidget
+ GObject
+ ╰── GInitiallyUnowned
+ ╰── GtkWidget
╰── VteTerminal
@@ -1122,26 +1122,26 @@
Implemented Interfaces
VteTerminal implements
- AtkImplementorIface, GtkBuildable and GtkScrollable.
+ AtkImplementorIface, GtkBuildable and GtkScrollable.
Functions
VteSelectionFunc ()
-
gboolean
+gboolean
(*VteSelectionFunc) (VteTerminal *terminal
,
- glong column
,
- glong row
,
- gpointer data
);
+ glong column
,
+ glong row
,
+ gpointer data
);
Specifies the type of a selection function used to check whether
a cell has to be selected or not.
@@ -1178,13 +1178,13 @@
Returns
-
TRUE
if cell has to be selected; FALSE
if otherwise.
+
TRUE
if cell has to be selected; FALSE
if otherwise.
vte_terminal_new ()
-
GtkWidget *
+GtkWidget *
vte_terminal_new (void
);
Creates a new terminal widget.
@@ -1199,7 +1199,7 @@
void
vte_terminal_feed (VteTerminal *terminal
,
const char *data
,
- gssize length
);
+
gssize length
);
Interprets data
as if it were data received from a child process. This
can either be used to drive the terminal without a child process, or just
@@ -1238,7 +1238,7 @@
void
vte_terminal_feed_child (VteTerminal *terminal
,
const char *text
,
- gssize length
);
+
gssize length
);
Sends a block of UTF-8 text to the child as if it were entered by the user
at the keyboard.
@@ -1276,8 +1276,8 @@
vte_terminal_feed_child_binary ()
void
vte_terminal_feed_child_binary (VteTerminal *terminal
,
- const guint8 *data
,
- gsize length
);
+
const guint8 *data
,
+
gsize length
);
Sends a block of binary data to the child.
Parameters
@@ -1357,7 +1357,7 @@
vte_terminal_copy_clipboard ()
void
vte_terminal_copy_clipboard (VteTerminal *terminal
);
-
Places the selected text in the terminal in the GDK_SELECTION_CLIPBOARD
+
Places the selected text in the terminal in the GDK_SELECTION_CLIPBOARD
selection.
Parameters
@@ -1380,7 +1380,7 @@
vte_terminal_paste_clipboard ()
void
vte_terminal_paste_clipboard (VteTerminal *terminal
);
-
Sends the contents of the GDK_SELECTION_CLIPBOARD selection to the
+
Sends the contents of the GDK_SELECTION_CLIPBOARD selection to the
terminal's child. If necessary, the data is converted from UTF-8 to the
terminal's current encoding. It's called on paste menu item, or when
user presses Shift+Insert.
@@ -1405,7 +1405,7 @@
vte_terminal_copy_primary ()
void
vte_terminal_copy_primary (VteTerminal *terminal
);
-
Places the selected text in the terminal in the GDK_SELECTION_PRIMARY
+
Places the selected text in the terminal in the GDK_SELECTION_PRIMARY
selection.
Parameters
@@ -1428,10 +1428,10 @@
vte_terminal_paste_primary ()
void
vte_terminal_paste_primary (VteTerminal *terminal
);
-
Sends the contents of the GDK_SELECTION_PRIMARY selection to the terminal's
+
Sends the contents of the GDK_SELECTION_PRIMARY selection to the terminal's
child. If necessary, the data is converted from UTF-8 to the terminal's
current encoding. The terminal will call also paste the
-GDK_SELECTION_PRIMARY selection when the user clicks with the the second
+GDK_SELECTION_PRIMARY selection when the user clicks with the the second
mouse button.
Parameters
@@ -1454,8 +1454,8 @@
vte_terminal_set_size ()
void
vte_terminal_set_size (VteTerminal *terminal
,
- glong columns
,
- glong rows
);
+
glong columns
,
+
glong rows
);
Attempts to change the terminal's size in terms of rows and columns. If
the attempt succeeds, the widget will resize itself to the proper size.
@@ -1491,7 +1491,7 @@
vte_terminal_set_font_scale ()
void
vte_terminal_set_font_scale (VteTerminal *terminal
,
- gdouble scale
);
+
gdouble scale
);
Sets the terminal's font scale to scale
.
@@ -1520,7 +1520,7 @@
vte_terminal_get_font_scale ()
-
gdouble
+gdouble
vte_terminal_get_font_scale (VteTerminal *terminal
);
Parameters
@@ -1547,7 +1547,7 @@
vte_terminal_set_audible_bell ()
void
vte_terminal_set_audible_bell (VteTerminal *terminal
,
- gboolean is_audible
);
+
gboolean is_audible
);
Controls whether or not the terminal will beep when the child outputs the
"bl" sequence.
@@ -1566,7 +1566,7 @@
is_audible |
-TRUE if the terminal should beep
|
+TRUE if the terminal should beep
|
|
@@ -1576,7 +1576,7 @@
vte_terminal_get_audible_bell ()
-
gboolean
+gboolean
vte_terminal_get_audible_bell (VteTerminal *terminal
);
Checks whether or not the terminal will beep when the child outputs the
"bl" sequence.
@@ -1597,7 +1597,7 @@
Returns
-
TRUE
if audible bell is enabled, FALSE
if not
+
TRUE
if audible bell is enabled, FALSE
if not
@@ -1605,7 +1605,7 @@
vte_terminal_set_allow_bold ()
void
vte_terminal_set_allow_bold (VteTerminal *terminal
,
- gboolean allow_bold
);
+
gboolean allow_bold
);
Controls whether or not the terminal will attempt to draw bold text,
either by using a bold font variant or by repainting text with a different
offset.
@@ -1625,7 +1625,7 @@
allow_bold |
-TRUE if the terminal should attempt to draw bold text
|
+TRUE if the terminal should attempt to draw bold text
|
|
@@ -1635,7 +1635,7 @@
vte_terminal_get_allow_bold ()
-
gboolean
+gboolean
vte_terminal_get_allow_bold (VteTerminal *terminal
);
Checks whether or not the terminal will attempt to draw bold text by
repainting text with a one-pixel offset.
@@ -1656,7 +1656,7 @@
Returns
-
TRUE
if bolding is enabled, FALSE
if not
+
TRUE
if bolding is enabled, FALSE
if not
@@ -1664,7 +1664,7 @@
vte_terminal_set_scroll_on_output ()
void
vte_terminal_set_scroll_on_output (VteTerminal *terminal
,
- gboolean scroll
);
+ gboolean scroll
);
Controls whether or not the terminal will forcibly scroll to the bottom of
the viewable history when the new data is received from the child.
@@ -1695,7 +1695,7 @@
vte_terminal_set_scroll_on_keystroke ()
void
vte_terminal_set_scroll_on_keystroke (VteTerminal *terminal
,
- gboolean scroll
);
+
gboolean scroll
);
Controls whether or not the terminal will forcibly scroll to the bottom of
the viewable history when the user presses a key. Modifier keys do not
trigger this behavior.
@@ -1727,7 +1727,7 @@
vte_terminal_set_rewrap_on_resize ()
void
vte_terminal_set_rewrap_on_resize (VteTerminal *terminal
,
- gboolean rewrap
);
+
gboolean rewrap
);
Controls whether or not the terminal will rewrap its contents, including
the scrollback history, whenever the terminal's width changes.
@@ -1746,7 +1746,7 @@
rewrap |
-TRUE if the terminal should rewrap on resize
|
+TRUE if the terminal should rewrap on resize
|
|
@@ -1756,7 +1756,7 @@
vte_terminal_get_rewrap_on_resize ()
-
gboolean
+gboolean
vte_terminal_get_rewrap_on_resize (VteTerminal *terminal
);
Checks whether or not the terminal will rewrap its contents upon resize.
@@ -1776,7 +1776,7 @@
Returns
-
TRUE
if rewrapping is enabled, FALSE
if not
+
TRUE
if rewrapping is enabled, FALSE
if not
@@ -1784,10 +1784,10 @@
vte_terminal_set_color_bold ()
void
vte_terminal_set_color_bold (VteTerminal *terminal
,
- const GdkRGBA *bold
);
+
const GdkRGBA *bold
);
Sets the color used to draw bold text in the default foreground color.
If bold
- is NULL
then the default color is used.
+ is
NULL
then the default color is used.
-
Flags: Run Last
+
Flags: Run Last
The “icon-title-changed”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted when the terminal's icon_title
field is modified.
Parameters
@@ -5355,14 +5355,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “iconify-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5386,14 +5386,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “increase-font-size”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted when the user hits the '+' key while holding the Control key.
Parameters
@@ -5417,14 +5417,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “lower-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5448,14 +5448,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “maximize-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5479,16 +5479,16 @@
-
Flags: Run Last
+
Flags: Run Last
The “move-window”
signal
void
user_function (VteTerminal *vteterminal,
- guint x,
- guint y,
- gpointer user_data)
+
guint x,
+
guint y,
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5522,14 +5522,14 @@
-
Flags: Run Last
+
Flags: Run Last
-
Flags: Action
+
Flags: Action
The “raise-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5584,14 +5584,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “refresh-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5615,16 +5615,16 @@
-
Flags: Run Last
+
Flags: Run Last
The “resize-window”
signal
void
user_function (VteTerminal *vteterminal,
- guint width,
- guint height,
- gpointer user_data)
+
guint width,
+
guint height,
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5658,14 +5658,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “restore-window”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted at the child application's request.
Parameters
@@ -5689,14 +5689,14 @@
-Flags: Run Last
+Flags: Run Last
The “selection-changed”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted whenever the contents of terminal's selection changes.
Parameters
@@ -5720,14 +5720,14 @@
-
Flags: Run Last
+
Flags: Run Last
The “text-deleted”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
An internal signal used for communication between the terminal and
its accessibility peer. May not be emitted under certain
circumstances.
@@ -5753,14 +5753,14 @@
-Flags: Run Last
+Flags: Run Last
The “text-inserted”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
An internal signal used for communication between the terminal and
its accessibility peer. May not be emitted under certain
circumstances.
@@ -5786,14 +5786,14 @@
-Flags: Run Last
+Flags: Run Last
The “text-modified”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
An internal signal used for communication between the terminal and
its accessibility peer. May not be emitted under certain
circumstances.
@@ -5819,15 +5819,15 @@
-Flags: Run Last
+Flags: Run Last
The “text-scrolled”
signal
void
user_function (VteTerminal *vteterminal,
- gint delta,
- gpointer user_data)
+
gint delta,
+
gpointer user_data)
An internal signal used for communication between the terminal and
its accessibility peer. May not be emitted under certain
circumstances.
@@ -5858,14 +5858,14 @@
-Flags: Run Last
+Flags: Run Last
The “window-title-changed”
signal
void
user_function (VteTerminal *vteterminal,
- gpointer user_data)
+
gpointer user_data)
Emitted when the terminal's window_title
field is modified.
Parameters
@@ -5889,7 +5889,7 @@
-Flags: Run Last
+Flags: Run Last
diff -Nru vte2.91-0.48.3/doc/reference/html/vte-Version-Information.html vte2.91-0.48.4/doc/reference/html/vte-Version-Information.html
--- vte2.91-0.48.3/doc/reference/html/vte-Version-Information.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/vte-Version-Information.html 2017-10-03 13:56:58.000000000 +0000
@@ -41,7 +41,7 @@
-guint
+guint
|
vte_get_major_version ()
@@ -49,7 +49,7 @@
|
-guint
+guint
|
vte_get_minor_version ()
@@ -57,7 +57,7 @@
|
-guint
+guint
|
vte_get_micro_version ()
@@ -103,7 +103,7 @@
Functions
vte_get_major_version ()
- guint
+guint
vte_get_major_version (void );
Returns the major version of the VTE library at runtime.
Contrast this with VTE_MAJOR_VERSION which represents
@@ -118,7 +118,7 @@
vte_get_minor_version ()
- guint
+guint
vte_get_minor_version (void );
Returns the minor version of the VTE library at runtime.
Contrast this with VTE_MINOR_VERSION which represents
@@ -133,7 +133,7 @@
vte_get_micro_version ()
- guint
+guint
vte_get_micro_version (void );
Returns the micro version of the VTE library at runtime.
Contrast this with VTE_MICRO_VERSION which represents
@@ -201,7 +201,7 @@
VTE_MICRO_VERSION
- #define VTE_MICRO_VERSION (3)
+#define VTE_MICRO_VERSION (4)
The micro version number of the VTE library
(e.g. in version 3.1.4 this is 4).
diff -Nru vte2.91-0.48.3/doc/reference/html/vte-Vte-PTY.html vte2.91-0.48.4/doc/reference/html/vte-Vte-PTY.html
--- vte2.91-0.48.3/doc/reference/html/vte-Vte-PTY.html 2017-05-10 20:28:33.000000000 +0000
+++ vte2.91-0.48.4/doc/reference/html/vte-Vte-PTY.html 2017-10-03 13:56:58.000000000 +0000
@@ -77,7 +77,7 @@
|
-gboolean
+gboolean
|
vte_pty_set_size ()
@@ -85,7 +85,7 @@
|
-gboolean
+gboolean
|
vte_pty_get_size ()
@@ -93,7 +93,7 @@
|
-gboolean
+gboolean
|
vte_pty_set_utf8 ()
@@ -109,7 +109,7 @@
|
-gboolean
+gboolean
|
vte_pty_spawn_finish ()
@@ -136,7 +136,7 @@
|
-gint |
+gint |
fd |
Read / Write / Construct Only |
@@ -177,7 +177,7 @@
╰── VtePtyError
GFlags
╰── VtePtyFlags
- GObject
+ GObject
╰── VtePty
@@ -185,7 +185,7 @@
Implemented Interfaces
VtePty implements
- GInitable.
+ GInitable.
Description
@@ -198,19 +198,19 @@
vte_pty_new_sync ()
VtePty *
vte_pty_new_sync (VtePtyFlags flags
,
- GCancellable *cancellable
,
- GError **error
);
+
GCancellable *cancellable
,
+
GError **error
);
Allocates a new pseudo-terminal.
-
You can later use fork()
or the g_spawn_async()
family of functions
+
You can later use fork()
or the g_spawn_async()
family of functions
to start a process on the PTY.
If using fork()
, you MUST call vte_pty_child_setup()
in the child.
-
If using g_spawn_async()
and friends, you MUST either use
+
If using g_spawn_async()
and friends, you MUST either use
vte_pty_child_setup()
directly as the child setup function, or call
vte_pty_child_setup()
from your own child setup function supplied.
When using vte_terminal_spawn_sync()
with a custom child setup
function, vte_pty_child_setup()
will be called before the supplied
function; you must not call it again.
-
Also, you MUST pass the G_SPAWN_DO_NOT_REAP_CHILD
flag.
+
Also, you MUST pass the G_SPAWN_DO_NOT_REAP_CHILD
flag.
[constructor]
@@ -241,7 +241,7 @@
Returns
-
a new VtePty, or NULL
on error with error
+
a new VtePty, or NULL
on error with error
filled in.
[transfer full]
@@ -251,8 +251,8 @@
vte_pty_new_foreign_sync ()
VtePty *
vte_pty_new_foreign_sync (int fd
,
- GCancellable *cancellable
,
- GError **error
);
+ GCancellable *cancellable
,
+ GError **error
);
Creates a new VtePty for the PTY master fd
.
No entry will be made in the lastlog, utmp or wtmp system files.
@@ -276,12 +276,12 @@
cancellable |
- a GCancellable, or NULL . |
+ a GCancellable, or NULL . |
[allow-none] |
error |
- return location for a GError, or NULL . |
+ return location for a GError, or NULL . |
[allow-none] |
@@ -290,7 +290,7 @@
Returns
a new VtePty for fd
-, or NULL
on error with error
+, or NULL
on error with error
filled in.
[transfer full]
@@ -349,15 +349,15 @@
vte_pty_set_size ()
-
gboolean
+gboolean
vte_pty_set_size (VtePty *pty
,
int rows
,
int columns
,
- GError **error
);
+ GError **error
);
Attempts to resize the pseudo terminal's window size. If successful, the
OS kernel will send SIGWINCH to the child process group.
If setting the window size failed, error
- will be set to a GIOError.
+ will be set to a
GIOError.