r21469 - in /desktop/unstable/pessulus/debian: changelog control.in patches/00_disable_pkg_check.patch patches/10_desktop_file.patch patches/70_mandatory-autoconf.patch
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Wed Sep 23 20:17:27 UTC 2009
Author: dktrkranz
Date: Wed Sep 23 20:17:27 2009
New Revision: 21469
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21469
Log:
* New upstream release.
* Refresh patches for new upstream release:
- debian/patches/00_disable_pkg_check.patch
- debian/patches/70_mandatory-autoconf.patch
* Remove patches applied upstream:
- debian/patches/10_desktop_file.patch
* debian/control.in:
- Remove myself from Uploaders, let gnome-pkg-tools do the job.
Removed:
desktop/unstable/pessulus/debian/patches/10_desktop_file.patch
Modified:
desktop/unstable/pessulus/debian/changelog
desktop/unstable/pessulus/debian/control.in
desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch
desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch
Modified: desktop/unstable/pessulus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/changelog?rev=21469&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/changelog [utf-8] (original)
+++ desktop/unstable/pessulus/debian/changelog [utf-8] Wed Sep 23 20:17:27 2009
@@ -1,3 +1,16 @@
+pessulus (2.28.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh patches for new upstream release:
+ - debian/patches/00_disable_pkg_check.patch
+ - debian/patches/70_mandatory-autoconf.patch
+ * Remove patches applied upstream:
+ - debian/patches/10_desktop_file.patch
+ * debian/control.in:
+ - Remove myself from Uploaders, let gnome-pkg-tools do the job.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Wed, 23 Sep 2009 22:08:33 +0200
+
pessulus (2.26.2-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/pessulus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/control.in?rev=21469&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/control.in [utf-8] (original)
+++ desktop/unstable/pessulus/debian/control.in [utf-8] Wed Sep 23 20:17:27 2009
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: @GNOME_TEAM@, Luca Falavigna <dktrkranz at debian.org>
+Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.49),
debhelper (>= 5.0.38),
gnome-pkg-tools (>= 0.10)
Modified: desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch?rev=21469&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch [utf-8] Wed Sep 23 20:17:27 2009
@@ -3,15 +3,15 @@
diff -Nur -x '*.orig' -x '*~' pessulus-2.26.1/configure.ac pessulus-2.26.1.new/configure.ac
--- pessulus-2.26.1/configure.ac 2009-04-14 00:00:25.000000000 +0200
+++ pessulus-2.26.1.new/configure.ac 2009-04-24 21:28:48.000000000 +0200
-@@ -8,11 +8,6 @@
+@@ -11,10 +11,6 @@
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-PKG_CHECK_MODULES(PESSULUS,
-- pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2)
-
GETTEXT_PACKAGE=pessulus
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+
Modified: desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch?rev=21469&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] Wed Sep 23 20:17:27 2009
@@ -1,13 +1,13 @@
Generated with autoconf && rm -rf autom4te.cache
-diff -Nur -x '*.orig' -x '*~' pessulus-2.26.2/configure pessulus-2.26.2.new/configure
---- pessulus-2.26.2/configure 2009-06-30 00:58:19.000000000 +0200
-+++ pessulus-2.26.2.new/configure 2009-08-30 22:54:44.512342675 +0200
+diff -Nur -x '*.orig' -x '*~' pessulus-2.28.0/configure pessulus-2.28.0.new/configure
+--- pessulus-2.28.0/configure 2009-09-21 18:29:01.000000000 +0200
++++ pessulus-2.28.0.new/configure 2009-09-23 22:12:55.448596663 +0200
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for pessulus 2.26.2.
-+# Generated by GNU Autoconf 2.64 for pessulus 2.26.2.
+-# Generated by GNU Autoconf 2.63 for pessulus 2.28.0.
++# Generated by GNU Autoconf 2.64 for pessulus 2.28.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
#
@@ -241,18 +241,6 @@
-
-if as_func_ret_success; then
- :
--else
-- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
@@ -272,11 +260,23 @@
+ as_have_required=yes
else
- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
++ as_have_required=no
+ fi
++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
+ else
+- exitcode=1
- echo positional parameters were not saved.
-+ as_have_required=no
- fi
-+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
+-fi
+-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
@@ -286,7 +286,7 @@
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
- else
+-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -799,14 +799,14 @@
# Identity of this package.
PACKAGE_NAME='pessulus'
@@ -599,6 +553,7 @@
- PACKAGE_VERSION='2.26.2'
- PACKAGE_STRING='pessulus 2.26.2'
+ PACKAGE_VERSION='2.28.0'
+ PACKAGE_STRING='pessulus 2.28.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus'
+PACKAGE_URL=''
ac_unique_file="pessulus.in"
# Factoring default headers for most tests.
-@@ -711,9 +666,6 @@
+@@ -713,9 +668,6 @@
CFLAGS
CC
GETTEXT_PACKAGE
@@ -816,7 +816,7 @@
ACLOCAL_AMFLAGS
MAINT
MAINTAINER_MODE_FALSE
-@@ -771,6 +723,7 @@
+@@ -775,6 +727,7 @@
program_transform_name
prefix
exec_prefix
@@ -824,7 +824,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -789,9 +742,6 @@
+@@ -794,9 +747,6 @@
ac_precious_vars='build_alias
host_alias
target_alias
@@ -834,7 +834,7 @@
CC
CFLAGS
LDFLAGS
-@@ -906,8 +856,7 @@
+@@ -911,8 +861,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 &&
@@ -844,7 +844,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -933,8 +882,7 @@
+@@ -938,8 +887,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 &&
@@ -854,7 +854,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1138,8 +1086,7 @@
+@@ -1143,8 +1091,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 &&
@@ -864,7 +864,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1155,8 +1102,7 @@
+@@ -1160,8 +1107,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 &&
@@ -874,7 +874,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1186,17 +1132,17 @@
+@@ -1191,17 +1137,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -898,7 +898,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1213,15 +1159,13 @@
+@@ -1218,15 +1164,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -916,7 +916,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1244,8 +1188,7 @@
+@@ -1249,8 +1193,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -926,7 +926,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1275,11 +1218,9 @@
+@@ -1280,11 +1223,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -940,7 +940,7 @@
# Find the source files, if location was not specified.
-@@ -1318,13 +1259,11 @@
+@@ -1323,13 +1264,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -956,7 +956,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1437,11 +1376,6 @@
+@@ -1444,11 +1383,6 @@
The GConf source of the mandatory values
Some influential environment variables:
@@ -968,10 +968,10 @@
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -1518,21 +1452,378 @@
+@@ -1525,21 +1459,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- pessulus configure 2.26.2
+ pessulus configure 2.28.0
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
@@ -1345,13 +1345,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by pessulus $as_me 2.26.2, which was
+ It was created by pessulus $as_me 2.28.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
-@@ -1568,8 +1859,8 @@
+@@ -1575,8 +1866,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1362,7 +1362,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1606,9 +1897,9 @@
+@@ -1613,9 +1904,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1374,7 +1374,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1624,13 +1915,13 @@
+@@ -1631,13 +1922,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1391,7 +1391,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1655,13 +1946,13 @@
+@@ -1662,13 +1953,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1407,7 +1407,7 @@
esac ;;
esac
done
-@@ -1733,39 +2024,41 @@
+@@ -1740,39 +2031,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1454,7 +1454,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -1784,7 +2077,7 @@
+@@ -1791,7 +2084,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -1463,7 +1463,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -1795,7 +2088,7 @@
+@@ -1802,7 +2095,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1472,7 +1472,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1803,7 +2096,7 @@
+@@ -1810,7 +2103,7 @@
esac
fi
else
@@ -1481,7 +1481,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -1818,11 +2111,11 @@
+@@ -1825,11 +2118,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1495,7 +1495,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -1832,17 +2125,17 @@
+@@ -1839,17 +2132,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1517,7 +1517,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -1854,43 +2147,20 @@
+@@ -1861,43 +2154,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1568,7 +1568,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1904,24 +2174,16 @@
+@@ -1911,24 +2181,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1601,7 +1601,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -1947,10 +2209,10 @@
+@@ -1954,10 +2216,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -1614,7 +1614,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -1958,11 +2220,11 @@
+@@ -1965,11 +2227,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1630,7 +1630,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1999,7 +2261,7 @@
+@@ -2006,7 +2268,7 @@
;;
esac
@@ -1639,7 +1639,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2015,7 +2277,7 @@
+@@ -2022,7 +2284,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1648,7 +1648,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2026,7 +2288,7 @@
+@@ -2033,7 +2295,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1657,7 +1657,25 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2050,11 +2312,8 @@
+@@ -2044,15 +2306,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+- { (exit 1); exit 1; }; };;
++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+- { (exit 1); exit 1; }; };;
++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2074,11 +2332,8 @@
# 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".
@@ -1671,7 +1689,7 @@
fi
test "$2" = conftest.file
-@@ -2063,13 +2322,10 @@
+@@ -2087,13 +2342,10 @@
# Ok.
:
else
@@ -1688,7 +1706,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2090,14 +2346,14 @@
+@@ -2121,7 +2373,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1696,6 +1714,103 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
+
+@@ -2142,9 +2394,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -2155,24 +2407,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -2182,9 +2434,9 @@
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -2195,24 +2447,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -2221,7 +2473,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2234,10 +2486,10 @@
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
@@ -1706,7 +1821,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2105,7 +2361,7 @@
+@@ -2245,7 +2497,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1715,7 +1830,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2117,7 +2373,7 @@
+@@ -2257,7 +2509,7 @@
esac
done
done
@@ -1724,7 +1839,7 @@
IFS=$as_save_IFS
fi
-@@ -2133,7 +2389,7 @@
+@@ -2273,7 +2525,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -1733,7 +1848,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2146,9 +2402,9 @@
+@@ -2286,9 +2538,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1745,7 +1860,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2159,24 +2415,24 @@
+@@ -2299,24 +2551,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1775,7 +1890,7 @@
$as_echo "no" >&6; }
fi
-@@ -2184,11 +2440,11 @@
+@@ -2324,11 +2576,11 @@
test -n "$AWK" && break
done
@@ -1789,7 +1904,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2206,11 +2462,11 @@
+@@ -2346,11 +2598,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1803,7 +1918,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2230,9 +2486,7 @@
+@@ -2370,9 +2622,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1814,100 +1929,16 @@
fi
fi
-@@ -2286,9 +2540,9 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$STRIP"; then
-@@ -2299,24 +2553,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -2326,9 +2580,9 @@
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_STRIP"; then
-@@ -2339,24 +2593,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -2365,7 +2619,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2390,16 +2644,16 @@
+@@ -2429,7 +2679,7 @@
+
+
+ # Check whether --enable-silent-rules was given.
+-if test "${enable_silent_rules+set}" = set; then
++if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+ fi
+
+@@ -2443,16 +2693,16 @@
@@ -1927,7 +1958,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2416,252 +2670,6 @@
+@@ -2469,242 +2719,6 @@
ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
@@ -2056,17 +2087,14 @@
- pkg_cv_PESSULUS_CFLAGS="$PESSULUS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0 \\
-- gnome-python-2.0 >= 2.6.0 \\
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.13.0 \\
- gnome-python-desktop-2.0 >= 2.17.2\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_PESSULUS_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- pkg_cv_PESSULUS_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2" 2>/dev/null`
-else
- pkg_failed=yes
@@ -2078,17 +2106,14 @@
- pkg_cv_PESSULUS_LIBS="$PESSULUS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0 \\
-- gnome-python-2.0 >= 2.6.0 \\
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.13.0 \\
- gnome-python-desktop-2.0 >= 2.17.2\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_PESSULUS_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- pkg_cv_PESSULUS_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2" 2>/dev/null`
-else
- pkg_failed=yes
@@ -2107,19 +2132,16 @@
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-- PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2" 2>&1`
- else
-- PESSULUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- PESSULUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$PESSULUS_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2) were not met:
-
-$PESSULUS_PKG_ERRORS
@@ -2131,8 +2153,7 @@
-and PESSULUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
--$as_echo "$as_me: error: Package requirements (pygtk-2.0 >= 2.6.0 \
-- gnome-python-2.0 >= 2.6.0 \
+-$as_echo "$as_me: error: Package requirements (pygtk-2.0 >= 2.13.0 \
- gnome-python-desktop-2.0 >= 2.17.2) were not met:
-
-$PESSULUS_PKG_ERRORS
@@ -2180,7 +2201,7 @@
GETTEXT_PACKAGE=pessulus
-@@ -2681,7 +2689,7 @@
+@@ -2724,7 +2738,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2189,7 +2210,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2709,12 +2717,12 @@
+@@ -2752,12 +2766,12 @@
fi
@@ -2204,7 +2225,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2739,9 +2747,9 @@
+@@ -2782,9 +2796,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2216,7 +2237,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2752,24 +2760,24 @@
+@@ -2795,24 +2809,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2246,7 +2267,7 @@
$as_echo "no" >&6; }
fi
-@@ -2779,9 +2787,9 @@
+@@ -2822,9 +2836,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2258,7 +2279,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2792,24 +2800,24 @@
+@@ -2835,24 +2849,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2288,7 +2309,7 @@
$as_echo "no" >&6; }
fi
-@@ -2818,7 +2826,7 @@
+@@ -2861,7 +2875,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2297,7 +2318,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2832,9 +2840,9 @@
+@@ -2875,9 +2889,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2309,7 +2330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2845,24 +2853,24 @@
+@@ -2888,24 +2902,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2339,7 +2360,7 @@
$as_echo "no" >&6; }
fi
-@@ -2872,9 +2880,9 @@
+@@ -2915,9 +2929,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2351,7 +2372,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2886,18 +2894,18 @@
+@@ -2929,18 +2943,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2373,7 +2394,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -2916,10 +2924,10 @@
+@@ -2959,10 +2973,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2386,7 +2407,7 @@
$as_echo "no" >&6; }
fi
-@@ -2931,9 +2939,9 @@
+@@ -2974,9 +2988,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2398,7 +2419,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2944,24 +2952,24 @@
+@@ -2987,24 +3001,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2428,7 +2449,7 @@
$as_echo "no" >&6; }
fi
-@@ -2975,9 +2983,9 @@
+@@ -3018,9 +3032,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2440,7 +2461,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2988,24 +2996,24 @@
+@@ -3031,24 +3045,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2470,7 +2491,7 @@
$as_echo "no" >&6; }
fi
-@@ -3018,7 +3026,7 @@
+@@ -3061,7 +3075,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2479,7 +2500,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3029,73 +3037,55 @@
+@@ -3072,73 +3086,55 @@
fi
@@ -2579,7 +2600,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3112,17 +3102,17 @@
+@@ -3155,17 +3151,17 @@
done
rm -f $ac_rmfiles
@@ -2602,7 +2623,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3139,7 +3129,7 @@
+@@ -3182,7 +3178,7 @@
# certainly right.
break;;
*.* )
@@ -2611,7 +2632,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3158,84 +3148,75 @@
+@@ -3201,84 +3197,75 @@
else
ac_file=''
fi
@@ -2721,7 +2742,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3250,32 +3231,24 @@
+@@ -3293,32 +3280,24 @@
esac
done
else
@@ -2761,7 +2782,7 @@
/* end confdefs.h. */
int
-@@ -3287,17 +3260,17 @@
+@@ -3330,17 +3309,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2784,7 +2805,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3310,31 +3283,23 @@
+@@ -3353,31 +3332,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2823,7 +2844,7 @@
/* end confdefs.h. */
int
-@@ -3348,37 +3313,16 @@
+@@ -3391,37 +3362,16 @@
return 0;
}
_ACEOF
@@ -2864,7 +2885,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3387,20 +3331,16 @@
+@@ -3430,20 +3380,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2888,7 +2909,7 @@
/* end confdefs.h. */
int
-@@ -3411,35 +3351,11 @@
+@@ -3454,35 +3400,11 @@
return 0;
}
_ACEOF
@@ -2927,7 +2948,7 @@
/* end confdefs.h. */
int
-@@ -3450,36 +3366,12 @@
+@@ -3493,36 +3415,12 @@
return 0;
}
_ACEOF
@@ -2968,7 +2989,7 @@
/* end confdefs.h. */
int
-@@ -3490,42 +3382,17 @@
+@@ -3533,42 +3431,17 @@
return 0;
}
_ACEOF
@@ -3013,7 +3034,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3542,18 +3409,14 @@
+@@ -3585,18 +3458,14 @@
CFLAGS=
fi
fi
@@ -3035,7 +3056,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3610,32 +3473,9 @@
+@@ -3653,32 +3522,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3069,7 +3090,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3646,17 +3486,19 @@
+@@ -3689,17 +3535,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3092,7 +3113,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3666,9 +3508,9 @@
+@@ -3709,9 +3557,9 @@
depcc="$CC" am_compiler_list=
@@ -3104,7 +3125,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3757,7 +3599,7 @@
+@@ -3819,7 +3667,7 @@
fi
fi
@@ -3113,7 +3134,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3778,14 +3620,14 @@
+@@ -3840,14 +3688,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3130,7 +3151,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -3800,11 +3642,7 @@
+@@ -3862,11 +3710,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3143,7 +3164,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3813,78 +3651,34 @@
+@@ -3875,78 +3719,34 @@
#endif
Syntax error
_ACEOF
@@ -3227,7 +3248,7 @@
break
fi
-@@ -3896,7 +3690,7 @@
+@@ -3958,7 +3758,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3236,7 +3257,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -3907,100 +3701,49 @@
+@@ -3969,100 +3769,49 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3355,7 +3376,7 @@
fi
ac_ext=c
-@@ -4010,9 +3753,9 @@
+@@ -4072,9 +3821,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3367,7 +3388,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4023,7 +3766,7 @@
+@@ -4085,7 +3834,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3376,7 +3397,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4043,7 +3786,7 @@
+@@ -4105,7 +3854,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3385,7 +3406,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4058,26 +3801,24 @@
+@@ -4120,26 +3869,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3417,7 +3438,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4091,7 +3832,7 @@
+@@ -4153,7 +3900,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3426,7 +3447,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4111,7 +3852,7 @@
+@@ -4173,7 +3920,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3435,7 +3456,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4126,12 +3867,10 @@
+@@ -4188,12 +3935,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3450,7 +3471,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4139,21 +3878,17 @@
+@@ -4201,21 +3946,17 @@
fi
fi
@@ -3476,7 +3497,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4168,48 +3903,23 @@
+@@ -4230,48 +3971,23 @@
return 0;
}
_ACEOF
@@ -3530,7 +3551,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4219,18 +3929,14 @@
+@@ -4281,18 +3997,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3552,7 +3573,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4240,14 +3946,10 @@
+@@ -4302,14 +4014,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3569,7 +3590,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4274,118 +3976,34 @@
+@@ -4336,118 +4044,34 @@
return 0;
}
_ACEOF
@@ -3701,7 +3722,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4396,151 +4014,12 @@
+@@ -4458,151 +4082,12 @@
@@ -3858,7 +3879,7 @@
_ACEOF
fi
-@@ -4548,16 +4027,12 @@
+@@ -4610,16 +4095,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -3878,7 +3899,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -4568,207 +4043,45 @@
+@@ -4630,207 +4111,45 @@
return 0;
}
_ACEOF
@@ -4107,7 +4128,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -4781,54 +4094,25 @@
+@@ -4843,54 +4162,25 @@
return 0;
}
_ACEOF
@@ -4170,7 +4191,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -4841,141 +4125,26 @@
+@@ -4903,141 +4193,26 @@
return 0;
}
_ACEOF
@@ -4322,7 +4343,7 @@
_ACEOF
fi
-@@ -4990,18 +4159,14 @@
+@@ -5052,18 +4227,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -4344,7 +4365,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5019,55 +4184,26 @@
+@@ -5081,55 +4252,26 @@
return 0;
}
_ACEOF
@@ -4409,7 +4430,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5085,55 +4221,26 @@
+@@ -5147,55 +4289,26 @@
return 0;
}
_ACEOF
@@ -4474,7 +4495,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5151,43 +4258,18 @@
+@@ -5213,43 +4326,18 @@
return 0;
}
_ACEOF
@@ -4524,7 +4545,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -5197,22 +4279,18 @@
+@@ -5259,22 +4347,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -4552,7 +4573,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5230,161 +4308,27 @@
+@@ -5292,161 +4376,27 @@
return 0;
}
_ACEOF
@@ -4723,7 +4744,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -5392,64 +4336,54 @@
+@@ -5454,64 +4404,54 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -4831,7 +4852,7 @@
_ACEOF
fi
-@@ -5479,15 +4413,13 @@
+@@ -5541,15 +4481,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -4850,7 +4871,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -5512,118 +4444,28 @@
+@@ -5574,118 +4512,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -4977,7 +4998,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -5638,14 +4480,14 @@
+@@ -5700,14 +4548,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -4997,7 +5018,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -5653,9 +4495,9 @@
+@@ -5715,9 +4563,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -5009,7 +5030,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -5668,14 +4510,14 @@
+@@ -5730,14 +4578,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5027,7 +5048,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -5684,19 +4526,19 @@
+@@ -5746,19 +4594,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5051,7 +5072,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -5721,18 +4563,14 @@
+@@ -5783,18 +4631,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -5073,7 +5094,7 @@
/* end confdefs.h. */
int
-@@ -5744,121 +4582,14 @@
+@@ -5806,121 +4650,14 @@
return 0;
}
_ACEOF
@@ -5199,7 +5220,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -5873,10 +4604,8 @@
+@@ -5935,10 +4672,8 @@
;;
esac
fi
@@ -5212,7 +5233,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -5890,9 +4619,7 @@
+@@ -5952,9 +4687,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -5223,7 +5244,7 @@
fi
-@@ -5900,7 +4627,7 @@
+@@ -5962,7 +4695,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -5232,7 +5253,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -5933,7 +4660,7 @@
+@@ -5995,7 +4728,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -5241,7 +5262,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -5958,7 +4685,7 @@
+@@ -6020,7 +4753,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -5250,7 +5271,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -5991,16 +4718,16 @@
+@@ -6053,16 +4786,16 @@
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -5270,7 +5291,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -6008,35 +4735,31 @@
+@@ -6070,35 +4803,31 @@
case "$am__api_version" in
1.01234)
@@ -5312,7 +5333,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -6049,14 +4772,14 @@
+@@ -6111,14 +4840,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5330,7 +5351,7 @@
IFS=$as_save_IFS
;;
-@@ -6064,19 +4787,19 @@
+@@ -6126,19 +4855,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -5354,7 +5375,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -6089,14 +4812,14 @@
+@@ -6151,14 +4880,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5372,7 +5393,7 @@
IFS=$as_save_IFS
;;
-@@ -6104,19 +4827,19 @@
+@@ -6166,19 +4895,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -5396,7 +5417,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -6129,14 +4852,14 @@
+@@ -6191,14 +4920,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5414,7 +5435,7 @@
IFS=$as_save_IFS
;;
-@@ -6144,18 +4867,16 @@
+@@ -6206,18 +4935,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -5436,7 +5457,7 @@
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 $< $@'
-@@ -6201,9 +4922,9 @@
+@@ -6263,9 +4990,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -5448,7 +5469,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -6216,14 +4937,14 @@
+@@ -6278,14 +5005,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5466,7 +5487,7 @@
IFS=$as_save_IFS
;;
-@@ -6231,19 +4952,19 @@
+@@ -6293,19 +5020,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -5490,7 +5511,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -6256,14 +4977,14 @@
+@@ -6318,14 +5045,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5508,7 +5529,7 @@
IFS=$as_save_IFS
;;
-@@ -6271,19 +4992,19 @@
+@@ -6333,19 +5060,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -5532,7 +5553,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -6296,14 +5017,14 @@
+@@ -6358,14 +5085,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5550,7 +5571,7 @@
IFS=$as_save_IFS
;;
-@@ -6311,19 +5032,19 @@
+@@ -6373,19 +5100,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -5574,7 +5595,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6336,14 +5057,14 @@
+@@ -6398,14 +5125,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5592,7 +5613,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6352,33 +5073,29 @@
+@@ -6414,33 +5141,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5632,7 +5653,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -6391,14 +5108,14 @@
+@@ -6453,14 +5176,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5650,7 +5671,7 @@
IFS=$as_save_IFS
;;
-@@ -6406,173 +5123,56 @@
+@@ -6468,173 +5191,56 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -5852,7 +5873,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -6584,10 +5184,8 @@
+@@ -6646,10 +5252,8 @@
;;
esac
fi
@@ -5865,7 +5886,7 @@
fi
-@@ -6604,9 +5202,9 @@
+@@ -6666,9 +5270,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5877,7 +5898,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -6619,14 +5217,14 @@
+@@ -6681,14 +5285,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5895,7 +5916,7 @@
IFS=$as_save_IFS
;;
-@@ -6634,10 +5232,10 @@
+@@ -6696,10 +5300,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -5908,7 +5929,7 @@
$as_echo "no" >&6; }
fi
-@@ -6651,20 +5249,18 @@
+@@ -6713,20 +5317,18 @@
if test "$PYTHON" = :; then
@@ -5926,14 +5947,14 @@
+if test "${am_cv_python_version+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -6676,29 +5272,29 @@
+@@ -6738,23 +5340,23 @@
@@ -5944,7 +5965,7 @@
+if test "${am_cv_python_platform+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
@@ -5961,15 +5982,17 @@
+if test "${am_cv_python_pythondir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ if test "x$prefix" = xNONE
+@@ -6773,7 +5375,7 @@
+ esac
+
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -6707,15 +5303,15 @@
+@@ -6782,9 +5384,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -5980,15 +6003,17 @@
+if test "${am_cv_python_pyexecdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ if test "x$exec_prefix" = xNONE
+@@ -6803,7 +5405,7 @@
+ esac
+
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -6730,9 +5326,9 @@
+@@ -6818,9 +5420,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -6000,7 +6025,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -6745,14 +5341,14 @@
+@@ -6833,14 +5435,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6018,7 +6043,7 @@
IFS=$as_save_IFS
;;
-@@ -6760,10 +5356,10 @@
+@@ -6848,10 +5450,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -6031,7 +6056,7 @@
$as_echo "no" >&6; }
fi
-@@ -6773,7 +5369,7 @@
+@@ -6861,7 +5463,7 @@
GCONF_MANDATORY_SOURCE=`echo $GCONF_DEFAULTS_SOURCE | sed -e s/gconf.xml.defaults/gconf.xml.mandatory/`
# Check whether --with-gconf-mandatory-source was given.
@@ -6040,7 +6065,7 @@
withval=$with_gconf_mandatory_source; GCONF_MANDATORY_SOURCE="$withval"
fi
-@@ -6782,7 +5378,7 @@
+@@ -6870,7 +5472,7 @@
#define GCONF_MANDATORY_SOURCE "$GCONF_MANDATORY_SOURCE"
_ACEOF
@@ -6049,7 +6074,7 @@
$as_echo "Using config source $GCONF_MANDATORY_SOURCE for mandatory values" >&6; }
-@@ -6818,13 +5414,13 @@
+@@ -6906,13 +5508,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -6065,7 +6090,7 @@
esac ;;
esac
done
-@@ -6832,8 +5428,8 @@
+@@ -6920,8 +5522,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -6076,7 +6101,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -6856,11 +5452,11 @@
+@@ -6944,11 +5546,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -6090,7 +6115,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -6916,8 +5512,8 @@
+@@ -7004,8 +5606,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -6101,8 +6126,8 @@
done
LIBOBJS=$ac_libobjs
-@@ -6925,25 +5521,16 @@
-
+@@ -7021,25 +5623,16 @@
+ fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
@@ -6133,7 +6158,7 @@
fi
ac_config_commands="$ac_config_commands po/stamp-it"
-@@ -6954,9 +5541,10 @@
+@@ -7050,9 +5643,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -6146,7 +6171,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -6966,17 +5554,18 @@
+@@ -7062,17 +5656,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -6172,7 +6197,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -6984,23 +5573,15 @@
+@@ -7080,23 +5675,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -6201,7 +6226,7 @@
as_nl='
'
export as_nl
-@@ -7008,7 +5589,13 @@
+@@ -7104,7 +5691,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -6216,7 +6241,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -7019,7 +5606,7 @@
+@@ -7115,7 +5708,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -6225,7 +6250,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -7042,13 +5629,6 @@
+@@ -7138,13 +5731,6 @@
}
fi
@@ -6239,7 +6264,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -7058,15 +5638,15 @@
+@@ -7154,15 +5740,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -6258,7 +6283,7 @@
IFS=$as_save_IFS
;;
-@@ -7078,12 +5658,16 @@
+@@ -7174,12 +5760,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -6279,7 +6304,7 @@
done
PS1='$ '
PS2='> '
-@@ -7095,7 +5679,89 @@
+@@ -7191,7 +5781,89 @@
LANGUAGE=C
export LANGUAGE
@@ -6370,7 +6395,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -7109,8 +5775,12 @@
+@@ -7205,8 +5877,12 @@
as_basename=false
fi
@@ -6384,7 +6409,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -7130,76 +5800,25 @@
+@@ -7226,76 +5902,25 @@
}
s/.*/./; q'`
@@ -6472,7 +6497,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -7228,8 +5847,56 @@
+@@ -7324,8 +5949,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -6530,7 +6555,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -7248,10 +5915,10 @@
+@@ -7344,10 +6017,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -6543,7 +6568,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -7266,13 +5933,19 @@
+@@ -7362,13 +6035,19 @@
exec 6>&1
@@ -6559,13 +6584,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by pessulus $as_me 2.26.2, which was
+ This file was extended by pessulus $as_me 2.28.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -7300,10 +5973,11 @@
+@@ -7396,10 +6075,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -6580,7 +6605,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -7320,16 +5994,16 @@
+@@ -7416,16 +6096,16 @@
Configuration commands:
$config_commands
@@ -6590,7 +6615,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- pessulus config.status 2.26.2
+ pessulus config.status 2.28.0
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -6600,7 +6625,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -7372,7 +6046,7 @@
+@@ -7468,7 +6148,7 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -6609,7 +6634,7 @@
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-@@ -7381,11 +6055,10 @@
+@@ -7477,11 +6157,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -6624,7 +6649,7 @@
ac_need_defaults=false ;;
esac
-@@ -7446,9 +6119,7 @@
+@@ -7542,9 +6221,7 @@
"data/pessulus.desktop.in") CONFIG_FILES="$CONFIG_FILES data/pessulus.desktop.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -6635,7 +6660,7 @@
esac
done
-@@ -7474,7 +6145,7 @@
+@@ -7570,7 +6247,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -6644,7 +6669,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -7485,11 +6156,7 @@
+@@ -7581,11 +6258,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -6657,7 +6682,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -7497,10 +6164,16 @@
+@@ -7593,10 +6266,16 @@
if test -n "$CONFIG_FILES"; then
@@ -6676,7 +6701,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -7514,24 +6187,18 @@
+@@ -7610,24 +6289,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -6704,7 +6729,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -7620,9 +6287,7 @@
+@@ -7716,9 +6389,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -6715,7 +6740,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -7653,9 +6318,7 @@
+@@ -7749,9 +6420,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -6726,7 +6751,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -7683,12 +6346,10 @@
+@@ -7779,12 +6448,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -6741,7 +6766,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -7699,7 +6360,7 @@
+@@ -7795,7 +6462,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -6750,7 +6775,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -7712,9 +6373,7 @@
+@@ -7808,9 +6475,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -6761,7 +6786,7 @@
esac
;;
esac
-@@ -7742,47 +6401,7 @@
+@@ -7838,47 +6503,7 @@
q
}
s/.*/./; q'`
@@ -6810,7 +6835,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -7839,7 +6458,6 @@
+@@ -7935,7 +6560,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -6818,7 +6843,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -7849,12 +6467,11 @@
+@@ -7945,12 +6569,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -6833,7 +6858,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -7864,7 +6481,7 @@
+@@ -7960,7 +6583,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -6842,7 +6867,7 @@
esac
_ACEOF
-@@ -7893,14 +6510,12 @@
+@@ -7989,14 +6612,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -6859,7 +6884,7 @@
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;}
-@@ -7910,13 +6525,11 @@
+@@ -8006,13 +6627,11 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -6875,11 +6900,11 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -8001,47 +6614,7 @@
+@@ -8107,47 +6726,7 @@
q
}
s/.*/./; q'`
-- { as_dir=$dirpart/$fdir
+- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
@@ -6920,11 +6945,11 @@
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
-+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-@@ -8052,9 +6625,7 @@
++ as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+@@ -8159,9 +6738,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -6935,7 +6960,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -8077,15 +6648,12 @@
+@@ -8184,15 +6761,12 @@
done # for ac_tag
@@ -6953,7 +6978,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -8106,10 +6674,10 @@
+@@ -8213,10 +6787,10 @@
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.
More information about the pkg-gnome-commits
mailing list