[meego-commits] 14937: Changes to Trunk:Testing/rest
Rob Bradford
no_reply at build.meego.com
Thu Mar 17 10:42:52 UTC 2011
Hi,
I have made the following changes to rest in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Rob Bradford
[This message was auto-generated]
---
Request #14937:
submit: devel:ux:netbook/rest(r15) -> Trunk:Testing/rest
Message:
* Wed Mar 16 2011 James Ausmus <james.ausmus at intel.com> - 0.7.7
- Update to latest stable release
- Fix some introspection issues (BMC#13745)
- Use POST method to do OAuth 1.0 authentication (BMC#13843)
- Add 'signature-host' property to oauth-proxy (BMC#14192) (forwarded request 14902 from jausmus)
State: new 2011-03-17T03:42:47 rbradford
Comment: None
changes files:
--------------
--- rest.changes
+++ rest.changes
@@ -0,0 +1,6 @@
+* Wed Mar 16 2011 James Ausmus <james.ausmus at intel.com> - 0.7.7
+- Update to latest stable release
+- Fix some introspection issues (BMC#13745)
+- Use POST method to do OAuth 1.0 authentication (BMC#13843)
+- Add 'signature-host' property to oauth-proxy (BMC#14192)
+
old:
----
rest-0.7.6.tar.gz
new:
----
rest-0.7.7.tar.gz
spec files:
-----------
--- rest.spec
+++ rest.spec
@@ -1,13 +1,13 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.22
#
# >> macros
# << macros
Name: rest
Summary: Library for accessing rest web services
-Version: 0.7.6
+Version: 0.7.7
Release: 1
Group: System/Libraries
License: LGPLv2.1
@@ -35,7 +35,7 @@
Requires: %{name} = %{version}-%{release}
%description doc
-Documentation for %{name}
+Documentation package for %{name}
%package devel
Summary: Development files for %{name}
other changes:
--------------
++++++ rest-0.7.6.tar.gz -> rest-0.7.7.tar.gz
--- aclocal.m4
+++ aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -156,7 +156,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -167,7 +167,7 @@
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
--- configure
+++ configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for rest 0.7.6.
+# Generated by GNU Autoconf 2.67 for rest 0.7.7.
#
#
# 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
@@ -316,7 +316,7 @@
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
@@ -356,19 +356,19 @@
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
@@ -679,7 +679,7 @@
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`
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='rest'
PACKAGE_TARNAME='rest'
-PACKAGE_VERSION='0.7.6'
-PACKAGE_STRING='rest 0.7.6'
+PACKAGE_VERSION='0.7.7'
+PACKAGE_STRING='rest 0.7.7'
PACKAGE_BUGREPORT=''
PACKAGE_URL='http://meego.gitorious.org/meego-middleware/librest'
@@ -998,8 +998,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1044,7 +1045,7 @@
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
@@ -1070,7 +1071,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
@@ -1274,7 +1275,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
@@ -1290,7 +1291,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
@@ -1320,8 +1321,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"
;;
*=*)
@@ -1329,7 +1330,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 ;;
@@ -1347,13 +1348,13 @@
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
@@ -1376,7 +1377,7 @@
[\\/$]* | ?:[\\/]* ) 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'
@@ -1390,8 +1391,8 @@
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
@@ -1406,9 +1407,9 @@
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.
@@ -1447,11 +1448,11 @@
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
@@ -1477,7 +1478,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 rest 0.7.6 to adapt to many kinds of systems.
+\`configure' configures rest 0.7.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1491,7 +1492,7 @@
--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
@@ -1547,7 +1548,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rest 0.7.6:";;
+ short | recursive ) echo "Configuration of rest 0.7.7:";;
esac
cat <<\_ACEOF
@@ -1677,10 +1678,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rest configure 0.7.6
-generated by GNU Autoconf 2.65
+rest configure 0.7.7
+generated by GNU Autoconf 2.67
-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
@@ -1796,7 +1797,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1863,7 +1864,7 @@
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
@@ -1893,7 +1894,7 @@
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
@@ -1955,8 +1956,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rest $as_me 0.7.6, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+It was created by rest $as_me 0.7.7, which was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2066,11 +2067,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2104,11 +2103,9 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2121,11 +2118,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
@@ -2139,11 +2134,9 @@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2198,7 +2191,12 @@
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
@@ -2213,7 +2211,11 @@
{ $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
@@ -2289,7 +2291,7 @@
$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. ##
@@ -2308,16 +2310,22 @@
ac_aux_dir=
for ac_dir in build "$srcdir"/build; 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 \"$srcdir\"/build" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2437,11 +2445,11 @@
'
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
@@ -2463,7 +2471,7 @@
# 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
@@ -2473,7 +2481,7 @@
# 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
@@ -2711,7 +2719,7 @@
$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
@@ -2719,7 +2727,7 @@
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;;
@@ -2753,7 +2761,7 @@
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
@@ -2769,7 +2777,7 @@
# Define the identity of the package.
PACKAGE='rest'
- VERSION='0.7.6'
+ VERSION='0.7.7'
# Some tools Automake needs.
@@ -2828,7 +2836,7 @@
# 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; }
@@ -2839,16 +2847,16 @@
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='-'
@@ -2873,7 +2881,7 @@
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
@@ -2881,7 +2889,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='-'
@@ -3198,8 +3206,8 @@
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
@@ -3313,9 +3321,8 @@
{ { $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; }
@@ -3357,8 +3364,8 @@
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
@@ -3415,9 +3422,9 @@
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
@@ -3468,8 +3475,8 @@
{ { $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
@@ -4271,7 +4278,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4287,11 +4294,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4330,7 +4337,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4346,18 +4353,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
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
@@ -4418,7 +4425,7 @@
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
@@ -4484,7 +4491,7 @@
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
@@ -4619,7 +4626,7 @@
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
@@ -4821,7 +4828,7 @@
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
@@ -4900,7 +4907,7 @@
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
@@ -5016,7 +5023,7 @@
{ $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 :
@@ -5218,13 +5225,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5221: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5228: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5231: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5227: output\"" >&5)
+ (eval echo "\"\$as_me:5234: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6429,7 +6436,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6432 "configure"' > conftest.$ac_ext
+ echo '#line 6439 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7183,8 +7190,7 @@
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
@@ -7708,11 +7714,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7717: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7715: \$? = $ac_status" >&5
+ echo "$as_me:7721: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8047,11 +8053,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8050: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8056: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8054: \$? = $ac_status" >&5
+ echo "$as_me:8060: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8152,11 +8158,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8159: \$? = $ac_status" >&5
+ echo "$as_me:8165: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8207,11 +8213,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8210: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8214: \$? = $ac_status" >&5
+ echo "$as_me:8220: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10591,7 +10597,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10594 "configure"
+#line 10600 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10687,7 +10693,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10690 "configure"
+#line 10696 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11091,7 +11097,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
- as_fn_error "Package requirements (glib-2.0 >= 2.18) were not met:
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.18) were not met:
$GLIB_PKG_ERRORS
@@ -11106,7 +11112,7 @@
$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.
@@ -11115,7 +11121,7 @@
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
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -11180,7 +11186,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUP_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libsoup-2.4) were not met:
+ as_fn_error $? "Package requirements (libsoup-2.4) were not met:
$SOUP_PKG_ERRORS
@@ -11195,7 +11201,7 @@
$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.
@@ -11204,7 +11210,7 @@
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
SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
SOUP_LIBS=$pkg_cv_SOUP_LIBS
@@ -11269,7 +11275,7 @@
# Put the nasty error message in config.log where it belongs
echo "$XML_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libxml-2.0) were not met:
+ as_fn_error $? "Package requirements (libxml-2.0) were not met:
$XML_PKG_ERRORS
@@ -11284,7 +11290,7 @@
$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.
@@ -11293,7 +11299,7 @@
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
XML_CFLAGS=$pkg_cv_XML_CFLAGS
XML_LIBS=$pkg_cv_XML_LIBS
@@ -11358,7 +11364,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTHREAD_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gthread-2.0) were not met:
+ as_fn_error $? "Package requirements (gthread-2.0) were not met:
$GTHREAD_PKG_ERRORS
@@ -11373,7 +11379,7 @@
$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.
@@ -11382,7 +11388,7 @@
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
@@ -11466,7 +11472,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUP_GNOME_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libsoup-gnome-2.4 >= 2.25.1) were not met:
+ as_fn_error $? "Package requirements (libsoup-gnome-2.4 >= 2.25.1) were not met:
$SOUP_GNOME_PKG_ERRORS
@@ -11481,7 +11487,7 @@
$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.
@@ -11490,7 +11496,7 @@
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
SOUP_GNOME_CFLAGS=$pkg_cv_SOUP_GNOME_CFLAGS
SOUP_GNOME_LIBS=$pkg_cv_SOUP_GNOME_LIBS
@@ -11662,7 +11668,7 @@
test $ac_status = 0; }; then
:
else
- as_fn_error "You need to have gtk-doc >= 1.13 installed to build $PACKAGE_NAME" "$LINENO" 5
+ as_fn_error $? "You need to have gtk-doc >= 1.13 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
fi
@@ -11759,7 +11765,7 @@
test $ac_status = 0; }; then
:
else
- as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
fi
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
@@ -11769,7 +11775,7 @@
test $ac_status = 0; }; then
found_introspection=yes
else
- as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build rest" "$LINENO" 5
+ as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build rest" "$LINENO" 5
fi
;; #(
auto) :
@@ -11785,7 +11791,7 @@
fi
;; #(
*) :
- as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
@@ -11998,6 +12004,7 @@
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$//'
@@ -12021,39 +12028,39 @@
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 "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+ as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+ as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+ as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+ as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
- as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
+ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GCOV_ENABLED_TRUE}" && test -z "${GCOV_ENABLED_FALSE}"; then
- as_fn_error "conditional \"GCOV_ENABLED\" was never defined.
+ as_fn_error $? "conditional \"GCOV_ENABLED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -12203,19 +12210,19 @@
(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
@@ -12411,7 +12418,7 @@
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
@@ -12464,8 +12471,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rest $as_me 0.7.6, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+This file was extended by rest $as_me 0.7.7, which was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -12531,11 +12538,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rest config.status 0.7.6
-configured by $0, generated by GNU Autoconf 2.65,
+rest config.status 0.7.7
+configured by $0, generated by GNU Autoconf 2.67,
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."
@@ -12553,11 +12560,16 @@
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -12579,6 +12591,7 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -12591,7 +12604,7 @@
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 ;;
@@ -12600,7 +12613,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"
@@ -12923,7 +12936,7 @@
"rest.pc") CONFIG_FILES="$CONFIG_FILES rest.pc" ;;
"rest-extras.pc") CONFIG_FILES="$CONFIG_FILES rest-extras.pc" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -12961,7 +12974,7 @@
{
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.
@@ -12978,7 +12991,7 @@
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
@@ -12992,18 +13005,18 @@
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
@@ -13092,20 +13105,28 @@
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
@@ -13133,7 +13154,7 @@
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
@@ -13218,7 +13239,7 @@
_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"
@@ -13231,7 +13252,7 @@
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
@@ -13259,7 +13280,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'"
@@ -13286,7 +13307,7 @@
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
@@ -13423,22 +13444,22 @@
$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)
#
@@ -13449,19 +13470,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"
@@ -14246,7 +14267,7 @@
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.
@@ -14267,7 +14288,7 @@
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
--- configure.ac
+++ configure.ac
@@ -1,6 +1,6 @@
m4_define([api_major], [0])
m4_define([api_minor], [7])
-m4_define([api_micro], [6])
+m4_define([api_micro], [7])
m4_define([rest_version], [api_major.api_minor.api_micro])
--- docs/reference/rest/Makefile.am
+++ docs/reference/rest/Makefile.am
@@ -72,7 +72,9 @@
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) $(SOUP_CFLAGS) $(XML_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/rest/librest- at API_VERSION@.la $(top_builddir)/rest-extras/librest-extras- at API_VERSION@.la
+GTKDOC_LIBS=$(top_builddir)/rest/librest- at API_VERSION@.la $(top_builddir)/rest-extras/librest-extras- at API_VERSION@.la \
+ $(GLIB_LIBS) $(SOUP_LIBS) $(XML_LIBS)
+
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
--- docs/reference/rest/Makefile.in
+++ docs/reference/rest/Makefile.in
@@ -280,7 +280,9 @@
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) $(SOUP_CFLAGS) $(XML_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/rest/librest- at API_VERSION@.la $(top_builddir)/rest-extras/librest-extras- at API_VERSION@.la
+GTKDOC_LIBS = $(top_builddir)/rest/librest- at API_VERSION@.la $(top_builddir)/rest-extras/librest-extras- at API_VERSION@.la \
+ $(GLIB_LIBS) $(SOUP_LIBS) $(XML_LIBS)
+
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--- docs/reference/rest/html/OAuthProxy.html
+++ docs/reference/rest/html/OAuthProxy.html
@@ -99,6 +99,9 @@
const <span class="returnvalue">char</span> * <a class="link" href="OAuthProxy.html#oauth-proxy-get-token-secret" title="oauth_proxy_get_token_secret ()">oauth_proxy_get_token_secret</a> (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>);
<span class="returnvalue">void</span> <a class="link" href="OAuthProxy.html#oauth-proxy-set-token-secret" title="oauth_proxy_set_token_secret ()">oauth_proxy_set_token_secret</a> (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *token_secret</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="OAuthProxy.html#oauth-proxy-get-signature-host" title="oauth_proxy_get_signature_host ()">oauth_proxy_get_signature_host</a> (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="OAuthProxy.html#oauth-proxy-set-signature-host" title="oauth_proxy_set_signature_host ()">oauth_proxy_set_signature_host</a> (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *signature_host</code></em>);
</pre>
</div>
<div class="refsect1" title="Object Hierarchy">
@@ -114,6 +117,7 @@
<pre class="synopsis">
"<a class="link" href="OAuthProxy.html#OAuthProxy--consumer-key" title='The "consumer-key" property'>consumer-key</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only
"<a class="link" href="OAuthProxy.html#OAuthProxy--consumer-secret" title='The "consumer-secret" property'>consumer-secret</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="OAuthProxy.html#OAuthProxy--signature-host" title='The "signature-host" property'>signature-host</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="OAuthProxy.html#OAuthProxy--token" title='The "token" property'>token</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="OAuthProxy.html#OAuthProxy--token-secret" title='The "token-secret" property'>token-secret</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
</pre>
@@ -768,6 +772,54 @@
</tbody>
</table></div>
</div>
+<hr>
+<div class="refsect2" title="oauth_proxy_get_signature_host ()">
+<a name="oauth-proxy-get-signature-host"></a><h3>oauth_proxy_get_signature_host ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * oauth_proxy_get_signature_host (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>);</pre>
+<p>
+Get the signature hostname used when creating a signature base string.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>an <a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the signature hostname, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if there is none set.
+ This string is owned by <a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> and should not be freed.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="oauth_proxy_set_signature_host ()">
+<a name="oauth-proxy-set-signature-host"></a><h3>oauth_proxy_set_signature_host ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> oauth_proxy_set_signature_host (<em class="parameter"><code><a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a> *proxy</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *signature_host</code></em>);</pre>
+<p>
+Set the signature hostname used when creating a signature base string.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>an <a class="link" href="OAuthProxy.html" title="OAuthProxy"><span class="type">OAuthProxy</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>signature_host</code></em> :</span></p></td>
+<td>the signature host
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
</div>
<div class="refsect1" title="Property Details">
<a name="OAuthProxy.property-details"></a><h2>Property Details</h2>
@@ -785,6 +837,13 @@
<p>Default value: NULL</p>
</div>
<hr>
+<div class="refsect2" title='The "signature-host" property'>
+<a name="OAuthProxy--signature-host"></a><h3>The <code class="literal">"signature-host"</code> property</h3>
+<pre class="programlisting"> "signature-host" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
+<p>The base URL used in the signature string.</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
<div class="refsect2" title='The "token" property'>
<a name="OAuthProxy--token"></a><h3>The <code class="literal">"token"</code> property</h3>
<pre class="programlisting"> "token" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
--- docs/reference/rest/html/ch01.html
+++ docs/reference/rest/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Generic Proxies">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id367953"></a>Generic Proxies</h2></div></div></div>
+<a name="id352490"></a>Generic Proxies</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="rest-RestParam.html">RestParam</a></span><span class="refpurpose"> — Name/value parameter data type with intelligent memory
--- docs/reference/rest/html/ch02.html
+++ docs/reference/rest/html/ch02.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="OAuth Proxies">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id370448"></a>OAuth Proxies</h2></div></div></div>
+<a name="id354986"></a>OAuth Proxies</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="OAuthProxy.html">OAuthProxy</a></span><span class="refpurpose"></span>
--- docs/reference/rest/html/ch03.html
+++ docs/reference/rest/html/ch03.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Service-specific Proxies">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id370472"></a>Service-specific Proxies</h2></div></div></div>
+<a name="id355010"></a>Service-specific Proxies</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="FlickrProxy.html">FlickrProxy</a></span><span class="refpurpose"></span>
--- docs/reference/rest/html/ch04.html
+++ docs/reference/rest/html/ch04.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="XML Parsing">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id397918"></a>XML Parsing</h2></div></div></div>
+<a name="id382455"></a>XML Parsing</h2></div></div></div>
<div class="toc"><dl><dt>
<span class="refentrytitle"><a href="RestXmlParser.html">RestXmlParser</a></span><span class="refpurpose"></span>
</dt></dl></div>
--- docs/reference/rest/html/index.sgml
+++ docs/reference/rest/html/index.sgml
@@ -120,9 +120,12 @@
<ANCHOR id="oauth-proxy-set-token" href="rest/OAuthProxy.html#oauth-proxy-set-token">
<ANCHOR id="oauth-proxy-get-token-secret" href="rest/OAuthProxy.html#oauth-proxy-get-token-secret">
<ANCHOR id="oauth-proxy-set-token-secret" href="rest/OAuthProxy.html#oauth-proxy-set-token-secret">
+<ANCHOR id="oauth-proxy-get-signature-host" href="rest/OAuthProxy.html#oauth-proxy-get-signature-host">
+<ANCHOR id="oauth-proxy-set-signature-host" href="rest/OAuthProxy.html#oauth-proxy-set-signature-host">
<ANCHOR id="OAuthProxy.property-details" href="rest/OAuthProxy.html#OAuthProxy.property-details">
<ANCHOR id="OAuthProxy--consumer-key" href="rest/OAuthProxy.html#OAuthProxy--consumer-key">
<ANCHOR id="OAuthProxy--consumer-secret" href="rest/OAuthProxy.html#OAuthProxy--consumer-secret">
+<ANCHOR id="OAuthProxy--signature-host" href="rest/OAuthProxy.html#OAuthProxy--signature-host">
<ANCHOR id="OAuthProxy--token" href="rest/OAuthProxy.html#OAuthProxy--token">
<ANCHOR id="OAuthProxy--token-secret" href="rest/OAuthProxy.html#OAuthProxy--token-secret">
<ANCHOR id="OAuthProxyCall" href="rest/OAuthProxyCall.html">
--- docs/reference/rest/html/rest.devhelp
+++ docs/reference/rest/html/rest.devhelp
@@ -111,8 +111,11 @@
<function name="oauth_proxy_set_token ()" link="OAuthProxy.html#oauth-proxy-set-token"/>
<function name="oauth_proxy_get_token_secret ()" link="OAuthProxy.html#oauth-proxy-get-token-secret"/>
<function name="oauth_proxy_set_token_secret ()" link="OAuthProxy.html#oauth-proxy-set-token-secret"/>
+ <function name="oauth_proxy_get_signature_host ()" link="OAuthProxy.html#oauth-proxy-get-signature-host"/>
+ <function name="oauth_proxy_set_signature_host ()" link="OAuthProxy.html#oauth-proxy-set-signature-host"/>
<function name="The "consumer-key" property" link="OAuthProxy.html#OAuthProxy--consumer-key"/>
<function name="The "consumer-secret" property" link="OAuthProxy.html#OAuthProxy--consumer-secret"/>
+ <function name="The "signature-host" property" link="OAuthProxy.html#OAuthProxy--signature-host"/>
<function name="The "token" property" link="OAuthProxy.html#OAuthProxy--token"/>
<function name="The "token-secret" property" link="OAuthProxy.html#OAuthProxy--token-secret"/>
<function name="OAuthProxyCall" link="OAuthProxyCall.html#OAuthProxyCall-struct"/>
--- docs/reference/rest/html/rest.devhelp2
+++ docs/reference/rest/html/rest.devhelp2
@@ -111,8 +111,11 @@
<keyword type="function" name="oauth_proxy_set_token ()" link="OAuthProxy.html#oauth-proxy-set-token"/>
<keyword type="function" name="oauth_proxy_get_token_secret ()" link="OAuthProxy.html#oauth-proxy-get-token-secret"/>
<keyword type="function" name="oauth_proxy_set_token_secret ()" link="OAuthProxy.html#oauth-proxy-set-token-secret"/>
+ <keyword type="function" name="oauth_proxy_get_signature_host ()" link="OAuthProxy.html#oauth-proxy-get-signature-host"/>
+ <keyword type="function" name="oauth_proxy_set_signature_host ()" link="OAuthProxy.html#oauth-proxy-set-signature-host"/>
<keyword type="property" name="The "consumer-key" property" link="OAuthProxy.html#OAuthProxy--consumer-key"/>
<keyword type="property" name="The "consumer-secret" property" link="OAuthProxy.html#OAuthProxy--consumer-secret"/>
+ <keyword type="property" name="The "signature-host" property" link="OAuthProxy.html#OAuthProxy--signature-host"/>
<keyword type="property" name="The "token" property" link="OAuthProxy.html#OAuthProxy--token"/>
<keyword type="property" name="The "token-secret" property" link="OAuthProxy.html#OAuthProxy--token-secret"/>
<keyword type="struct" name="OAuthProxyCall" link="OAuthProxyCall.html#OAuthProxyCall-struct"/>
--- docs/reference/rest/rest-sections.txt
+++ docs/reference/rest/rest-sections.txt
@@ -165,6 +165,8 @@
oauth_proxy_set_token
oauth_proxy_get_token_secret
oauth_proxy_set_token_secret
+oauth_proxy_get_signature_host
+oauth_proxy_set_signature_host
<SUBSECTION Standard>
OAuthProxyPrivate
OAuthProxyClass
--- rest/Makefile.am
+++ rest/Makefile.am
@@ -66,10 +66,14 @@
Rest_ at API_VERSION_AM@_gir_NAMESPACE = Rest
Rest_ at API_VERSION_AM@_gir_VERSION = @API_VERSION@
Rest_ at API_VERSION_AM@_gir_LIBS = librest- at API_VERSION@.la
-Rest_ at API_VERSION_AM@_gir_FILES = $(addprefix $(top_srcdir)/rest/, $(lib_headers))
+Rest_ at API_VERSION_AM@_gir_FILES = \
+ $(lib_headers) \
+ $(filter-out %private.h, $(lib_sources))
Rest_ at API_VERSION_AM@_gir_CFLAGS = -I$(top_srcdir)
Rest_ at API_VERSION_AM@_gir_INCLUDES = GObject-2.0
Rest_ at API_VERSION_AM@_gir_PACKAGES = gobject-2.0 libsoup-2.4 libxml-2.0
+Rest_ at API_VERSION_AM@_gir_SCANNERFLAGS = --accept-unprefixed
+Rest_ at API_VERSION_AM@_gir_EXPORT_PACKAGES = rest- at API_VERSION@
girdir = $(datadir)/gir-1.0
dist_gir_DATA = $(INTROSPECTION_GIRS)
--- rest/Makefile.in
+++ rest/Makefile.in
@@ -364,10 +364,15 @@
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_NAMESPACE = Rest
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_VERSION = @API_VERSION@
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_LIBS = librest- at API_VERSION@.la
- at HAVE_INTROSPECTION_TRUE@Rest_ at API_VERSION_AM@_gir_FILES = $(addprefix $(top_srcdir)/rest/, $(lib_headers))
+ at HAVE_INTROSPECTION_TRUE@Rest_ at API_VERSION_AM@_gir_FILES = \
+ at HAVE_INTROSPECTION_TRUE@ $(lib_headers) \
+ at HAVE_INTROSPECTION_TRUE@ $(filter-out %private.h, $(lib_sources))
+
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_CFLAGS = -I$(top_srcdir)
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_INCLUDES = GObject-2.0
@HAVE_INTROSPECTION_TRUE at Rest_@API_VERSION_AM at _gir_PACKAGES = gobject-2.0 libsoup-2.4 libxml-2.0
+ at HAVE_INTROSPECTION_TRUE@Rest_ at API_VERSION_AM@_gir_SCANNERFLAGS = --accept-unprefixed
+ at HAVE_INTROSPECTION_TRUE@Rest_ at API_VERSION_AM@_gir_EXPORT_PACKAGES = rest- at API_VERSION@
@HAVE_INTROSPECTION_TRUE at girdir = $(datadir)/gir-1.0
@HAVE_INTROSPECTION_TRUE at dist_gir_DATA = $(INTROSPECTION_GIRS)
@HAVE_INTROSPECTION_TRUE at typelibsdir = $(libdir)/girepository-1.0/
--- rest/oauth-proxy-call.c
+++ rest/oauth-proxy-call.c
@@ -129,10 +129,22 @@
text = g_string_new (NULL);
g_string_append (text, rest_proxy_call_get_method (REST_PROXY_CALL (call)));
g_string_append_c (text, '&');
- if (priv->oauth_echo)
+ if (priv->oauth_echo) {
g_string_append_uri_escaped (text, priv->service_url, NULL, FALSE);
- else
+ } else if (priv->signature_host != NULL) {
+ SoupURI *url = soup_uri_new (callpriv->url);
+ gchar *signing_url;
+
+ soup_uri_set_host (url, priv->signature_host);
+ signing_url = soup_uri_to_string (url, FALSE);
+
+ g_string_append_uri_escaped (text, signing_url, NULL, FALSE);
+
+ soup_uri_free (url);
+ g_free (signing_url);
+ } else {
g_string_append_uri_escaped (text, callpriv->url, NULL, FALSE);
+ }
g_string_append_c (text, '&');
/* Merge the OAuth parameters with the query parameters */
--- rest/oauth-proxy-private.h
+++ rest/oauth-proxy-private.h
@@ -40,4 +40,6 @@
/* OAuth Echo */
gboolean oauth_echo;
char *service_url;
+ /* URL to use for signatures */
+ char *signature_host;
} OAuthProxyPrivate;
--- rest/oauth-proxy.c
+++ rest/oauth-proxy.c
@@ -33,7 +33,8 @@
PROP_CONSUMER_KEY,
PROP_CONSUMER_SECRET,
PROP_TOKEN,
- PROP_TOKEN_SECRET
+ PROP_TOKEN_SECRET,
+ PROP_SIGNATURE_HOST,
};
static RestProxyCall *
@@ -67,6 +68,9 @@
case PROP_TOKEN_SECRET:
g_value_set_string (value, priv->token_secret);
break;
+ case PROP_SIGNATURE_HOST:
+ g_value_set_string (value, priv->signature_host);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -99,6 +103,11 @@
g_free (priv->token_secret);
priv->token_secret = g_value_dup_string (value);
break;
+ case PROP_SIGNATURE_HOST:
+ if (priv->signature_host)
+ g_free (priv->signature_host);
+ priv->signature_host = g_value_dup_string (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -166,6 +175,13 @@
PROP_TOKEN_SECRET,
pspec);
+ pspec = g_param_spec_string ("signature-host", "signature-host",
+ "The base URL used in the signature string",
+ NULL, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_SIGNATURE_HOST,
+ pspec);
+
/* TODO: add enum property for signature method */
}
@@ -386,6 +402,7 @@
call = rest_proxy_new_call (REST_PROXY (proxy));
rest_proxy_call_set_function (call, function ? function : "request_token");
+ rest_proxy_call_set_method (call, "POST");
if (callback_uri)
rest_proxy_call_add_param (call, "oauth_callback", callback_uri);
@@ -463,6 +480,7 @@
call = rest_proxy_new_call (REST_PROXY (proxy));
rest_proxy_call_set_function (call, function ? function : "request_token");
+ rest_proxy_call_set_method (call, "POST");
if (callback_uri)
rest_proxy_call_add_param (call, "oauth_callback", callback_uri);
@@ -501,6 +519,7 @@
call = rest_proxy_new_call (REST_PROXY (proxy));
rest_proxy_call_set_function (call, function ? function : "access_token");
+ rest_proxy_call_set_method (call, "POST");
if (verifier)
rest_proxy_call_add_param (call, "oauth_verifier", verifier);
@@ -579,6 +598,7 @@
call = rest_proxy_new_call (REST_PROXY (proxy));
rest_proxy_call_set_function (call, function ? function : "access_token");
+ rest_proxy_call_set_method (call, "POST");
if (verifier)
rest_proxy_call_add_param (call, "oauth_verifier", verifier);
@@ -682,6 +702,47 @@
return PROXY_GET_PRIVATE (proxy)->oauth_10a;
}
+/**
+ * oauth_proxy_get_signature_host:
+ * @proxy: an #OAuthProxy
+ *
+ * Get the signature hostname used when creating a signature base string.
+ *
+ * Returns: the signature hostname, or %NULL if there is none set.
+ * This string is owned by #OAuthProxy and should not be freed.
+ */
+const char *
+oauth_proxy_get_signature_host (OAuthProxy *proxy)
+{
+ OAuthProxyPrivate *priv;
+
+ g_return_val_if_fail (OAUTH_IS_PROXY (proxy), NULL);
+ priv = PROXY_GET_PRIVATE (proxy);
+
+ return priv->signature_host;
+}
+
+/**
+ * oauth_proxy_set_signature_host:
+ * @proxy: an #OAuthProxy
+ * @signature_host: the signature host
+ *
+ * Set the signature hostname used when creating a signature base string.
+ */
+void
+oauth_proxy_set_signature_host (OAuthProxy *proxy,
+ const char *signature_host)
+{
+ OAuthProxyPrivate *priv;
+
+ g_return_if_fail (OAUTH_IS_PROXY (proxy));
+ priv = PROXY_GET_PRIVATE (proxy);
+
+ g_free (priv->signature_host);
+
+ priv->signature_host = g_strdup (signature_host);
+}
+
RestProxy *
oauth_proxy_new_echo_proxy (OAuthProxy *proxy,
/* TODO: should this be a function on the base url? */
--- rest/oauth-proxy.h
+++ rest/oauth-proxy.h
@@ -152,6 +152,10 @@
const char * oauth_proxy_get_token_secret (OAuthProxy *proxy);
void oauth_proxy_set_token_secret (OAuthProxy *proxy, const char *token_secret);
+const char * oauth_proxy_get_signature_host (OAuthProxy *proxy);
+
+void oauth_proxy_set_signature_host (OAuthProxy *proxy,
+ const char *signature_host);
RestProxy *oauth_proxy_new_echo_proxy (OAuthProxy *proxy,
const char *service_url,
--- tests/Makefile.am
+++ tests/Makefile.am
@@ -1,4 +1,6 @@
TESTS = proxy proxy-continuous threaded oauth oauth-async oauth2 flickr lastfm xml
+# TODO: fix this test case
+XFAIL_TESTS = xml
AM_CPPFLAGS = $(SOUP_CFLAGS) -I$(top_srcdir) $(GCOV_CFLAGS)
AM_LDFLAGS = $(SOUP_LIBS) $(GCOV_LDFLAGS) \
--- tests/Makefile.in
+++ tests/Makefile.in
@@ -36,6 +36,7 @@
TESTS = proxy$(EXEEXT) proxy-continuous$(EXEEXT) threaded$(EXEEXT) \
oauth$(EXEEXT) oauth-async$(EXEEXT) oauth2$(EXEEXT) \
flickr$(EXEEXT) lastfm$(EXEEXT) xml$(EXEEXT)
+XFAIL_TESTS = xml$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++++++ rest.yaml
--- rest.yaml
+++ rest.yaml
@@ -1,6 +1,6 @@
Name: rest
Summary: Library for accessing rest web services
-Version: 0.7.6
+Version: 0.7.7
Release: 1
Group: System/Libraries
License: LGPLv2.1
@@ -23,7 +23,7 @@
- Name: doc
Summary: Documentation for %{name}
Group: Documentation
- Description: Documentation for %{name}
+ Description: Documentation package for %{name}
- Name: devel
Summary: Development files for %{name}
More information about the MeeGo-commits
mailing list