[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.4.2-1-4-g838d216
Laurent Léonard
laurent at open-minds.org
Thu Feb 24 10:08:39 UTC 2011
The following commit has been merged in the master branch:
commit 6fecc1dee72957e5bc44505d643e2b606246c7ca
Merge: 812296b0e8cc59903303ebc40f771d947840ad79 fbdc9dddee8ecdcda4bf087adc45a08284e5f1af
Author: Laurent Léonard <laurent at open-minds.org>
Date: Wed Feb 23 12:12:01 2011 +0100
Merge commit 'upstream/0.4.3'
diff --combined configure
index f8bd3a6,d3a04dc..d3a04dc
mode 100644,100755..100644
--- a/configure
+++ b/configure
@@@ -1,13 -1,13 +1,13 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for gtk-vnc 0.4.2.
+ # Generated by GNU Autoconf 2.66 for gtk-vnc 0.4.3.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
- # Inc.
+ # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+ # Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@@ -328,7 -328,7 +328,7 @@@ $as_echo X"$as_dir"
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@@ -368,19 -368,19 +368,19 @@@ els
fi # as_fn_arith
- # as_fn_error ERROR [LINENO LOG_FD]
- # ---------------------------------
+ # as_fn_error STATUS ERROR [LINENO LOG_FD]
+ # ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
- # script with status $?, using 1 if that was 0.
+ # script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@@ -544,7 -544,7 +544,7 @@@ test -n "$DJDIR" || exec 7<&0 </dev/nul
exec 6>&1
# Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@@ -563,8 -563,8 +563,8 @@@ MAKEFLAGS
# Identity of this package.
PACKAGE_NAME='gtk-vnc'
PACKAGE_TARNAME='gtk-vnc'
- PACKAGE_VERSION='0.4.2'
- PACKAGE_STRING='gtk-vnc 0.4.2'
+ PACKAGE_VERSION='0.4.3'
+ PACKAGE_STRING='gtk-vnc 0.4.3'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc'
PACKAGE_URL='http://live.gnome.org/gtk-vnc/'
@@@ -665,6 -665,8 +665,8 @@@ GIO_LIB
GIO_CFLAGS
GOBJECT_LIBS
GOBJECT_CFLAGS
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
PKG_CONFIG
USE_VERSION_DEFS_FALSE
USE_VERSION_DEFS_TRUE
@@@ -873,6 -875,8 +875,8 @@@ LIB
CPPFLAGS
CPP
PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
GOBJECT_CFLAGS
GOBJECT_LIBS
GIO_CFLAGS
@@@ -1007,7 -1011,7 +1011,7 @@@ d
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@@ -1033,7 -1037,7 +1037,7 @@@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@@ -1237,7 -1241,7 +1241,7 @@@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@@ -1253,7 -1257,7 +1257,7 @@@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@@ -1283,8 -1287,8 +1287,8 @@@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
- Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+ Try \`$0 --help' for more information"
;;
*=*)
@@@ -1292,7 -1296,7 +1296,7 @@@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@@ -1310,13 -1314,13 +1314,13 @@@ don
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@@ -1339,7 -1343,7 +1343,7 @@@ d
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@@ -1353,8 -1357,8 +1357,8 @@@ target=$target_alia
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@@ -1369,9 -1373,9 +1373,9 @@@ test "$silent" = yes && exec 6>/dev/nul
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@@ -1410,11 -1414,11 +1414,11 @@@ els
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@@ -1440,7 -1444,7 +1444,7 @@@ if test "$ac_init_help" = "long"; the
# 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 gtk-vnc 0.4.2 to adapt to many kinds of systems.
+ \`configure' configures gtk-vnc 0.4.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1454,7 -1458,7 +1458,7 @@@ Configuration
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@@ -1510,7 -1514,7 +1514,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtk-vnc 0.4.2:";;
+ short | recursive ) echo "Configuration of gtk-vnc 0.4.3:";;
esac
cat <<\_ACEOF
@@@ -1560,6 -1564,10 +1564,10 @@@ Some influential environment variables
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
GOBJECT_CFLAGS
C compiler flags for GOBJECT, overriding pkg-config
GOBJECT_LIBS
@@@ -1670,10 -1678,10 +1678,10 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- gtk-vnc configure 0.4.2
- generated by GNU Autoconf 2.65
+ gtk-vnc configure 0.4.3
+ generated by GNU Autoconf 2.66
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@@ -1777,7 -1785,7 +1785,7 @@@ ac_fn_c_check_header_compile (
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -1886,7 -1894,7 +1894,7 @@@ ac_fn_c_check_func (
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -1953,10 -1961,10 +1961,10 @@@ $as_echo "$ac_res" >&6;
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@@ -2015,17 -2023,15 +2023,15 @@@ $as_echo "$as_me: WARNING: $2: see the
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------- ##
+ ( $as_echo "## ----------------------------------------------------------------------- ##
## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc ##
- ## ----------------------------------------------------------------------- ##
- _ASBOX
+ ## ----------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@@ -2041,8 -2047,8 +2047,8 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk-vnc $as_me 0.4.2, which was
- generated by GNU Autoconf 2.65. Invocation command line was
+ It was created by gtk-vnc $as_me 0.4.3, which was
+ generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@@ -2152,11 -2158,9 +2158,9 @@@ trap 'exit_status=$
{
echo
- cat <<\_ASBOX
- ## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
- ## ---------------- ##
- _ASBOX
+ ## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@@ -2190,11 -2194,9 +2194,9 @@@ $as_echo "$as_me: WARNING: cache variab
)
echo
- cat <<\_ASBOX
- ## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
- ## ----------------- ##
- _ASBOX
+ ## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@@ -2207,11 -2209,9 +2209,9 @@@
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
- ## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
- ## ------------------- ##
- _ASBOX
+ ## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@@ -2225,11 -2225,9 +2225,9 @@@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
- ## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
- ## ----------- ##
- _ASBOX
+ ## ----------- ##"
echo
cat confdefs.h
echo
@@@ -2284,7 -2282,12 +2282,12 @@@ _ACEO
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@@ -2299,7 -2302,11 +2302,11 @@@ d
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+ See \`config.log' for more details" "$LINENO" 5; }
fi
done
@@@ -2375,7 -2382,7 +2382,7 @@@ if $ac_cache_corrupted; the
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@@ -2391,16 -2398,22 +2398,22 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
ac_aux_dir=
for ac_dir in build-aux "$srcdir"/build-aux; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@@ -2521,11 -2534,11 +2534,11 @@@ am_lf=
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@@ -2547,7 -2560,7 +2560,7 @@@ if
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@@ -2557,7 -2570,7 +2570,7 @@@ the
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@@ -2795,7 -2808,7 +2808,7 @@@ don
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@@ -2803,7 -2816,7 +2816,7 @@@ SHELL = /bin/s
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@@ -2837,7 -2850,7 +2850,7 @@@ if test "`cd $srcdir && pwd`" != "`pwd`
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@@ -2853,7 -2866,7 +2866,7 @@@ f
# Define the identity of the package.
PACKAGE='gtk-vnc'
- VERSION='0.4.2'
+ VERSION='0.4.3'
cat >>confdefs.h <<_ACEOF
@@@ -2922,7 -2935,7 +2935,7 @@@ ltmain="$ac_aux_dir/ltmain.sh
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@@ -2933,16 -2946,16 +2946,16 @@@ els
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
- *) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@@ -2967,7 -2980,7 +2980,7 @@@ els
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@@ -2975,7 -2988,7 +2988,7 @@@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
- *) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@@ -3422,8 -3435,8 +3435,8 @@@ f
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "no acceptable C compiler found in \$PATH
- See \`config.log' for more details." "$LINENO" 5; }
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+ See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@@ -3537,9 -3550,8 +3550,8 @@@ sed 's/^/| /' conftest.$ac_ext >&
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
+ as_fn_error 77 "C compiler cannot create executables
+ See \`config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@@ -3581,8 -3593,8 +3593,8 @@@ don
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@@ -3639,9 -3651,9 +3651,9 @@@ $as_echo "$ac_try_echo"; } >&
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot run C compiled programs.
+ as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
fi
fi
fi
@@@ -3692,8 -3704,8 +3704,8 @@@ sed 's/^/| /' conftest.$ac_ext >&
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." "$LINENO" 5; }
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@@ -4097,7 -4109,7 +4109,7 @@@ esa
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@@ -4173,7 -4185,7 +4185,7 @@@ esa
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@@ -4239,7 -4251,7 +4251,7 @@@ esa
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@@ -4306,7 -4318,7 +4318,7 @@@ esa
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@@ -4422,7 -4434,7 +4434,7 @@@ els
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@@ -6774,8 -6786,8 +6786,8 @@@ if $ac_preproc_ok; then
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." "$LINENO" 5; }
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@@ -6904,8 -6916,7 +6916,7 @@@ do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
- eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@@ -11480,7 -11491,7 +11491,7 @@@ $as_echo_n "checking whether cc underst
fi
set dummy $CC; ac_cc=`$as_echo "$2" |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
- if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -11624,7 -11635,7 +11635,7 @@@ $as_echo "$USE_NLS" >&6;
case "$am__api_version" in
1.01234)
- as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
@@@ -11641,7 -11652,7 +11652,7 @@@ $as_echo_n "checking for intltool >= 0.
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
+ as_fn_error $? "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
@@@ -11765,7 -11776,7 +11776,7 @@@ f
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@@ -12047,13 -12058,13 +12058,13 @@@ f
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
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
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
@@@ -12097,13 -12108,13 +12108,13 @@@ f
if test -z "$INTLTOOL_PERL"; then
- as_fn_error "perl not found" "$LINENO" 5
+ as_fn_error $? "perl not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@@ -12116,7 -12127,7 +12127,7 @@@ $as_echo_n "checking for XML::Parser..
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@@ -12881,7 -12892,7 +12892,7 @@@ $as_echo_n "checking which gtk+ versio
if test "${with_gtk+set}" = set; then :
withval=$with_gtk; case "$with_gtk" in
2.0|3.0) ;;
- *) as_fn_error "invalid gtk version specified" "$LINENO" 5 ;;
+ *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;;
esac
else
with_gtk=2.0
@@@ -12896,7 -12907,7 +12907,7 @@@ case "$with_gtk" i
GTK_VNC_API_VERSION=1.0
;;
3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=2.91.3
+ GTK_REQUIRED=3.0.0
GTK_VNC_API_VERSION=2.0
;;
esac
@@@ -12925,8 -12936,7 +12936,7 @@@ for ac_header in pwd.h termios.
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
- eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@@ -12941,7 -12951,7 +12951,7 @@@ don
if test "${with_python+set}" = set; then :
withval=$with_python; case "${withval}" in
yes|no) ;;
- *) as_fn_error "bad value ${withval} for python option" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${withval} for python option" "$LINENO" 5 ;;
esac
else
withval=yes
@@@ -12989,7 -12999,7 +12999,7 @@@ f
fi
;;
*)
- as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+ as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
;;
esac
@@@ -13120,7 -13130,7 +13130,7 @@@ $as_echo "yes" >&6;
if test "${with_examples+set}" = set; then :
withval=$with_examples; case "${withval}" in
yes|no) ;;
- *) as_fn_error "bad value ${withval} for examples option" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${withval} for examples option" "$LINENO" 5 ;;
esac
else
withval=no
@@@ -13165,6 -13175,10 +13175,10 @@@ f
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@@ -13277,7 -13291,6 +13291,6 @@@ $as_echo "yes" >&6;
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
pkg_failed=no
@@@ -13320,6 -13333,8 +13333,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13334,7 -13349,7 +13349,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gobject-2.0 >= $GOBJECT_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gobject-2.0 >= $GOBJECT_REQUIRED) were not met:
$GOBJECT_PKG_ERRORS
@@@ -13343,12 -13358,14 +13358,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GOBJECT_CFLAGS
and GOBJECT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13357,13 -13374,14 +13374,14 @@@ and GOBJECT_LIBS to avoid the need to c
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS
GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13409,6 -13427,8 +13427,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13423,7 -13443,7 +13443,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GIO_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
$GIO_PKG_ERRORS
@@@ -13432,12 -13452,14 +13452,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GIO_CFLAGS
and GIO_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13446,13 -13468,14 +13468,14 @@@ and GIO_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
GIO_LIBS=$pkg_cv_GIO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13498,6 -13521,8 +13521,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13512,7 -13537,7 +13537,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GDK_PIXBUF_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED) were not met:
$GDK_PIXBUF_PKG_ERRORS
@@@ -13521,12 -13546,14 +13546,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13535,13 -13562,14 +13562,14 @@@ and GDK_PIXBUF_LIBS to avoid the need t
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS
GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13587,6 -13615,8 +13615,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13601,7 -13631,7 +13631,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met:
$GTK_PKG_ERRORS
@@@ -13610,12 -13640,14 +13640,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13624,13 -13656,14 +13656,14 @@@ and GTK_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13676,6 -13709,8 +13709,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13690,11 -13725,11 +13725,11 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$X11_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Not building against X11" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Not building against X11" >&5
$as_echo "$as_me: Not building against X11" >&6;}
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: Not building against X11" >&5
$as_echo "$as_me: Not building against X11" >&6;}
else
@@@ -13702,7 -13737,7 +13737,7 @@@
X11_LIBS=$pkg_cv_X11_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13748,6 -13783,8 +13783,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13762,7 -13799,7 +13799,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- as_fn_error "Package requirements (cairo >= $CAIRO_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (cairo >= $CAIRO_REQUIRED) were not met:
$CAIRO_PKG_ERRORS
@@@ -13771,12 -13808,14 +13808,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables CAIRO_CFLAGS
and CAIRO_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13785,13 -13824,14 +13824,14 @@@ and CAIRO_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -13802,7 -13842,7 +13842,7 @@@
if test "${with_libview+set}" = set; then :
withval=$with_libview; case "${withval}" in
yes|no) ;;
- *) as_fn_error "bad value ${withval} for libview option" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${withval} for libview option" "$LINENO" 5 ;;
esac
else
withval=yes
@@@ -13852,6 -13892,8 +13892,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13866,10 -13908,10 +13908,10 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$VIEW_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- WITH_LIBVIEW=0
+ WITH_LIBVIEW=0
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
WITH_LIBVIEW=0
else
VIEW_CFLAGS=$pkg_cv_VIEW_CFLAGS
@@@ -13928,6 -13970,8 +13970,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -13942,7 -13986,7 +13986,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GNUTLS_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gnutls >= $GNUTLS_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gnutls >= $GNUTLS_REQUIRED) were not met:
$GNUTLS_PKG_ERRORS
@@@ -13951,12 -13995,14 +13995,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GNUTLS_CFLAGS
and GNUTLS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -13965,13 -14011,14 +14011,14 @@@ and GNUTLS_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt -lgpg-error"
@@@ -14105,7 -14152,7 +14152,7 @@@ f
elif test "x$with_sasl" = "xyes"; then
SASL_LIBS="$SASL_LIBS -lsasl"
else
- as_fn_error "You must install the Cyrus SASL development package in order to compile GTK-VNC" "$LINENO" 5
+ as_fn_error $? "You must install the Cyrus SASL development package in order to compile GTK-VNC" "$LINENO" 5
fi
CFLAGS="$old_cflags"
LIBS="$old_libs"
@@@ -14177,7 -14224,7 +14224,7 @@@ _ACEO
LIBS="-lz $LIBS"
else
- as_fn_error "zlib not found" "$LINENO" 5
+ as_fn_error $? "zlib not found" "$LINENO" 5
fi
@@@ -14198,7 -14245,7 +14245,7 @@@ case $with_coroutine i
gthread)
;;
*)
- as_fn_error "Unsupported coroutine type" "$LINENO" 5
+ as_fn_error $? "Unsupported coroutine type" "$LINENO" 5
esac
if test "$with_coroutine" = "ucontext"; then
@@@ -14267,6 -14314,8 +14314,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -14281,7 -14330,7 +14330,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GTHREAD_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gthread-2.0 > $GTHREAD_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gthread-2.0 > $GTHREAD_REQUIRED) were not met:
$GTHREAD_PKG_ERRORS
@@@ -14290,12 -14339,14 +14339,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables GTHREAD_CFLAGS
and GTHREAD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -14304,13 -14355,14 +14355,14 @@@ and GTHREAD_LIBS to avoid the need to c
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
WITH_UCONTEXT=0
fi
@@@ -14372,6 -14424,8 +14424,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -14386,7 -14440,7 +14440,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$PYGTK_PKG_ERRORS" >&5
- as_fn_error "Package requirements (pygtk-2.0 >= $PYGTK_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (pygtk-2.0 >= $PYGTK_REQUIRED) were not met:
$PYGTK_PKG_ERRORS
@@@ -14395,12 -14449,14 +14449,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables PYGTK_CFLAGS
and PYGTK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -14409,13 -14465,14 +14465,14 @@@ and PYGTK_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -14477,7 -14534,7 +14534,7 @@@ test -n "$PYTHON" || PYTHON=":
if test "$PYTHON" = :; then
- as_fn_error "no suitable Python interpreter found" "$LINENO" 5
+ as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
else
@@@ -14622,7 -14679,7 +14679,7 @@@ $as_echo "$HAVE_PYTHON_REQUIRED" >&6;
if test "x$HAVE_PYTHON_REQUIRED" != "xyes"
then
- as_fn_error "\"No suitable python found\"" "$LINENO" 5
+ as_fn_error $? "\"No suitable python found\"" "$LINENO" 5
fi
@@@ -14656,7 -14713,7 +14713,7 @@@ rm -f conftest.err conftest.$ac_ex
if test "x$have_python_headers" != "xyes"
then
- as_fn_error "\"No python development headers found\"" "$LINENO" 5
+ as_fn_error $? "\"No python development headers found\"" "$LINENO" 5
fi
fi
@@@ -14709,6 -14766,8 +14766,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -14723,8 -14782,6 +14782,6 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$FIREFOX_PLUGIN_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
pkg_failed=no
@@@ -14767,6 -14824,8 +14824,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -14781,7 -14840,7 +14840,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5
- as_fn_error "Package requirements (mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED) were not met:
$MOZILLA_PLUGIN_PKG_ERRORS
@@@ -14790,12 -14849,14 +14849,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -14804,18 -14865,21 +14865,21 @@@ and MOZILLA_PLUGIN_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
pkg_failed=no
@@@ -14858,6 -14922,8 +14922,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -14872,7 -14938,7 +14938,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5
- as_fn_error "Package requirements (mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED) were not met:
$MOZILLA_PLUGIN_PKG_ERRORS
@@@ -14881,12 -14947,14 +14947,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " "$LINENO" 5
+ See the pkg-config man page for more details." "$LINENO" 5
+
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ as_fn_error $? "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.
@@@ -14895,13 -14963,14 +14963,14 @@@ and MOZILLA_PLUGIN_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
@@@ -14911,7 -14980,7 +14980,7 @@@ els
FIREFOX_PLUGIN_LIBS=$pkg_cv_FIREFOX_PLUGIN_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -15056,6 -15125,8 +15125,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -15070,8 -15141,6 +15141,6 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
pkg_failed=no
@@@ -15114,6 -15183,8 +15183,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -15128,21 -15199,21 +15199,21 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
if test "x$enable_introspection" = "xcheck"; then
enable_introspection=no
else
- as_fn_error "gobject-introspection is not available" "$LINENO" 5
+ as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if test "x$enable_introspection" = "xcheck"; then
enable_introspection=no
else
- as_fn_error "gobject-introspection is not available" "$LINENO" 5
+ as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
fi
else
@@@ -15157,6 -15228,8 +15228,8 @@@ $as_echo "yes" >&6;
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
pkg_failed=no
@@@ -15199,6 -15272,8 +15272,8 @@@ f
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@@ -15213,21 -15288,21 +15288,21 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
if test "x$enable_introspection" = "xcheck"; then
enable_introspection=no
else
- as_fn_error "gobject-introspection is not available" "$LINENO" 5
+ as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if test "x$enable_introspection" = "xcheck"; then
enable_introspection=no
else
- as_fn_error "gobject-introspection is not available" "$LINENO" 5
+ as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
fi
else
@@@ -15367,6 -15442,7 +15442,7 @@@ DEFS=-DHAVE_CONFIG_
ac_libobjs=
ac_ltlibobjs=
+ U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@@ -15390,19 -15466,19 +15466,19 @@@ els
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@@ -15410,43 -15486,43 +15486,43 @@@
if test -z "${HAVE_GTK_2_TRUE}" && test -z "${HAVE_GTK_2_FALSE}"; then
- as_fn_error "conditional \"HAVE_GTK_2\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GTK_2\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GTK_3_TRUE}" && test -z "${HAVE_GTK_3_FALSE}"; then
- as_fn_error "conditional \"HAVE_GTK_3\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GTK_3\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_VERSION_DEFS_TRUE}" && test -z "${USE_VERSION_DEFS_FALSE}"; then
- as_fn_error "conditional \"USE_VERSION_DEFS\" was never defined.
+ as_fn_error $? "conditional \"USE_VERSION_DEFS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SASL_TRUE}" && test -z "${HAVE_SASL_FALSE}"; then
- as_fn_error "conditional \"HAVE_SASL\" was never defined.
+ as_fn_error $? "conditional \"HAVE_SASL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_UCONTEXT_TRUE}" && test -z "${WITH_UCONTEXT_FALSE}"; then
- as_fn_error "conditional \"WITH_UCONTEXT\" was never defined.
+ as_fn_error $? "conditional \"WITH_UCONTEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then
- as_fn_error "conditional \"WITH_PYTHON\" was never defined.
+ as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_EXAMPLES_TRUE}" && test -z "${WITH_EXAMPLES_FALSE}"; then
- as_fn_error "conditional \"WITH_EXAMPLES\" was never defined.
+ as_fn_error $? "conditional \"WITH_EXAMPLES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_PLUGIN_TRUE}" && test -z "${ENABLE_PLUGIN_FALSE}"; then
- as_fn_error "conditional \"ENABLE_PLUGIN\" was never defined.
+ as_fn_error $? "conditional \"ENABLE_PLUGIN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_GOBJECT_INTROSPECTION_TRUE}" && test -z "${WITH_GOBJECT_INTROSPECTION_FALSE}"; then
- as_fn_error "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined.
+ as_fn_error $? "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${G_IR_SCANNER_SYMBOL_PREFIX_TRUE}" && test -z "${G_IR_SCANNER_SYMBOL_PREFIX_FALSE}"; then
- as_fn_error "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined.
+ as_fn_error $? "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@@ -15596,19 -15672,19 +15672,19 @@@ export LANGUAG
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- # as_fn_error ERROR [LINENO LOG_FD]
- # ---------------------------------
+ # as_fn_error STATUS ERROR [LINENO LOG_FD]
+ # ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
- # script with status $?, using 1 if that was 0.
+ # script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@@ -15804,7 -15880,7 +15880,7 @@@ $as_echo X"$as_dir"
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@@ -15857,8 -15933,8 +15933,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gtk-vnc $as_me 0.4.2, which was
- generated by GNU Autoconf 2.65. Invocation command line was
+ This file was extended by gtk-vnc $as_me 0.4.3, which was
+ generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@@ -15924,11 -16000,11 +16000,11 @@@ _ACEO
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gtk-vnc config.status 0.4.2
- configured by $0, generated by GNU Autoconf 2.65,
+ gtk-vnc config.status 0.4.3
+ configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@@ -15984,7 -16060,7 +16060,7 @@@ d
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@@ -15993,7 -16069,7 +16069,7 @@@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@@ -16329,7 -16405,7 +16405,7 @@@ d
"mingw32-gtk-vnc.spec") CONFIG_FILES="$CONFIG_FILES mingw32-gtk-vnc.spec" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@@ -16367,7 -16443,7 +16443,7 @@@ $debug |
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
- } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@@ -16384,7 -16460,7 +16460,7 @@@ if test "x$ac_cr" = x; the
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@@ -16398,18 -16474,18 +16474,18 @@@ _ACEO
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@@ -16498,20 -16574,28 +16574,28 @@@ if sed "s/$ac_cr//" < /dev/null > /dev/
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+ # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
- s/:*\$(srcdir):*/:/
- s/:*\${srcdir}:*/:/
- s/:*@srcdir@:*/:/
- s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+ h
+ s///
+ s/^/:/
+ s/[ ]*$/:/
+ s/:\$(srcdir):/:/g
+ s/:\${srcdir}:/:/g
+ s/:@srcdir@:/:/g
+ s/^:*//
s/:*$//
+ x
+ s/\(=[ ]*\).*/\1/
+ G
+ s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@@ -16539,7 -16623,7 +16623,7 @@@ for ac_last_try in false false :; d
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@@ -16624,7 -16708,7 +16708,7 @@@ cat >>$CONFIG_STATUS <<_ACEOF || ac_wri
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@@ -16637,7 -16721,7 +16721,7 @@@ d
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@@ -16665,7 -16749,7 +16749,7 @@@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@@ -16692,7 -16776,7 +16776,7 @@@ $as_echo "$as_me: creating $ac_file" >&
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@@ -16829,22 -16913,22 +16913,22 @@@ s&@MKDIR_P@&$ac_MKDIR_P&;t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&5
+ which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&2;}
+ which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@@ -16855,19 -16939,19 +16939,19 @@@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@@ -17658,7 -17742,7 +17742,7 @@@ _LT_EO
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@@ -17686,7 -17770,7 +17770,7 @@@ _ACEO
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@@ -17707,7 -17791,7 +17791,7 @@@ if test "$no_create" != yes; the
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--
libgtk-vnc Debian packaging
More information about the Pkg-libvirt-commits
mailing list