diff -Nru tasks-0.15/aclocal.m4 tasks-0.16/aclocal.m4 --- tasks-0.15/aclocal.m4 2009-03-30 10:03:04.000000000 +0100 +++ tasks-0.16/aclocal.m4 2009-07-10 16:50:36.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. 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'.])]) @@ -648,25 +648,25 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) # Check the gettext tools to make sure they are GNU AC_PATH_PROG(XGETTEXT, xgettext) @@ -683,12 +683,17 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -AC_PATH_PROG(INTLTOOL_PERL, [perl]) +AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) + AC_MSG_ERROR([perl not found]) fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then AC_MSG_CHECKING([for XML::Parser]) @@ -744,7 +749,7 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" @@ -766,6 +771,17 @@ ])dnl ]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: @@ -962,7 +978,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,7 +993,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -991,12 +1007,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.10.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -1246,19 +1262,28 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -1526,14 +1551,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_PROG_CC_C_O # -------------- @@ -1545,8 +1570,9 @@ # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -1624,13 +1650,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1647,7 +1673,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff -Nru /tmp/ycjE72ysa0/tasks-0.15/configure /tmp/VBgdFrDVAo/tasks-0.16/configure --- tasks-0.15/configure 2009-03-30 10:03:06.000000000 +0100 +++ tasks-0.16/configure 2009-07-10 16:50:37.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for tasks 0.15. +# Generated by GNU Autoconf 2.63 for tasks 0.16. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -17,7 +17,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -39,17 +39,45 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +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 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -65,8 +93,6 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -89,7 +115,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -102,17 +128,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -134,7 +153,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -160,7 +179,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -242,7 +261,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -263,7 +282,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -343,10 +362,10 @@ if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -415,9 +434,10 @@ test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -453,7 +473,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -481,7 +501,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -494,19 +513,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -531,10 +553,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -574,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='tasks' PACKAGE_TARNAME='tasks' -PACKAGE_VERSION='0.15' -PACKAGE_STRING='tasks 0.15' +PACKAGE_VERSION='0.16' +PACKAGE_STRING='tasks 0.16' PACKAGE_BUGREPORT='http://o-hand.com' ac_unique_file="libkoto/koto-task-store.c" @@ -615,160 +637,171 @@ # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CPP -RANLIB -WARN_CFLAGS -USE_NLS -INTLTOOL_UPDATE -INTLTOOL_MERGE -INTLTOOL_EXTRACT -INTLTOOL_DESKTOP_RULE -INTLTOOL_DIRECTORY_RULE -INTLTOOL_KEYS_RULE -INTLTOOL_PROP_RULE -INTLTOOL_OAF_RULE -INTLTOOL_PONG_RULE -INTLTOOL_SERVER_RULE -INTLTOOL_SHEET_RULE -INTLTOOL_SOUNDLIST_RULE -INTLTOOL_UI_RULE -INTLTOOL_XAM_RULE -INTLTOOL_KBD_RULE -INTLTOOL_XML_RULE -INTLTOOL_XML_NOMERGE_RULE -INTLTOOL_CAVES_RULE -INTLTOOL_SCHEMAS_RULE -INTLTOOL_THEME_RULE -INTLTOOL_SERVICE_RULE -INTLTOOL_POLICY_RULE -XGETTEXT -MSGMERGE -MSGFMT -GMSGFMT -INTLTOOL_PERL -ALL_LINGUAS -DATADIRNAME -GETTEXT_PACKAGE -GREP -EGREP -MSGFMT_OPTS -CATALOGS -CATOBJEXT -GMOFILES -INSTOBJEXT -INTLLIBS -PO_IN_DATADIR_TRUE -PO_IN_DATADIR_FALSE -POFILES -POSUB -MKINSTALLDIRS -PKG_CONFIG -GTK_CFLAGS -GTK_LIBS -ECAL_CFLAGS -ECAL_LIBS -SEXY_CFLAGS -SEXY_LIBS -WITH_GTK_TRUE -WITH_GTK_FALSE -OMOKO_CFLAGS -OMOKO_LIBS -WITH_OMOKO_TRUE -WITH_OMOKO_FALSE -HILDON_CFLAGS -HILDON_LIBS -WITH_HILDON_TRUE -WITH_HILDON_FALSE -OWL_CFLAGS -OWL_LIBS -WITH_OWL_TRUE -WITH_OWL_FALSE -UNIQUE_CFLAGS -UNIQUE_LIBS -WITH_UNIQUE_TRUE -WITH_UNIQUE_FALSE -HAVE_GDATE_TIME_T_TRUE -HAVE_GDATE_TIME_T_FALSE -HAVE_GREGEX_TRUE -HAVE_GREGEX_FALSE +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' +HAVE_GREGEX_FALSE +HAVE_GREGEX_TRUE +HAVE_GDATE_TIME_T_FALSE +HAVE_GDATE_TIME_T_TRUE +WITH_UNIQUE_FALSE +WITH_UNIQUE_TRUE +UNIQUE_LIBS +UNIQUE_CFLAGS +WITH_OWL_FALSE +WITH_OWL_TRUE +OWL_LIBS +OWL_CFLAGS +WITH_HILDON_FALSE +WITH_HILDON_TRUE +HILDON_LIBS +HILDON_CFLAGS +WITH_OMOKO_FALSE +WITH_OMOKO_TRUE +OMOKO_LIBS +OMOKO_CFLAGS +WITH_GTK_FALSE +WITH_GTK_TRUE +ECAL_LIBS +ECAL_CFLAGS +GTK_LIBS +GTK_CFLAGS +PKG_CONFIG +MKINSTALLDIRS +POSUB +POFILES +PO_IN_DATADIR_FALSE +PO_IN_DATADIR_TRUE +INTLLIBS +INSTOBJEXT +GMOFILES +CATOBJEXT +CATALOGS +MSGFMT_OPTS +EGREP +GREP +GETTEXT_PACKAGE +DATADIRNAME +ALL_LINGUAS +INTLTOOL_PERL +GMSGFMT +MSGFMT +MSGMERGE +XGETTEXT +INTLTOOL_POLICY_RULE +INTLTOOL_SERVICE_RULE +INTLTOOL_THEME_RULE +INTLTOOL_SCHEMAS_RULE +INTLTOOL_CAVES_RULE +INTLTOOL_XML_NOMERGE_RULE +INTLTOOL_XML_RULE +INTLTOOL_KBD_RULE +INTLTOOL_XAM_RULE +INTLTOOL_UI_RULE +INTLTOOL_SOUNDLIST_RULE +INTLTOOL_SHEET_RULE +INTLTOOL_SERVER_RULE +INTLTOOL_PONG_RULE +INTLTOOL_OAF_RULE +INTLTOOL_PROP_RULE +INTLTOOL_KEYS_RULE +INTLTOOL_DIRECTORY_RULE +INTLTOOL_DESKTOP_RULE +INTLTOOL_EXTRACT +INTLTOOL_MERGE +INTLTOOL_UPDATE +USE_NLS +WARN_CFLAGS +RANLIB +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_compile_warnings +enable_iso_c +enable_nls +enable_gtk +enable_omoko +enable_hildon +with_owl +with_unique +' ac_precious_vars='build_alias host_alias target_alias @@ -783,8 +816,6 @@ GTK_LIBS ECAL_CFLAGS ECAL_LIBS -SEXY_CFLAGS -SEXY_LIBS OMOKO_CFLAGS OMOKO_LIBS HILDON_CFLAGS @@ -798,6 +829,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -896,13 +929,21 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -915,13 +956,21 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1112,22 +1161,38 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1147,7 +1212,7 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1156,16 +1221,16 @@ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1174,22 +1239,38 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1204,7 +1285,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $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 @@ -1220,10 +1301,10 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 + { $as_echo "$as_me: error: working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1231,12 +1312,12 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1263,12 +1344,12 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1295,7 +1376,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 tasks 0.15 to adapt to many kinds of systems. +\`configure' configures tasks 0.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1317,9 +1398,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1329,25 +1410,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/tasks] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/tasks] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1361,11 +1442,12 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tasks 0.15:";; + short | recursive ) echo "Configuration of tasks 0.16:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build @@ -1398,8 +1480,6 @@ GTK_LIBS linker flags for GTK, overriding pkg-config ECAL_CFLAGS C compiler flags for ECAL, overriding pkg-config ECAL_LIBS linker flags for ECAL, overriding pkg-config - SEXY_CFLAGS C compiler flags for SEXY, overriding pkg-config - SEXY_LIBS linker flags for SEXY, overriding pkg-config OMOKO_CFLAGS C compiler flags for OMOKO, overriding pkg-config OMOKO_LIBS linker flags for OMOKO, overriding pkg-config @@ -1423,15 +1503,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1467,7 +1549,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1476,11 +1558,11 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tasks configure 0.15 -generated by GNU Autoconf 2.61 +tasks configure 0.16 +generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1490,8 +1572,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tasks $as_me 0.15, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by tasks $as_me 0.16, which was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1527,7 +1609,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1562,7 +1644,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1614,11 +1696,12 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1648,9 +1731,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1665,9 +1748,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1683,8 +1766,8 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1726,21 +1809,24 @@ # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:$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" fi @@ -1750,16 +1836,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1773,29 +1859,38 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + 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 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1805,10 +1900,12 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1865,8 +1962,8 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1892,11 +1989,12 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1925,17 +2023,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -1948,8 +2058,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1959,8 +2069,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1983,9 +2093,9 @@ # 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". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi @@ -1996,26 +2106,23 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! +$as_echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -2026,15 +2133,15 @@ am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin @@ -2069,8 +2176,8 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -2082,10 +2189,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2098,7 +2205,7 @@ 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_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2109,22 +2216,23 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2141,12 +2249,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2165,8 +2273,8 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi fi @@ -2183,7 +2291,7 @@ # Define the identity of the package. PACKAGE=tasks - VERSION=0.15 + VERSION=0.16 cat >>confdefs.h <<_ACEOF @@ -2221,10 +2329,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -2237,7 +2345,7 @@ 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2248,11 +2356,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2261,10 +2369,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -2277,7 +2385,7 @@ 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2288,11 +2396,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2300,12 +2408,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 STRIP=$ac_ct_STRIP @@ -2342,8 +2446,8 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -2370,8 +2474,8 @@ fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. @@ -2400,10 +2504,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2416,7 +2520,7 @@ 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_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2427,11 +2531,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2440,10 +2544,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2456,7 +2560,7 @@ 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_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2467,11 +2571,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2479,12 +2583,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 CC=$ac_ct_CC @@ -2497,10 +2597,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2513,7 +2613,7 @@ 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_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2524,11 +2624,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2537,10 +2637,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2558,7 +2658,7 @@ continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2581,11 +2681,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2596,10 +2696,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2612,7 +2712,7 @@ 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_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2623,11 +2723,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2640,10 +2740,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2656,7 +2756,7 @@ 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_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2667,11 +2767,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2683,12 +2783,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 CC=$ac_ct_CC @@ -2698,44 +2794,50 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -2754,27 +2856,22 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done @@ -2785,10 +2882,11 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # 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' @@ -2799,7 +2897,7 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most @@ -2826,25 +2924,27 @@ ac_file='' fi -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables +$as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then @@ -2853,49 +2953,53 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. +$as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -2904,31 +3008,33 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2951,40 +3057,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3010,20 +3119,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -3033,15 +3143,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -3068,20 +3182,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -3106,20 +3221,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -3145,20 +3261,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3173,8 +3290,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3190,10 +3307,10 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -3264,20 +3381,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3293,15 +3411,15 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -3313,10 +3431,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3404,8 +3522,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3424,15 +3542,15 @@ 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 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3464,20 +3582,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -3501,13 +3620,14 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -3515,7 +3635,7 @@ # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -3540,8 +3660,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3569,20 +3689,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -3606,13 +3727,14 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -3620,7 +3742,7 @@ # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -3636,11 +3758,13 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -3657,10 +3781,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3673,7 +3797,7 @@ 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_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3684,11 +3808,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3697,10 +3821,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -3713,7 +3837,7 @@ 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_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3724,11 +3848,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3736,12 +3860,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 CC=$ac_ct_CC @@ -3754,10 +3874,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3770,7 +3890,7 @@ 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_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3781,11 +3901,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3794,10 +3914,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3815,7 +3935,7 @@ continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3838,11 +3958,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3853,10 +3973,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3869,7 +3989,7 @@ 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_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3880,11 +4000,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3897,10 +4017,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -3913,7 +4033,7 @@ 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_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3924,11 +4044,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3940,12 +4060,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 CC=$ac_ct_CC @@ -3955,50 +4071,56 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4024,20 +4146,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -4047,15 +4170,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -4082,20 +4209,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -4120,20 +4248,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -4159,20 +4288,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -4187,8 +4317,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -4204,10 +4334,10 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -4278,20 +4408,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -4307,15 +4438,15 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -4327,10 +4458,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -4418,8 +4549,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4434,16 +4565,16 @@ if test "x$CC" != xcc; then - { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 -echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 -echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi -set dummy $CC; ac_cc=`echo $2 | +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 - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4469,19 +4600,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -f conftest2.$ac_objext && { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes @@ -4492,10 +4625,11 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -4503,19 +4637,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -f conftest2.$ac_objext && { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # cc works too. @@ -4533,11 +4669,11 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } cat >>confdefs.h <<\_ACEOF #define NO_MINUS_C_MINUS_O 1 @@ -4548,8 +4684,9 @@ # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -4562,10 +4699,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -4578,7 +4715,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4589,11 +4726,11 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4602,10 +4739,10 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -4618,7 +4755,7 @@ 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_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4629,11 +4766,11 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -4641,12 +4778,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 RANLIB=$ac_ct_RANLIB @@ -4691,8 +4824,8 @@ for option in -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" - { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 -echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +$as_echo_n "checking whether gcc understands $option... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4714,20 +4847,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then has_option=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 has_option=no @@ -4735,8 +4869,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$SAVE_CFLAGS" - { echo "$as_me:$LINENO: result: $has_option" >&5 -echo "${ECHO_T}$has_option" >&6; } + { $as_echo "$as_me:$LINENO: result: $has_option" >&5 +$as_echo "$has_option" >&6; } if test $has_option = yes; then warning_flags="$warning_flags $option" fi @@ -4749,16 +4883,16 @@ fi ;; *) - { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 -echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} + { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} { (exit 1); exit 1; }; } ;; esac CFLAGS="$realsave_CFLAGS" - { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $warning_flags" >&5 -echo "${ECHO_T}$warning_flags" >&6; } + { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } + { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 +$as_echo "$warning_flags" >&6; } # Check whether --enable-iso-c was given. if test "${enable_iso_c+set}" = set; then @@ -4768,8 +4902,8 @@ fi - { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } complCFLAGS= if test "x$enable_iso_c" != "xno"; then if test "x$GCC" = "xyes"; then @@ -4783,16 +4917,16 @@ esac fi fi - { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 -echo "${ECHO_T}$complCFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +$as_echo "$complCFLAGS" >&6; } WARN_CFLAGS="$warning_flags $complCFLAGS" - { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. if test "${enable_nls+set}" = set; then enableval=$enable_nls; USE_NLS=$enableval @@ -4800,16 +4934,16 @@ USE_NLS=yes fi - { echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6; } + { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } case "$am__api_version" in 1.01234) - { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} { (exit 1); exit 1; }; } ;; *) @@ -4817,27 +4951,27 @@ esac if test -n "0.33.0"; then - { echo "$as_me:$LINENO: checking for intltool >= 0.33.0" >&5 -echo $ECHO_N "checking for intltool >= 0.33.0... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for intltool >= 0.33.0" >&5 +$as_echo_n "checking for intltool >= 0.33.0... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.33.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.33.0 or later." >&5 -echo "$as_me: error: Your intltool is too old. You need intltool 0.33.0 or later." >&2;} + { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.33.0 or later." >&5 +$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.33.0 or later." >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) @@ -4852,7 +4986,7 @@ 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4864,20 +4998,20 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 -echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) @@ -4892,7 +5026,7 @@ 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4904,20 +5038,20 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) @@ -4932,7 +5066,7 @@ 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4944,17 +5078,17 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 -echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} + { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} { (exit 1); exit 1; }; } fi @@ -4998,13 +5132,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $XGETTEXT in [\\/]* | ?:[\\/]*) @@ -5019,7 +5229,7 @@ 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5031,20 +5241,20 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MSGMERGE in [\\/]* | ?:[\\/]*) @@ -5059,7 +5269,7 @@ 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5071,20 +5281,20 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6; } + { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MSGFMT in [\\/]* | ?:[\\/]*) @@ -5099,7 +5309,7 @@ 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5111,20 +5321,20 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -5139,7 +5349,7 @@ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5152,34 +5362,34 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} { (exit 1); exit 1; }; } fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) @@ -5194,7 +5404,7 @@ 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5206,33 +5416,40 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6; } + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -echo "$as_me: error: perl not found; required for intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 +$as_echo "$as_me: error: perl not found" >&2;} { (exit 1); exit 1; }; } fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -echo "$as_me: error: perl 5.x required for intltool" >&2;} +{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 +$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} { (exit 1); exit 1; }; } +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { echo "$as_me:$LINENO: checking for XML::Parser" >&5 -echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } else - { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} { (exit 1); exit 1; }; } fi fi @@ -5265,29 +5482,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; } if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5340,32 +5560,36 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_bind_textdomain_codeset=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then DATADIRNAME=share else DATADIRNAME=lib @@ -5378,6 +5602,7 @@ esac fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -5396,42 +5621,37 @@ -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in grep ggrep; do - 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 - # Check for GNU ac_path_GREP and select it if it is found. + 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 +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $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 ac_count=`expr $ac_count + 1` @@ -5446,74 +5666,60 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in egrep; do - 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 - # Check for GNU ac_path_EGREP and select it if it is found. + 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 +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $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 ac_count=`expr $ac_count + 1` @@ -5528,40 +5734,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5588,20 +5785,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -5693,37 +5891,40 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -5745,11 +5946,11 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5767,20 +5968,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -5788,12 +5990,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -5805,20 +6010,21 @@ for ac_header in locale.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5834,32 +6040,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5873,51 +6080,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to http://o-hand.com ## @@ -5926,21 +6134,24 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -5948,10 +6159,10 @@ done if test $ac_cv_header_locale_h = yes; then - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5974,31 +6185,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then am_cv_val_LC_MESSAGES=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 am_cv_val_LC_MESSAGES=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF @@ -6017,17 +6232,17 @@ INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +$as_echo_n "checking libintl.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6043,32 +6258,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +$as_echo_n "checking libintl.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6082,51 +6298,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to http://o-hand.com ## @@ -6135,28 +6352,28 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_libintl_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } fi -if test $ac_cv_header_libintl_h = yes; then +if test "x$ac_cv_header_libintl_h" = x""yes; then gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6181,38 +6398,42 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then gt_cv_func_ngettext_libc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 gt_cv_func_ngettext_libc=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } if test "${gt_cv_func_dgettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6237,43 +6458,47 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then gt_cv_func_dgettext_libc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 gt_cv_func_dgettext_libc=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } fi if test "$gt_cv_func_ngettext_libc" = "yes" ; then for ac_func in bind_textdomain_codeset do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6326,35 +6551,42 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -6369,10 +6601,10 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" @@ -6404,37 +6636,41 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_bindtextdomain=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_bindtextdomain=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -if test $ac_cv_lib_intl_bindtextdomain = yes; then - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" @@ -6466,37 +6702,41 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_ngettext=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } if test "${ac_cv_lib_intl_dgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" @@ -6528,33 +6768,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_dgettext=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_dgettext=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -if test $ac_cv_lib_intl_dgettext = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then gt_cv_func_dgettext_libintl=yes fi @@ -6564,14 +6808,14 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6; } - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } + { $as_echo "$as_me:$LINENO: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" @@ -6603,37 +6847,41 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_ngettext=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" @@ -6665,33 +6913,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_dcgettext=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_dcgettext=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -if test $ac_cv_lib_intl_dcgettext = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -6716,11 +6968,11 @@ for ac_func in bind_textdomain_codeset do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6773,35 +7025,42 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -6837,10 +7096,10 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case "$MSGFMT" in /*) @@ -6864,11 +7123,11 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" @@ -6876,11 +7135,11 @@ for ac_func in dcgettext do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6933,43 +7192,50 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done MSGFMT_OPTS= - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +$as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF msgid "" @@ -6983,25 +7249,25 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -7016,7 +7282,7 @@ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7029,20 +7295,20 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in /*) @@ -7066,11 +7332,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi cat >conftest.$ac_ext <<_ACEOF @@ -7095,30 +7361,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then CATOBJEXT=.gmo DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; } if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7171,32 +7440,36 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_bind_textdomain_codeset=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then CATOBJEXT=.gmo DATADIRNAME=share else @@ -7212,6 +7485,7 @@ esac fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" @@ -7237,8 +7511,8 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -7270,8 +7544,8 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -7295,8 +7569,8 @@ fi done LINGUAS=$NEW_LINGUAS - { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6; } + { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } fi if test -n "$LINGUAS"; then @@ -7334,10 +7608,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -7352,7 +7626,7 @@ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7364,11 +7638,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7377,10 +7651,10 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -7395,7 +7669,7 @@ 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7407,11 +7681,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -7419,12 +7693,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$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 PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -7436,32 +7706,32 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for GTK" >&5 -echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gtk+-2.0" 2>/dev/null` else @@ -7476,10 +7746,10 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "glib-2.0 gtk+-2.0" 2>/dev/null` else @@ -7507,7 +7777,7 @@ # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gtk+-2.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gtk+-2.0) were not met: $GTK_PKG_ERRORS @@ -7518,7 +7788,7 @@ and GTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (glib-2.0 gtk+-2.0) were not met: +$as_echo "$as_me: error: Package requirements (glib-2.0 gtk+-2.0) were not met: $GTK_PKG_ERRORS @@ -7531,7 +7801,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: 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. @@ -7541,7 +7813,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: 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. @@ -7551,28 +7823,28 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for ECAL" >&5 -echo $ECHO_N "checking for ECAL... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ECAL" >&5 +$as_echo_n "checking for ECAL... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$ECAL_CFLAGS"; then pkg_cv_ECAL_CFLAGS="$ECAL_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2\"") >&5 ($PKG_CONFIG --exists --print-errors "libecal-1.2") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ECAL_CFLAGS=`$PKG_CONFIG --cflags "libecal-1.2" 2>/dev/null` else @@ -7587,10 +7859,10 @@ pkg_cv_ECAL_LIBS="$ECAL_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2\"") >&5 ($PKG_CONFIG --exists --print-errors "libecal-1.2") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ECAL_LIBS=`$PKG_CONFIG --libs "libecal-1.2" 2>/dev/null` else @@ -7618,7 +7890,7 @@ # Put the nasty error message in config.log where it belongs echo "$ECAL_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libecal-1.2) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libecal-1.2) were not met: $ECAL_PKG_ERRORS @@ -7629,7 +7901,7 @@ and ECAL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libecal-1.2) were not met: +$as_echo "$as_me: error: Package requirements (libecal-1.2) were not met: $ECAL_PKG_ERRORS @@ -7642,7 +7914,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: 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. @@ -7652,7 +7926,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: 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. @@ -7662,102 +7936,20 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else ECAL_CFLAGS=$pkg_cv_ECAL_CFLAGS - ECAL_LIBS=$pkg_cv_ECAL_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - - -cat >>confdefs.h <<\_ACEOF -#define HANDLE_LIBICAL_MEMORY 1 -_ACEOF - - -# Check for libsexy 0.1.12. Older versions don't support icon-names in the -# entries, so don't work. - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for SEXY" >&5 -echo $ECHO_N "checking for SEXY... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$SEXY_CFLAGS"; then - pkg_cv_SEXY_CFLAGS="$SEXY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsexy >= 0.1.12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libsexy >= 0.1.12") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SEXY_CFLAGS=`$PKG_CONFIG --cflags "libsexy >= 0.1.12" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$SEXY_LIBS"; then - pkg_cv_SEXY_LIBS="$SEXY_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsexy >= 0.1.12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libsexy >= 0.1.12") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SEXY_LIBS=`$PKG_CONFIG --libs "libsexy >= 0.1.12" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SEXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsexy >= 0.1.12"` - else - SEXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsexy >= 0.1.12"` - fi - # Put the nasty error message in config.log where it belongs - echo "$SEXY_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - sexy=no -elif test $pkg_failed = untried; then - sexy=no -else - SEXY_CFLAGS=$pkg_cv_SEXY_CFLAGS - SEXY_LIBS=$pkg_cv_SEXY_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - sexy=yes + ECAL_LIBS=$pkg_cv_ECAL_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : fi -if test $sexy = yes; then + cat >>confdefs.h <<\_ACEOF -#define HAVE_SEXY 1 +#define HANDLE_LIBICAL_MEMORY 1 _ACEOF -fi - # Check whether --enable-gtk was given. if test "${enable_gtk+set}" = set; then @@ -7782,18 +7974,18 @@ if test "x$enableval" = "xyes" ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for OMOKO" >&5 -echo $ECHO_N "checking for OMOKO... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for OMOKO" >&5 +$as_echo_n "checking for OMOKO... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$OMOKO_CFLAGS"; then pkg_cv_OMOKO_CFLAGS="$OMOKO_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmokoui2\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmokoui2\"") >&5 ($PKG_CONFIG --exists --print-errors "libmokoui2") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_OMOKO_CFLAGS=`$PKG_CONFIG --cflags "libmokoui2" 2>/dev/null` else @@ -7808,10 +8000,10 @@ pkg_cv_OMOKO_LIBS="$OMOKO_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmokoui2\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmokoui2\"") >&5 ($PKG_CONFIG --exists --print-errors "libmokoui2") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_OMOKO_LIBS=`$PKG_CONFIG --libs "libmokoui2" 2>/dev/null` else @@ -7839,16 +8031,16 @@ # Put the nasty error message in config.log where it belongs echo "$OMOKO_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } omoko=false elif test $pkg_failed = untried; then omoko=false else OMOKO_CFLAGS=$pkg_cv_OMOKO_CFLAGS OMOKO_LIBS=$pkg_cv_OMOKO_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } omoko=true fi fi @@ -7871,15 +8063,15 @@ if test "x$enableval" = "xyes" ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for HILDON" >&5 -echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for HILDON" >&5 +$as_echo_n "checking for HILDON... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$HILDON_CFLAGS"; then pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1, + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1, dbus-1, libhildonmime \"") >&5 @@ -7888,7 +8080,7 @@ libhildonmime ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1, dbus-1, @@ -7906,7 +8098,7 @@ pkg_cv_HILDON_LIBS="$HILDON_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1, + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1, dbus-1, libhildonmime \"") >&5 @@ -7915,7 +8107,7 @@ libhildonmime ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1, dbus-1, @@ -7952,16 +8144,16 @@ # Put the nasty error message in config.log where it belongs echo "$HILDON_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } hildon=false elif test $pkg_failed = untried; then hildon=false else HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS HILDON_LIBS=$pkg_cv_HILDON_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } hildon=true fi fi @@ -7989,18 +8181,18 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for OWL" >&5 -echo $ECHO_N "checking for OWL... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for OWL" >&5 +$as_echo_n "checking for OWL... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$OWL_CFLAGS"; then pkg_cv_OWL_CFLAGS="$OWL_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libowl\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libowl\"") >&5 ($PKG_CONFIG --exists --print-errors "libowl") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_OWL_CFLAGS=`$PKG_CONFIG --cflags "libowl" 2>/dev/null` else @@ -8015,10 +8207,10 @@ pkg_cv_OWL_LIBS="$OWL_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libowl\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libowl\"") >&5 ($PKG_CONFIG --exists --print-errors "libowl") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_OWL_LIBS=`$PKG_CONFIG --libs "libowl" 2>/dev/null` else @@ -8046,7 +8238,7 @@ # Put the nasty error message in config.log where it belongs echo "$OWL_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libowl) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libowl) were not met: $OWL_PKG_ERRORS @@ -8057,7 +8249,7 @@ and OWL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libowl) were not met: +$as_echo "$as_me: error: Package requirements (libowl) were not met: $OWL_PKG_ERRORS @@ -8070,7 +8262,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: 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. @@ -8080,7 +8274,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: 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. @@ -8090,12 +8284,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else OWL_CFLAGS=$pkg_cv_OWL_CFLAGS OWL_LIBS=$pkg_cv_OWL_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi @@ -8127,18 +8321,18 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for UNIQUE" >&5 -echo $ECHO_N "checking for UNIQUE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5 +$as_echo_n "checking for UNIQUE... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$UNIQUE_CFLAGS"; then pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0" 2>/dev/null` else @@ -8153,10 +8347,10 @@ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0" 2>/dev/null` else @@ -8184,7 +8378,7 @@ # Put the nasty error message in config.log where it belongs echo "$UNIQUE_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (unique-1.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0) were not met: $UNIQUE_PKG_ERRORS @@ -8195,7 +8389,7 @@ and UNIQUE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (unique-1.0) were not met: +$as_echo "$as_me: error: Package requirements (unique-1.0) were not met: $UNIQUE_PKG_ERRORS @@ -8208,7 +8402,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: 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. @@ -8218,7 +8414,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: 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. @@ -8228,12 +8424,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi @@ -8260,10 +8456,10 @@ CFLAGS=$GTK_CFLAGS # This was introduced in GLib 2.10 -{ echo "$as_me:$LINENO: checking whether g_date_set_time_t is declared" >&5 -echo $ECHO_N "checking whether g_date_set_time_t is declared... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether g_date_set_time_t is declared" >&5 +$as_echo_n "checking whether g_date_set_time_t is declared... " >&6; } if test "${ac_cv_have_decl_g_date_set_time_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8290,20 +8486,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_have_decl_g_date_set_time_t=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_have_decl_g_date_set_time_t=no @@ -8311,9 +8508,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_g_date_set_time_t" >&5 -echo "${ECHO_T}$ac_cv_have_decl_g_date_set_time_t" >&6; } -if test $ac_cv_have_decl_g_date_set_time_t = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_g_date_set_time_t" >&5 +$as_echo "$ac_cv_have_decl_g_date_set_time_t" >&6; } +if test "x$ac_cv_have_decl_g_date_set_time_t" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_DECL_G_DATE_SET_TIME_T 1 @@ -8339,10 +8536,10 @@ # This was introduced in GLib 2.14 -{ echo "$as_me:$LINENO: checking whether g_regex_new is declared" >&5 -echo $ECHO_N "checking whether g_regex_new is declared... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether g_regex_new is declared" >&5 +$as_echo_n "checking whether g_regex_new is declared... " >&6; } if test "${ac_cv_have_decl_g_regex_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8369,20 +8566,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_have_decl_g_regex_new=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_have_decl_g_regex_new=no @@ -8390,9 +8588,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_g_regex_new" >&5 -echo "${ECHO_T}$ac_cv_have_decl_g_regex_new" >&6; } -if test $ac_cv_have_decl_g_regex_new = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_g_regex_new" >&5 +$as_echo "$ac_cv_have_decl_g_regex_new" >&6; } +if test "x$ac_cv_have_decl_g_regex_new" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_DECL_G_REGEX_NEW 1 @@ -8418,10 +8616,10 @@ # This was introduced in GTK+ 2.10 -{ echo "$as_me:$LINENO: checking whether GDK_WINDOW_TYPE_HINT_COMBO is declared" >&5 -echo $ECHO_N "checking whether GDK_WINDOW_TYPE_HINT_COMBO is declared... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether GDK_WINDOW_TYPE_HINT_COMBO is declared" >&5 +$as_echo_n "checking whether GDK_WINDOW_TYPE_HINT_COMBO is declared... " >&6; } if test "${ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8448,20 +8646,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO=no @@ -8469,9 +8668,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO" >&5 -echo "${ECHO_T}$ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO" >&6; } -if test $ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO" >&5 +$as_echo "$ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO" >&6; } +if test "x$ac_cv_have_decl_GDK_WINDOW_TYPE_HINT_COMBO" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_DECL_GDK_WINDOW_TYPE_HINT_COMBO 1 @@ -8485,10 +8684,10 @@ fi -{ echo "$as_me:$LINENO: checking whether gtk_style_lookup_color is declared" >&5 -echo $ECHO_N "checking whether gtk_style_lookup_color is declared... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether gtk_style_lookup_color is declared" >&5 +$as_echo_n "checking whether gtk_style_lookup_color is declared... " >&6; } if test "${ac_cv_have_decl_gtk_style_lookup_color+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8515,20 +8714,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_have_decl_gtk_style_lookup_color=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_have_decl_gtk_style_lookup_color=no @@ -8536,9 +8736,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_style_lookup_color" >&5 -echo "${ECHO_T}$ac_cv_have_decl_gtk_style_lookup_color" >&6; } -if test $ac_cv_have_decl_gtk_style_lookup_color = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_style_lookup_color" >&5 +$as_echo "$ac_cv_have_decl_gtk_style_lookup_color" >&6; } +if test "x$ac_cv_have_decl_gtk_style_lookup_color" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_DECL_GTK_STYLE_LOOKUP_COLOR 1 @@ -8555,11 +8755,83 @@ +# This was introduced in GTK+ 2.12 +{ $as_echo "$as_me:$LINENO: checking whether gtk_widget_set_has_tooltip is declared" >&5 +$as_echo_n "checking whether gtk_widget_set_has_tooltip is declared... " >&6; } +if test "${ac_cv_have_decl_gtk_widget_set_has_tooltip+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef gtk_widget_set_has_tooltip + (void) gtk_widget_set_has_tooltip; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_gtk_widget_set_has_tooltip=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_gtk_widget_set_has_tooltip=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_widget_set_has_tooltip" >&5 +$as_echo "$ac_cv_have_decl_gtk_widget_set_has_tooltip" >&6; } +if test "x$ac_cv_have_decl_gtk_widget_set_has_tooltip" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_WIDGET_SET_HAS_TOOLTIP 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_WIDGET_SET_HAS_TOOLTIP 0 +_ACEOF + + +fi + + + # This was introduced in GTK+ 2.14 -{ echo "$as_me:$LINENO: checking whether gtk_show_uri is declared" >&5 -echo $ECHO_N "checking whether gtk_show_uri is declared... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether gtk_show_uri is declared" >&5 +$as_echo_n "checking whether gtk_show_uri is declared... " >&6; } if test "${ac_cv_have_decl_gtk_show_uri+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8586,20 +8858,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_have_decl_gtk_show_uri=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_have_decl_gtk_show_uri=no @@ -8607,9 +8880,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_show_uri" >&5 -echo "${ECHO_T}$ac_cv_have_decl_gtk_show_uri" >&6; } -if test $ac_cv_have_decl_gtk_show_uri = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_show_uri" >&5 +$as_echo "$ac_cv_have_decl_gtk_show_uri" >&6; } +if test "x$ac_cv_have_decl_gtk_show_uri" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_DECL_GTK_SHOW_URI 1 @@ -8626,14 +8899,87 @@ +# This was introduced in GTK+ 2.16 +{ $as_echo "$as_me:$LINENO: checking whether gtk_entry_set_icon_from_icon_name is declared" >&5 +$as_echo_n "checking whether gtk_entry_set_icon_from_icon_name is declared... " >&6; } +if test "${ac_cv_have_decl_gtk_entry_set_icon_from_icon_name+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef gtk_entry_set_icon_from_icon_name + (void) gtk_entry_set_icon_from_icon_name; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_gtk_entry_set_icon_from_icon_name=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_gtk_entry_set_icon_from_icon_name=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_entry_set_icon_from_icon_name" >&5 +$as_echo "$ac_cv_have_decl_gtk_entry_set_icon_from_icon_name" >&6; } +if test "x$ac_cv_have_decl_gtk_entry_set_icon_from_icon_name" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME 0 +_ACEOF + + +fi + + + # This was introduced in newer libecal CFLAGS=$ECAL_CFLAGS -{ echo "$as_me:$LINENO: checking for ECalComponentId" >&5 -echo $ECHO_N "checking for ECalComponentId... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ECalComponentId" >&5 +$as_echo_n "checking for ECalComponentId... " >&6; } if test "${ac_cv_type_ECalComponentId+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_cv_type_ECalComponentId=no +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8641,14 +8987,46 @@ /* end confdefs.h. */ #include -typedef ECalComponentId ac__type_new_; int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) +if (sizeof (ECalComponentId)) + return 0; + ; return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if (sizeof ((ECalComponentId))) + return 0; ; return 0; } @@ -8659,30 +9037,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_ECalComponentId=yes + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_ECalComponentId=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_ECalComponentId=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ECalComponentId" >&5 -echo "${ECHO_T}$ac_cv_type_ECalComponentId" >&6; } -if test $ac_cv_type_ECalComponentId = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ECalComponentId" >&5 +$as_echo "$ac_cv_type_ECalComponentId" >&6; } +if test "x$ac_cv_type_ECalComponentId" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_ECALCOMPONENTID 1 @@ -8723,11 +9110,12 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -8760,12 +9148,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -8781,7 +9169,7 @@ 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$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + 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. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -8793,23 +9181,23 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -8818,61 +9206,62 @@ if test -z "${WITH_GTK_TRUE}" && test -z "${WITH_GTK_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_GTK\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GTK\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_GTK\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_GTK\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_OMOKO_TRUE}" && test -z "${WITH_OMOKO_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_OMOKO\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_OMOKO\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_OMOKO\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_OMOKO\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_HILDON_TRUE}" && test -z "${WITH_HILDON_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_HILDON\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_HILDON\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_HILDON\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_HILDON\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_OWL_TRUE}" && test -z "${WITH_OWL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_OWL\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_OWL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_OWL\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_OWL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_UNIQUE_TRUE}" && test -z "${WITH_UNIQUE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_UNIQUE\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_UNIQUE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_UNIQUE\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_UNIQUE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_GDATE_TIME_T_TRUE}" && test -z "${HAVE_GDATE_TIME_T_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_GDATE_TIME_T\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GDATE_TIME_T\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_GDATE_TIME_T\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_GDATE_TIME_T\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_GREGEX_TRUE}" && test -z "${HAVE_GREGEX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_GREGEX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GREGEX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_GREGEX\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_GREGEX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -8885,7 +9274,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -8895,7 +9284,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -8917,17 +9306,45 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +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 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -8943,8 +9360,6 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -8967,7 +9382,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -8980,17 +9395,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -9012,7 +9420,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -9063,7 +9471,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -9091,7 +9499,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -9104,19 +9511,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -9141,10 +9551,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -9166,8 +9576,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tasks $as_me 0.15, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by tasks $as_me 0.16, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9180,7 +9590,16 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -9188,22 +9607,23 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -9217,13 +9637,13 @@ Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -tasks config.status 0.15 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +tasks config.status 0.16 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -9231,11 +9651,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -9257,30 +9678,36 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 + { $as_echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; };; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 + -*) { $as_echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -9299,27 +9726,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -9328,7 +9757,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -9356,8 +9785,8 @@ "src/hildon/Makefile") CONFIG_FILES="$CONFIG_FILES src/hildon/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -9398,258 +9827,143 @@ (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CPP!$CPP$ac_delim -RANLIB!$RANLIB$ac_delim -WARN_CFLAGS!$WARN_CFLAGS$ac_delim -USE_NLS!$USE_NLS$ac_delim -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim -INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim -INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim -INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim -INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim -INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim -INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim -INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim -INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim -INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim -INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim -INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim -INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim -INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim -INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim -INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim -INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim -XGETTEXT!$XGETTEXT$ac_delim -MSGMERGE!$MSGMERGE$ac_delim -MSGFMT!$MSGFMT$ac_delim -GMSGFMT!$GMSGFMT$ac_delim -INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -ALL_LINGUAS!$ALL_LINGUAS$ac_delim -DATADIRNAME!$DATADIRNAME$ac_delim -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim -CATALOGS!$CATALOGS$ac_delim -CATOBJEXT!$CATOBJEXT$ac_delim -GMOFILES!$GMOFILES$ac_delim -INSTOBJEXT!$INSTOBJEXT$ac_delim -INTLLIBS!$INTLLIBS$ac_delim -PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim -PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim -POFILES!$POFILES$ac_delim -POSUB!$POSUB$ac_delim -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -ECAL_CFLAGS!$ECAL_CFLAGS$ac_delim -ECAL_LIBS!$ECAL_LIBS$ac_delim -SEXY_CFLAGS!$SEXY_CFLAGS$ac_delim -SEXY_LIBS!$SEXY_LIBS$ac_delim -WITH_GTK_TRUE!$WITH_GTK_TRUE$ac_delim -WITH_GTK_FALSE!$WITH_GTK_FALSE$ac_delim -OMOKO_CFLAGS!$OMOKO_CFLAGS$ac_delim -OMOKO_LIBS!$OMOKO_LIBS$ac_delim -WITH_OMOKO_TRUE!$WITH_OMOKO_TRUE$ac_delim -WITH_OMOKO_FALSE!$WITH_OMOKO_FALSE$ac_delim -HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim -HILDON_LIBS!$HILDON_LIBS$ac_delim -WITH_HILDON_TRUE!$WITH_HILDON_TRUE$ac_delim -WITH_HILDON_FALSE!$WITH_HILDON_FALSE$ac_delim -OWL_CFLAGS!$OWL_CFLAGS$ac_delim -OWL_LIBS!$OWL_LIBS$ac_delim -WITH_OWL_TRUE!$WITH_OWL_TRUE$ac_delim -WITH_OWL_FALSE!$WITH_OWL_FALSE$ac_delim -UNIQUE_CFLAGS!$UNIQUE_CFLAGS$ac_delim -UNIQUE_LIBS!$UNIQUE_LIBS$ac_delim -WITH_UNIQUE_TRUE!$WITH_UNIQUE_TRUE$ac_delim -WITH_UNIQUE_FALSE!$WITH_UNIQUE_FALSE$ac_delim -HAVE_GDATE_TIME_T_TRUE!$HAVE_GDATE_TIME_T_TRUE$ac_delim -HAVE_GDATE_TIME_T_FALSE!$HAVE_GDATE_TIME_T_FALSE$ac_delim -HAVE_GREGEX_TRUE!$HAVE_GREGEX_TRUE$ac_delim -HAVE_GREGEX_FALSE!$HAVE_GREGEX_FALSE$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then + 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 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -9666,19 +9980,133 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} + { (exit 1); exit 1; }; } +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -9707,26 +10135,38 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -9736,7 +10176,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -9762,7 +10202,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -9771,7 +10211,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -9792,17 +10232,17 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || 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; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -9847,12 +10287,13 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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= -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -9861,13 +10302,14 @@ /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -9881,15 +10323,16 @@ # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -9900,121 +10343,60 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } 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"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$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;} 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 + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:$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 + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +$as_echo "$as_me: error: could not create -" >&2;} + { (exit 1); exit 1; }; } fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_arg=$ac_file +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in @@ -10029,7 +10411,7 @@ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10049,14 +10431,23 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -10072,7 +10463,7 @@ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10116,7 +10507,7 @@ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10142,7 +10533,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -10151,7 +10542,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10172,8 +10563,8 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || 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; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -10184,9 +10575,9 @@ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then - { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then + { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} { (exit 1); exit 1; }; } fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" @@ -10215,6 +10606,11 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -10236,19 +10632,23 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi if test "x$enable_gtk" = "xyes" ; then - { echo "$as_me:$LINENO: Building GTK frontend" >&5 -echo "$as_me: Building GTK frontend" >&6;} + { $as_echo "$as_me:$LINENO: Building GTK frontend" >&5 +$as_echo "$as_me: Building GTK frontend" >&6;} fi if test "x$omoko" = "xtrue" ; then - { echo "$as_me:$LINENO: Building OpenMoko frontend" >&5 -echo "$as_me: Building OpenMoko frontend" >&6;} + { $as_echo "$as_me:$LINENO: Building OpenMoko frontend" >&5 +$as_echo "$as_me: Building OpenMoko frontend" >&6;} fi if test "x$hildon" = "xtrue" ; then - { echo "$as_me:$LINENO: Building Hildon frontend" >&5 -echo "$as_me: Building Hildon frontend" >&6;} + { $as_echo "$as_me:$LINENO: Building Hildon frontend" >&5 +$as_echo "$as_me: Building Hildon frontend" >&6;} fi diff -Nru /tmp/ycjE72ysa0/tasks-0.15/configure.ac /tmp/VBgdFrDVAo/tasks-0.16/configure.ac --- tasks-0.15/configure.ac 2009-03-30 10:02:37.000000000 +0100 +++ tasks-0.16/configure.ac 2009-07-10 16:50:07.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.52) -AC_INIT(tasks, 0.15, http://o-hand.com) +AC_INIT(tasks, 0.16, http://o-hand.com) AC_CONFIG_SRCDIR(libkoto/koto-task-store.c) AC_CONFIG_HEADERS([libkoto/config.h]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -24,14 +24,6 @@ AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [we free libical memory]) -# Check for libsexy 0.1.12. Older versions don't support icon-names in the -# entries, so don't work. -PKG_CHECK_MODULES(SEXY, libsexy >= 0.1.12, sexy=yes, sexy=no) -if test $sexy = yes; then - AC_DEFINE(HAVE_SEXY, 1, [libsexy present]) -fi - - AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[Build the GTK frontend]), ,enable_gtk=yes) @@ -98,10 +90,18 @@ AC_CHECK_DECLS([GDK_WINDOW_TYPE_HINT_COMBO, gtk_style_lookup_color], [], [], [#include ]) +# This was introduced in GTK+ 2.12 +AC_CHECK_DECLS([gtk_widget_set_has_tooltip], + [], [], [#include ]) + # This was introduced in GTK+ 2.14 AC_CHECK_DECLS([gtk_show_uri], [], [], [#include ]) +# This was introduced in GTK+ 2.16 +AC_CHECK_DECLS([gtk_entry_set_icon_from_icon_name], + [], [], [#include ]) + # This was introduced in newer libecal CFLAGS=$ECAL_CFLAGS AC_CHECK_TYPES(ECalComponentId, [], [], [#include ]) diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/16x16/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/16x16/Makefile.in --- tasks-0.15/data/icons/16x16/Makefile.in 2009-03-30 10:03:07.000000000 +0100 +++ tasks-0.16/data/icons/16x16/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/16x16/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/22x22/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/22x22/Makefile.in --- tasks-0.15/data/icons/22x22/Makefile.in 2009-03-30 10:03:07.000000000 +0100 +++ tasks-0.16/data/icons/22x22/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/22x22/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/24x24/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/24x24/Makefile.in --- tasks-0.15/data/icons/24x24/Makefile.in 2009-03-30 10:03:07.000000000 +0100 +++ tasks-0.16/data/icons/24x24/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/24x24/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/26x26/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/26x26/Makefile.in --- tasks-0.15/data/icons/26x26/Makefile.in 2009-03-30 10:03:07.000000000 +0100 +++ tasks-0.16/data/icons/26x26/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/26x26/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/32x32/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/32x32/Makefile.in --- tasks-0.15/data/icons/32x32/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/data/icons/32x32/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/32x32/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/48x48/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/48x48/Makefile.in --- tasks-0.15/data/icons/48x48/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/data/icons/48x48/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/48x48/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/64x64/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/64x64/Makefile.in --- tasks-0.15/data/icons/64x64/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/data/icons/64x64/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/64x64/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/Makefile.in --- tasks-0.15/data/icons/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/data/icons/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -93,29 +93,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -145,8 +126,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -194,6 +173,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = 16x16 22x22 24x24 26x26 32x32 48x48 64x64 scalable @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -305,7 +285,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/icons/scalable/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/icons/scalable/Makefile.in --- tasks-0.15/data/icons/scalable/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/data/icons/scalable/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,29 +92,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -144,8 +125,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -193,6 +172,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ icondir = $(datadir)/icons/hicolor/scalable/apps @@ -204,8 +184,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/data/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/data/Makefile.in --- tasks-0.15/data/Makefile.in 2009-03-30 10:03:07.000000000 +0100 +++ tasks-0.16/data/Makefile.in 2009-07-10 16:50:38.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -103,29 +103,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -155,8 +136,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -204,6 +183,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = icons @@ -219,8 +199,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -337,7 +317,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/debian/changelog /tmp/VBgdFrDVAo/tasks-0.16/debian/changelog --- tasks-0.15/debian/changelog 2009-08-15 17:49:15.000000000 +0100 +++ tasks-0.16/debian/changelog 2009-08-15 17:49:15.000000000 +0100 @@ -1,12 +1,22 @@ -tasks (0.15-1ubuntu1) karmic; urgency=low +tasks (0.16-1) unstable; urgency=low + [ Ross Burton ] + * New upstream release (Closes: #539510) + * Fix debug package section and depends + * Bump Standards + + [ Loïc Minier ] + * Set LDFLAGS directly; bump cdbs bdep to >= 0.4.41. * Create tasks.pot during build: Add a common-build-arch:: snippet to call langpack.mk's langpack-mk-update-pot target with DEB_BUILDDIR=$(DEB_SRCDIR); intltool-update can't be called in builddir as it needs POTFILES.in and even with it wont lookup files listed there in srcdir; add a clean:: snippet to remove the pot file; LP: #188690. - -- Loïc Minier Thu, 02 Jul 2009 11:35:04 +0200 + [ Emilio Pozuelo Monfort ] + * Wrap build-deps and deps. + + -- Ross Burton Mon, 10 Aug 2009 10:08:52 +0100 tasks (0.15-1) unstable; urgency=low diff -Nru /tmp/ycjE72ysa0/tasks-0.15/debian/control /tmp/VBgdFrDVAo/tasks-0.16/debian/control --- tasks-0.15/debian/control 2009-08-15 17:49:15.000000000 +0100 +++ tasks-0.16/debian/control 2009-08-15 17:49:15.000000000 +0100 @@ -2,14 +2,24 @@ Section: gnome Priority: optional Maintainer: Ross Burton -Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5), intltool, libecal1.2-dev, libgtk2.0-dev, libhildon-1-dev, libdbus-1-dev, libhildonmime-dev, dpkg-dev (>= 1.13.19) -Standards-Version: 3.7.3 +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + intltool, + libecal1.2-dev, + libgtk2.0-dev, + libhildon-1-dev, + libdbus-1-dev, + libhildonmime-dev, + dpkg-dev (>= 1.13.19) +Standards-Version: 3.8.2 # ordering is important here as to have dbg symbols for the main "tasks" # binary and not the tasks-hildon one Package: tasks-hildon Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution-data-server Conflicts: tasks Description: a simple to do manager - Hildon flavour Tasks is a simple To Do manager, using GTK+ and libecal. It eschews @@ -21,7 +31,9 @@ Package: tasks Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution-data-server Conflicts: tasks-hildon Description: a simple to do manager Tasks is a simple To Do manager, using GTK+ and libecal. It eschews @@ -34,7 +46,8 @@ Package: tasks-dbg Architecture: any Priority: extra -Depends: tasks (= ${binary:Version}) +Section: debug +Depends: tasks (= ${binary:Version}), ${misc:Depends} Description: a simple to do manager (debug symbols) Tasks is a simple To Do manager, using GTK+ and libecal. It eschews complicated features for a simple interface and functionality that does the diff -Nru /tmp/ycjE72ysa0/tasks-0.15/debian/rules /tmp/VBgdFrDVAo/tasks-0.16/debian/rules --- tasks-0.15/debian/rules 2009-08-15 17:49:15.000000000 +0100 +++ tasks-0.16/debian/rules 2009-08-15 17:49:15.000000000 +0100 @@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" +LDFLAGS += -Wl,-O1 -Wl,--as-needed # install each build flavor into a different dir INSTALLBASEDIR := $(CURDIR)/debian/tmp diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/config.h.in /tmp/VBgdFrDVAo/tasks-0.16/libkoto/config.h.in --- tasks-0.15/libkoto/config.h.in 2009-03-30 10:03:23.000000000 +0100 +++ tasks-0.16/libkoto/config.h.in 2009-07-10 16:51:18.000000000 +0100 @@ -19,6 +19,10 @@ and to 0 if you don't. */ #undef HAVE_DECL_GDK_WINDOW_TYPE_HINT_COMBO +/* Define to 1 if you have the declaration of + `gtk_entry_set_icon_from_icon_name', and to 0 if you don't. */ +#undef HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME + /* Define to 1 if you have the declaration of `gtk_show_uri', and to 0 if you don't. */ #undef HAVE_DECL_GTK_SHOW_URI @@ -27,6 +31,10 @@ 0 if you don't. */ #undef HAVE_DECL_GTK_STYLE_LOOKUP_COLOR +/* Define to 1 if you have the declaration of `gtk_widget_set_has_tooltip', + and to 0 if you don't. */ +#undef HAVE_DECL_GTK_WIDGET_SET_HAS_TOOLTIP + /* Define to 1 if you have the declaration of `g_date_set_time_t', and to 0 if you don't. */ #undef HAVE_DECL_G_DATE_SET_TIME_T @@ -53,9 +61,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* libsexy present */ -#undef HAVE_SEXY - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/ical-util.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/ical-util.c --- tasks-0.15/libkoto/ical-util.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/ical-util.c 2009-06-08 21:35:19.000000000 +0100 @@ -39,7 +39,6 @@ #include "config.h" #include "ical-util.h" -#include "config.h" #include #include diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-actions.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-actions.c --- tasks-0.15/libkoto/koto-actions.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-actions.c 2009-04-24 08:02:37.000000000 +0100 @@ -57,7 +57,7 @@ g_warning (G_STRLOC ": cannot remove task: %s", error->message); g_error_free (error); } - + g_free (data->uid); data->uid = NULL; } @@ -72,7 +72,7 @@ g_warning ("ECal has been destroyed"); return; } - + g_free (data->uid); data->uid = NULL; @@ -103,7 +103,7 @@ g_warning ("ECal has been destroyed"); return; } - + if (!e_cal_modify_object (data->cal, data->before, CALOBJ_MOD_THIS, &error)) { g_warning (G_STRLOC ": cannot modify task: %s", error->message); g_error_free (error); @@ -120,7 +120,7 @@ g_warning ("ECal has been destroyed"); return; } - + if (!e_cal_modify_object (data->cal, data->after, CALOBJ_MOD_THIS, &error)) { g_warning (G_STRLOC ": cannot modify task: %s", error->message); g_error_free (error); @@ -148,31 +148,31 @@ g_return_val_if_fail (E_IS_CAL (cal), FALSE); g_return_val_if_fail (task, FALSE); - - if (!e_cal_remove_object (cal, icalcomponent_get_uid (task->comp), &error)) { + + if (!e_cal_remove_object (cal, icalcomponent_get_uid (task->comp), &error)) { g_warning ("Cannot remove object: %s", error->message); g_error_free (error); return FALSE; } - + if (undo) { KotoUndoable *u; AddRemoveData *c; - + c = g_slice_new0 (AddRemoveData); c->cal = cal; g_object_add_weak_pointer (G_OBJECT (cal), (gpointer)&c->cal); c->uid = NULL; c->comp = icalcomponent_new_clone (task->comp); - + u = koto_undoable_new (add_remove_task_redo, add_remove_task_undo, add_remove_task_destroy, c); - + koto_undo_context_add (undo, u); } - + return TRUE; } @@ -193,25 +193,25 @@ if (uid) *uid = real_uid; - + if (undo) { AddRemoveData *c; KotoUndoable *u; - + c = g_slice_new0 (AddRemoveData); c->cal = cal; g_object_add_weak_pointer (G_OBJECT (cal), (gpointer)&c->cal); c->uid = g_strdup (real_uid); c->comp = icalcomponent_new_clone (comp); - + u = koto_undoable_new (add_remove_task_undo, add_remove_task_redo, add_remove_task_destroy, c); - + koto_undo_context_add (undo, u); } - + return TRUE; } @@ -237,19 +237,19 @@ if (undo) { ModifyData *c; KotoUndoable *u; - + c = g_slice_new0 (ModifyData); c->cal = cal; g_object_add_weak_pointer (G_OBJECT (cal), (gpointer)&c->cal); c->before = old; old = NULL; /* Set old to NULL so that it isn't freed later */ c->after = icalcomponent_new_clone (task->comp); - + u = koto_undoable_new (modify_task_undo, modify_task_redo, modify_task_destroy, c); - + koto_undo_context_add (undo, u); } @@ -257,6 +257,6 @@ if (old) { icalcomponent_free (old); } - + return TRUE; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-category-group.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-category-group.c --- tasks-0.15/libkoto/koto-category-group.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-category-group.c 2009-04-24 08:02:37.000000000 +0100 @@ -34,7 +34,7 @@ get_name (KotoGroup *group) { g_return_val_if_fail (KOTO_IS_CATEGORY_GROUP (group), NULL); - + return GET_PRIVATE (group)->name; } @@ -55,11 +55,11 @@ g_return_val_if_fail (task, FALSE); priv = GET_PRIVATE (group); - + /* Handle no categories */ if (task->categories == NULL) return FALSE; - + for (l = task->categories; *l ; l++) { /* TODO: strmp? or funky decomposition compare? */ if (strcmp (priv->name, *l) == 0) { @@ -67,7 +67,7 @@ break; } } - + return visible; } @@ -77,7 +77,7 @@ KotoGroupClass *group_class = KOTO_GROUP_CLASS (klass); g_type_class_add_private (klass, sizeof (KotoCategoryGroupPrivate)); - + group_class->get_name = get_name; group_class->get_weight = get_weight; group_class->includes_task = includes_task; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-cell-renderer-pixbuf.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-cell-renderer-pixbuf.c --- tasks-0.15/libkoto/koto-cell-renderer-pixbuf.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-cell-renderer-pixbuf.c 2009-04-24 08:02:37.000000000 +0100 @@ -49,7 +49,7 @@ GtkCellRendererState flags) { gdouble x, y; - + if (event && gdk_event_get_coords (event, &x, &y)) { if (contains (cell_area, (int)x, (int)y)) { g_signal_emit (cell, signals[ACTIVATED], 0, path); diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-cell-renderer-pixbuf.h /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-cell-renderer-pixbuf.h --- tasks-0.15/libkoto/koto-cell-renderer-pixbuf.h 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-cell-renderer-pixbuf.h 2009-04-24 08:02:37.000000000 +0100 @@ -41,7 +41,7 @@ struct _KotoCellRendererPixbufClass { GtkCellRendererPixbufClass parent_class; - + void (* activated) (KotoCellRendererPixbuf *cell, const char *path); }; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-date-combo.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-date-combo.c --- tasks-0.15/libkoto/koto-date-combo.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-date-combo.c 2009-04-24 08:02:37.000000000 +0100 @@ -32,7 +32,7 @@ GtkWidget *calendar; GDate *date; - + guint selected_id; gboolean month_changed; @@ -80,7 +80,7 @@ return FALSE; } } - + return FALSE; } @@ -99,14 +99,14 @@ priv = GET_PRIVATE (combo); g_date_set_time_t (&today, time (NULL)); - + if (priv->marked_day > 1) { gtk_calendar_unmark_day (GTK_CALENDAR (priv->calendar), priv->marked_day); } gtk_calendar_get_date (GTK_CALENDAR (priv->calendar), NULL, &month, NULL); month++; /* Stupid 0-based months */ - + if (month == g_date_get_month (&today)) { priv->marked_day = g_date_get_day (&today); gtk_calendar_mark_day (GTK_CALENDAR (priv->calendar), priv->marked_day); @@ -122,7 +122,7 @@ GdkScreen *screen; int monitor_num; GdkRectangle monitor; - + screen = gtk_widget_get_screen (widget); monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); @@ -135,7 +135,7 @@ if (*y < monitor.y) *y = monitor.y; else if (*y + widget->allocation.height > monitor.y + monitor.height) - *y = monitor.y + monitor.height - widget->allocation.height; + *y = monitor.y + monitor.height - widget->allocation.height; } /* @@ -155,7 +155,7 @@ gtk_widget_show (priv->popup); - clamp_window (GTK_WINDOW (priv->popup), &x, &y); + clamp_window (GTK_WINDOW (priv->popup), &x, &y); gtk_window_move (GTK_WINDOW (priv->popup), x, y); g_signal_handler_block (priv->calendar, priv->selected_id); @@ -206,7 +206,7 @@ g_date_set_time_t (&date, time (NULL)); koto_date_combo_set_date (combo, &date); - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo), FALSE); } @@ -221,7 +221,7 @@ g_date_clear (&date, 1); koto_date_combo_set_date (combo, &date); - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo), FALSE); } @@ -242,7 +242,7 @@ } gtk_calendar_get_date (calendar, &year, &month, &day); - + g_date_set_dmy (priv->date, day, month + 1, year); g_object_notify (G_OBJECT (combo), "date"); @@ -314,7 +314,7 @@ KotoDateComboPrivate *priv = GET_PRIVATE (object); g_date_free (priv->date); - + G_OBJECT_CLASS (koto_date_combo_parent_class)->finalize (object); } @@ -327,7 +327,7 @@ GTK_WIDGET_CLASS (koto_date_combo_parent_class)->map (widget); /* This is used to limit the scope of the grab */ - + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (widget)); if (GTK_WIDGET_TOPLEVEL (toplevel)) { gtk_window_set_transient_for (GTK_WINDOW (priv->popup), @@ -359,7 +359,7 @@ G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - + } static void @@ -386,7 +386,7 @@ gtk_box_pack_start (GTK_BOX (hbox), gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE), FALSE, FALSE, 0); - + gtk_widget_show_all (hbox); gtk_container_add (GTK_CONTAINER (self), hbox); @@ -450,7 +450,7 @@ } else { g_date_clear (priv->date, 1); } - + g_object_notify (G_OBJECT (combo), "date"); update_ui (combo); @@ -461,10 +461,10 @@ koto_date_combo_get_date (KotoDateCombo *combo) { KotoDateComboPrivate *priv; - + g_return_val_if_fail (KOTO_IS_DATE_COMBO (combo), NULL); - + priv = GET_PRIVATE (combo); - + return priv->date; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-date-parser.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-date-parser.c --- tasks-0.15/libkoto/koto-date-parser.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-date-parser.c 2009-06-08 21:35:19.000000000 +0100 @@ -50,17 +50,17 @@ populate_hash (GHashTable *hash, const char **aliases, int count) { int i; - + g_assert (hash); g_assert (aliases); g_assert (count); for (i = 0; i < count; i++) { char **tokens, **s; - + if (aliases[i] == NULL) continue; - + tokens = g_strsplit (_(aliases[i]), "|", 0); for (s = tokens; *s; s++) { g_hash_table_insert (hash, g_utf8_casefold (*s, -1), GINT_TO_POINTER (i)); @@ -85,7 +85,7 @@ N_("saturday|sat"), N_("sunday|sun"), }; - + day_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); populate_hash (day_hash, aliases, G_N_ELEMENTS (aliases)); } @@ -111,7 +111,7 @@ N_("november|nov"), N_("december|dec"), }; - + month_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); populate_hash (month_hash, aliases, G_N_ELEMENTS (aliases)); } @@ -122,7 +122,7 @@ char *folded; GDateWeekday day; g_assert (s); - + folded = g_utf8_casefold (s, -1); #if DEBUG g_printerr ("Converting '%s' to a week day\n", folded); @@ -163,7 +163,7 @@ #if BUILD_TESTS g_date_set_dmy (date, 11, 3, 2008); #else - g_date_set_time_t (date, time (NULL)); + g_date_set_time_t (date, time (NULL)); #endif return date; } @@ -201,19 +201,19 @@ char *s; GDateDay current_day, next_day; int add_days; - + s = g_match_info_fetch_named (info, "day"); next_day = convert_str_weekday (s); g_free (s); if (next_day == G_DATE_BAD_WEEKDAY) return NULL; - + date = today (); current_day = g_date_get_weekday (date); add_days = 7 + next_day - current_day; g_date_add_days (date, add_days); - + return date; } @@ -224,13 +224,13 @@ char *s; GDateDay today_day; GDateWeekday target_day; - + s = g_match_info_fetch_named (info, "day"); target_day = convert_str_weekday (s); g_free (s); if (target_day == G_DATE_BAD_WEEKDAY) return NULL; - + date = today (); today_day = g_date_get_day (date); g_date_subtract_days (date, g_date_get_weekday (date)); @@ -238,7 +238,7 @@ if (g_date_get_day (date) <= today_day) g_date_add_days (date, 7); - + return date; } @@ -261,14 +261,14 @@ return NULL; month = atoi (month_s); g_free (month_s); - + if (!g_date_valid_day (day) || !g_date_valid_month (month)) return NULL; date = today (); g_date_set_day (date, day); g_date_set_month (date, month); - + return date; } @@ -294,7 +294,7 @@ date = today (); g_date_set_day (date, day); - + return date; } @@ -322,7 +322,7 @@ date = today (); g_date_set_day (date, day); g_date_set_month (date, month); - + return date; } @@ -335,11 +335,11 @@ s = g_match_info_fetch_named (info, "digits"); if (!s) return NULL; - + date = g_date_new (); g_date_set_parse (date, s); g_free (s); - + if (g_date_valid (date)) { return date; } else { @@ -354,7 +354,7 @@ GDate *date; char *week_s; int week, this_week; - + week_s = g_match_info_fetch_named (info, "week"); if (!week_s) return NULL; @@ -366,7 +366,7 @@ date = today (); this_week = g_date_get_iso8601_week_of_year (date); - + /* Go to the Monday in week 1 */ g_date_set_day (date, 1); g_date_set_month (date, G_DATE_JANUARY); @@ -385,7 +385,7 @@ GDate *date; char *days_s; int days; - + days_s = g_match_info_fetch_named (info, "days"); if (!days_s) return NULL; @@ -406,7 +406,7 @@ GDate *date; char *weeks_s; int weeks; - + weeks_s = g_match_info_fetch_named (info, "weeks"); if (!weeks_s) return NULL; @@ -430,11 +430,11 @@ g_assert (regex_str); g_assert (func); - + regex = g_regex_new (regex_str, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0, &error); - + if (error) { g_warning ("Cannot parse regex '%s': %s", regex_str, error->message); g_error_free (error); @@ -443,7 +443,7 @@ m = g_slice_new (Matcher); m->regex = regex; - m->func = func; + m->func = func; return m; } @@ -456,7 +456,7 @@ init_days (); init_months (); - + /* Translators: WARNING: scary strings ahead. If you don't understand regular expressions then skip these, otherwise @@ -531,7 +531,7 @@ translated.*/ m = matcher_new (_("^(?.+) in (?\\d+) weeks?$"), match_weeks); if (m) matchers = g_list_prepend (matchers, m); - + return g_list_reverse (matchers); } @@ -544,10 +544,10 @@ #if DEBUG g_printerr ("Testing '%s'\n", s); #endif - + if (matchers == NULL) matchers = init_matchers (); - + for (l = matchers; l != NULL; l = l->next) { Matcher *m = l->data; GMatchInfo *info; @@ -560,12 +560,12 @@ date = m->func (s, info); if (!date) goto next; - + if (!g_date_valid (date)) { g_date_free (date); goto next; } - + if (out_s) { *out_s = g_match_info_fetch_named (info, "task"); #if DEBUG @@ -623,14 +623,14 @@ char *s = NULL; /* - * today() returns 11th March 2008 when running the test case. + * today() returns Tuesday 11th March 2008 when running the test case. */ - + /* Set the locale to C so we can do string comparisons easily */ setlocale (LC_ALL, "C"); /* Sanity checks for non-date strings */ - + TEST_PARSER_FAIL ("foo"); TEST_PARSER_FAIL ("foo and bar"); @@ -644,7 +644,7 @@ g_date_subtract_days (expected, 2); TEST_PARSER ("Foo Yesterday", "Foo"); - + /* On 21st, etc */ g_date_set_dmy (expected, 1, 3, 2008); @@ -661,7 +661,7 @@ TEST_PARSER_FAIL ("foo by 999th"); TEST_PARSER_FAIL ("foo on 32th"); - + /* On 1st June, etc */ g_date_set_dmy (expected, 1, 4, 2008); @@ -680,7 +680,7 @@ TEST_PARSER ("foo by jan 3rd", "foo"); /* This/etc [weekday] */ - + g_date_set_dmy (expected, 12, 3, 2008); TEST_PARSER ("foo this wednesday", "foo"); TEST_PARSER ("foo this wed", "foo"); @@ -713,7 +713,7 @@ TEST_PARSER_FAIL ("foo due fish"); TEST_PARSER_FAIL ("foo by fish"); TEST_PARSER_FAIL ("fish this flob"); - + /* Next [weekday] */ g_date_set_dmy (expected, 17, 3, 2008); @@ -738,7 +738,7 @@ TEST_PARSER ("foo next sunday", "foo"); TEST_PARSER_FAIL ("foo next flobday"); - + /* Digits. Remember we're in in the C locale so the dates are m/d/y */ g_date_set_dmy (expected, 17, 3, 2008); @@ -759,7 +759,7 @@ TEST_PARSER_FAIL ("foo on 4/31/07"); /* Week numbers */ - + g_date_set_dmy (expected, 17, 3, 2008); TEST_PARSER ("foo on w12", "foo"); @@ -810,7 +810,7 @@ TEST_PARSER_FAIL ("foo in 0 weeks"); g_date_free (expected); - + return 0; } #endif /* BUILD_TESTS */ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-entry.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-entry.c --- tasks-0.15/libkoto/koto-entry.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-entry.c 2009-04-24 08:02:37.000000000 +0100 @@ -94,15 +94,15 @@ if (priv->user_edit) { KotoUndoContext *context; InsertState *state; - + context = koto_undo_manager_context_begin (priv->manager, _("Insert")); - + state = g_slice_new0 (InsertState); state->editable = editable; state->text = g_strdup (text); state->length = strlen (text); state->position = *position; - + koto_undo_context_add (context, koto_undoable_new (insert_undo, insert_redo, insert_destroy, state)); @@ -112,7 +112,7 @@ parent_editable_interface->insert_text (editable, text, length, position); } -static void +static void koto_entry_delete_text (GtkEditable *editable, int start_pos, int end_pos) { KotoEntry *entry = KOTO_ENTRY (editable); @@ -121,21 +121,21 @@ if (priv->user_edit) { KotoUndoContext *context; InsertState *state; - + context = koto_undo_manager_context_begin (priv->manager, _("Delete")); - + state = g_slice_new0 (InsertState); state->editable = editable; state->text = gtk_editable_get_chars (editable, start_pos, end_pos); state->length = strlen (state->text); state->position = start_pos; - + koto_undo_context_add (context, koto_undoable_new (insert_redo, insert_undo, insert_destroy, state)); koto_undo_manager_context_end (priv->manager, context); } - + parent_editable_interface->delete_text (editable, start_pos, end_pos); } @@ -143,12 +143,12 @@ koto_entry_dispose (GObject *object) { KotoEntryPrivate *priv = ENTRY_PRIVATE (object); - + if (priv->manager) { g_object_unref (priv->manager); priv->manager = NULL; } - + G_OBJECT_CLASS (koto_entry_parent_class)->dispose (object); } @@ -157,7 +157,7 @@ koto_entry_editable_init (GtkEditableClass *iface) { parent_editable_interface = g_type_interface_peek_parent (iface); - + iface->insert_text = koto_entry_insert_text; iface->delete_text = koto_entry_delete_text; } @@ -176,15 +176,15 @@ on_key_press_event (GtkWidget *widget, GdkEventKey *event) { gboolean control; - + control = event->state & GDK_CONTROL_MASK; - + if (control && event->keyval == 'z') { - KotoEntryPrivate *priv = ENTRY_PRIVATE (widget); + KotoEntryPrivate *priv = ENTRY_PRIVATE (widget); koto_undo_manager_undo (priv->manager); return TRUE; } else if (control && event->keyval == 'Z') { - KotoEntryPrivate *priv = ENTRY_PRIVATE (widget); + KotoEntryPrivate *priv = ENTRY_PRIVATE (widget); koto_undo_manager_redo (priv->manager); return TRUE; } @@ -212,9 +212,9 @@ koto_entry_set_text (KotoEntry *entry, const char *text) { KotoEntryPrivate *priv; - + g_return_if_fail (KOTO_IS_ENTRY (entry)); - + priv = ENTRY_PRIVATE (entry); priv->user_edit = FALSE; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-field-editor-factory.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-field-editor-factory.c --- tasks-0.15/libkoto/koto-field-editor-factory.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-field-editor-factory.c 2009-06-08 22:13:08.000000000 +0100 @@ -22,10 +22,6 @@ #include #include -#ifdef HAVE_SEXY -#include -#endif - #include "ical-util.h" #include "koto-task.h" #include "koto-group.h" @@ -76,7 +72,7 @@ { FieldData *data; const char *text; - + data = g_object_get_data (G_OBJECT (entry), FIELD_DATA); if (!data) { @@ -104,7 +100,7 @@ { GtkWidget *widget; guint id; - + widget = koto_entry_new (); id = g_signal_connect (widget, "changed", G_CALLBACK (on_entry_changed), NULL); g_object_set_data (G_OBJECT (widget), SIGNAL_DATA, GINT_TO_POINTER (id)); @@ -136,9 +132,11 @@ * URL entries. */ -#ifdef HAVE_SEXY static void -url_entry_icon_clicked (SexyIconEntry *entry, gint icon_pos, gint button, gpointer user_data) +url_entry_icon_clicked (GtkEntry *entry, + GtkEntryIconPosition icon_pos, + GdkEvent *event, + gpointer user_data) { const char *text; text = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -148,16 +146,17 @@ } } +#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME static void -on_icon_entry_changed (SexyIconEntry *entry) +on_url_entry_changed (GtkEntry *entry) { const char *text; - + text = gtk_entry_get_text (GTK_ENTRY (entry)); - sexy_icon_entry_set_icon_highlight (entry, - SEXY_ICON_ENTRY_SECONDARY, - text != NULL && text[0] != '\0'); + gtk_entry_set_icon_activatable (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, + text != NULL && text[0] != '\0'); } #endif @@ -167,27 +166,21 @@ GtkWidget *entry; guint id; -#ifdef HAVE_SEXY - GtkWidget *image; - - entry = sexy_icon_entry_new (); - image = gtk_image_new_from_icon_name ("stock_internet", GTK_ICON_SIZE_MENU); - - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (entry), - SEXY_ICON_ENTRY_SECONDARY, GTK_IMAGE (image)); - - g_signal_connect (entry, "icon-released", G_CALLBACK (url_entry_icon_clicked), NULL); -#else entry = koto_entry_new (); -#endif /* This changed callback updates the property */ id = g_signal_connect (entry, "changed", G_CALLBACK (on_entry_changed), NULL); g_object_set_data (G_OBJECT (entry), SIGNAL_DATA, GINT_TO_POINTER (id)); -#ifdef HAVE_SEXY +#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, "stock_internet"); + gtk_entry_set_icon_activatable (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, + FALSE); + g_signal_connect (entry, "icon-release", G_CALLBACK (url_entry_icon_clicked), NULL); /* This callback enables or disables the icon highlighting */ - g_signal_connect (entry, "changed", G_CALLBACK (on_icon_entry_changed), NULL); + g_signal_connect (entry, "changed", G_CALLBACK (on_url_entry_changed), NULL); #endif return entry; @@ -210,11 +203,7 @@ } g_signal_handler_block (widget, id); -#ifdef HAVE_SEXY - gtk_entry_set_text (GTK_ENTRY (widget), text); -#else koto_entry_set_text (KOTO_ENTRY (widget), text); -#endif g_signal_handler_unblock (widget, id); } @@ -275,7 +264,7 @@ if (prop) { priority = icalproperty_get_priority (prop); } - + g_signal_handler_block (widget, id); koto_priority_combo_set_priority (KOTO_PRIORITY_COMBO (widget), priority); g_signal_handler_unblock (widget, id); @@ -314,10 +303,10 @@ gtk_text_buffer_get_start_iter (buffer, &start); gtk_text_buffer_get_end_iter (buffer, &end); text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); - + escaped = g_strescape (text, NULL); g_free (text); - + /* NO means use the default value type. Ugly as sin. */ icalproperty_set_value_from_string (data->prop, escaped, "NO"); g_free (escaped); @@ -333,7 +322,7 @@ GtkWidget *scrolled, *textview; GtkTextBuffer *buffer; guint id; - + scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); @@ -348,7 +337,7 @@ id = g_signal_connect (buffer, "changed", G_CALLBACK (on_text_changed), NULL); g_object_set_data (G_OBJECT (scrolled), SIGNAL_DATA, GINT_TO_POINTER (id)); - + return scrolled; } @@ -424,7 +413,7 @@ /* Magically get the top-level window */ parent = gtk_widget_get_toplevel (widget); parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL; - + dialog = gtk_dialog_new_with_buttons (_("New Category"), GTK_WINDOW (parent), GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -432,17 +421,17 @@ NULL); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - + box = GTK_DIALOG (dialog)->vbox; gtk_box_set_spacing (GTK_BOX (box), 8); - + label = gtk_label_new (_("Enter the name of the new category:")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); - + entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0); - + gtk_widget_show_all (dialog); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { @@ -470,7 +459,7 @@ group = koto_group_combo_get_active_group (combo); type = G_OBJECT_TYPE (group); - + if (g_type_is_a (type, KOTO_TYPE_CATEGORY_GROUP)) { /* Create the property if it didn't exist */ if (data->prop == NULL) { @@ -480,7 +469,7 @@ /* Now set its value */ icalproperty_set_categories (data->prop, koto_group_get_name (group)); } - + else if (g_type_is_a (type, KOTO_TYPE_META_GROUP)) { KotoMetaGroupKind kind; kind = koto_meta_group_get_kind (KOTO_META_GROUP (group)); @@ -497,7 +486,7 @@ GtkTreeIter iter; name = run_new_category_dialog (GTK_WIDGET (combo)); - + if (name) { store = KOTO_GROUP_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo))); koto_group_store_add_new_category (store, &iter, name); @@ -516,7 +505,7 @@ } else { g_warning ("Unhandled group type %s", g_type_name (type)); } - + g_object_unref (group); *data->dirty = TRUE; @@ -594,12 +583,12 @@ id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), SIGNAL_DATA)); g_date_clear (&date, 1); - + if (prop) { due = icalproperty_get_due (prop); g_date_set_dmy (&date, due.day, due.month, due.year); } - + g_signal_handler_block (widget, id); koto_date_combo_set_date (KOTO_DATE_COMBO (widget), &date); g_signal_handler_unblock (widget, id); @@ -638,7 +627,7 @@ data->dirty = dirty; g_object_set_data_full (G_OBJECT (widget), FIELD_DATA, data, g_free); - + return widget; } } @@ -656,7 +645,7 @@ data = g_object_get_data (G_OBJECT (widget), FIELD_DATA); if (!data) return; - + g_return_if_fail (data->field->set_value); data->task = task; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-group-combo.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-group-combo.c --- tasks-0.15/libkoto/koto-group-combo.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-group-combo.c 2009-04-24 08:02:37.000000000 +0100 @@ -41,18 +41,18 @@ { KotoGroup *group = NULL; gboolean ret = FALSE; - + gtk_tree_model_get (model, iter, COL_GROUP, &group, -1); if (!group) return FALSE; - + if (g_type_is_a (G_OBJECT_TYPE (group), KOTO_TYPE_META_GROUP) && koto_meta_group_get_kind (KOTO_META_GROUP (group)) == KOTO_META_GROUP_SEPERATOR) ret = TRUE; - + g_object_unref (group); - + return ret; } @@ -112,7 +112,7 @@ koto_group_combo_init (KotoGroupCombo *self) { GtkCellRenderer *renderer; - + renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (self), renderer, @@ -133,10 +133,10 @@ GtkWidget *combo; combo = g_object_new (KOTO_TYPE_GROUP_COMBO, NULL); - + if (store) g_object_set (combo, "model", store, NULL); - + return combo; } @@ -146,17 +146,17 @@ GtkTreeIter iter; GtkTreeModel *model; KotoGroup *group = NULL; - + g_return_val_if_fail (KOTO_IS_GROUP_COMBO (combo), NULL); - + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) { model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); - + gtk_tree_model_get (model, &iter, COL_GROUP, &group, -1); - + return group; } - + return NULL; } @@ -174,17 +174,17 @@ KotoGroupComboPrivate *priv; g_return_if_fail (KOTO_IS_GROUP_COMBO (combo)); - + priv = GET_PRIVATE (combo); if (priv->changed_id) { g_signal_handler_disconnect (combo, priv->changed_id); g_object_unref (priv->filter); - + priv->changed_id = 0; priv->filter = NULL; } - + if (filter) { priv->changed_id = g_signal_connect (combo, "changed", G_CALLBACK (on_group_changed), NULL); diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-group-filter-model.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-group-filter-model.c --- tasks-0.15/libkoto/koto-group-filter-model.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-group-filter-model.c 2009-04-24 08:02:37.000000000 +0100 @@ -41,12 +41,12 @@ KotoGroupFilterModelPrivate *priv = GET_PRIVATE (data); KotoTask *task = NULL; gboolean visible = FALSE; - + gtk_tree_model_get (model, iter, COLUMN_TASK, &task, -1); - + if (task == NULL) return FALSE; - + if (priv->group) { visible = koto_group_includes_task (priv->group, task); if (!visible) @@ -54,7 +54,7 @@ } done: koto_task_unref (task); - + return visible; } @@ -134,6 +134,6 @@ if (group) { priv->group = g_object_ref (group); } - + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter)); } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-group-store.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-group-store.c --- tasks-0.15/libkoto/koto-group-store.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-group-store.c 2009-04-24 08:02:37.000000000 +0100 @@ -54,7 +54,7 @@ for (;objects; objects = g_list_next (objects)) { icalcomponent *comp = objects->data; char **categories, **l; - + categories = g_strsplit (ical_util_get_categories (comp) ?: "", ",", 0); for (l = categories; *l; l++) { @@ -81,7 +81,7 @@ res = weight_a - weight_b; goto done; } - + res = g_utf8_collate (koto_group_get_name (group_a) ?: "", koto_group_get_name (group_b) ?: ""); @@ -141,7 +141,7 @@ KotoGroupStorePrivate *priv = GET_PRIVATE (object); g_hash_table_destroy (priv->iter_hash); - + G_OBJECT_CLASS (koto_group_store_parent_class)->finalize (object); } @@ -179,7 +179,7 @@ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); - + priv->iter_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)gtk_tree_iter_free); } @@ -211,7 +211,7 @@ g_object_unref (priv->view); priv->view = NULL; } - + if (view) { priv->view = g_object_ref (view); priv->sig_added = g_signal_connect (priv->view, "objects-added", G_CALLBACK (on_objects_added), store); @@ -233,7 +233,7 @@ if (group == NULL || group[0] == '\0') { return gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter); } - + if (g_hash_table_lookup_extended (priv->iter_hash, group, NULL, (gpointer*)(void*)&it)) { *iter = *it; return TRUE; @@ -261,9 +261,9 @@ g_return_if_fail (KOTO_IS_GROUP_STORE (store)); g_return_if_fail (name); - + priv = GET_PRIVATE (store); - + current_it = g_hash_table_lookup (priv->iter_hash, name); if (current_it) { if (iter) *iter = *current_it; @@ -275,7 +275,7 @@ g_hash_table_insert (priv->iter_hash, g_strdup (name), gtk_tree_iter_copy (&new_it)); g_object_unref (group); - + if (iter) *iter = new_it; } } @@ -318,7 +318,7 @@ ret = TRUE; } } - + g_object_unref (group); return ret; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-hint-entry.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-hint-entry.c --- tasks-0.15/libkoto/koto-hint-entry.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-hint-entry.c 2009-04-24 08:02:37.000000000 +0100 @@ -106,7 +106,7 @@ GValue *value, GParamSpec *pspec) { KotoHintEntryPrivate *priv = GET_PRIVATE (object); - + switch (property_id) { case PROP_HINT: g_value_set_string (value, priv->hint); @@ -121,7 +121,7 @@ const GValue *value, GParamSpec *pspec) { KotoHintEntryPrivate *priv = GET_PRIVATE (object); - + switch (property_id) { case PROP_HINT: if (priv->hint) { @@ -161,7 +161,7 @@ widget_class->focus_in_event = focus_in_event; widget_class->focus_out_event = focus_out_event; - + g_object_class_install_property (object_class, PROP_HINT, g_param_spec_string ("hint", "hint", NULL, "", G_PARAM_READWRITE | G_PARAM_CONSTRUCT | @@ -203,7 +203,7 @@ koto_hint_entry_clear (KotoHintEntry *entry) { g_return_if_fail (KOTO_IS_HINT_ENTRY (entry)); - + gtk_entry_set_text (GTK_ENTRY (entry), ""); update (entry); @@ -215,7 +215,7 @@ KotoHintEntryPrivate *priv; g_return_val_if_fail (KOTO_IS_HINT_ENTRY (entry), TRUE); - + priv = GET_PRIVATE (entry); if (priv->state == STATE_HINTING) diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-meta-group.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-meta-group.c --- tasks-0.15/libkoto/koto-meta-group.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-meta-group.c 2009-04-24 08:02:37.000000000 +0100 @@ -36,7 +36,7 @@ KotoMetaGroupPrivate *priv; g_return_val_if_fail (KOTO_IS_META_GROUP (group), NULL); - + priv = GET_PRIVATE (group); switch (priv->kind) { @@ -65,7 +65,7 @@ KotoGroupClass *group_class = KOTO_GROUP_CLASS (klass); g_type_class_add_private (klass, sizeof (KotoMetaGroupPrivate)); - + group_class->get_name = get_name; group_class->get_weight = get_weight; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-no-category-group.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-no-category-group.c --- tasks-0.15/libkoto/koto-no-category-group.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-no-category-group.c 2009-04-24 08:02:37.000000000 +0100 @@ -28,7 +28,7 @@ get_name (KotoGroup *group) { g_return_val_if_fail (KOTO_IS_NO_CATEGORY_GROUP (group), NULL); - + return _("No Category"); } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-priority-combo.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-priority-combo.c --- tasks-0.15/libkoto/koto-priority-combo.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-priority-combo.c 2009-04-24 08:02:37.000000000 +0100 @@ -37,7 +37,7 @@ KotoPriorityComboPrivate *priv = GET_PRIVATE (combo); GtkTreeModel *model; GtkTreeIter iter; - + model = gtk_combo_box_get_model (combo); gtk_combo_box_get_active_iter (combo, &iter); @@ -118,9 +118,9 @@ koto_priority_combo_get_priority (KotoPriorityCombo *combo) { KotoPriorityComboPrivate *priv; - + g_return_val_if_fail (KOTO_IS_PRIORITY_COMBO (combo), PRIORITY_NONE); - + priv = GET_PRIVATE (combo); return priv->priority; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-task.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-task.c --- tasks-0.15/libkoto/koto-task.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-task.c 2009-04-24 08:02:37.000000000 +0100 @@ -39,16 +39,16 @@ const char *s; g_return_val_if_fail (comp, NULL); - + task = g_slice_new0 (KotoTask); task->ref_count = 1; task->comp = comp; - + /* Set the caches */ s = ical_util_get_categories (comp); if (s) task->categories = g_strsplit (s, ",", 0); - + return task; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-task-editor.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-task-editor.c --- tasks-0.15/libkoto/koto-task-editor.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-task-editor.c 2009-04-24 08:02:37.000000000 +0100 @@ -142,7 +142,7 @@ koto_task_editor_dispose (GObject *object) { KotoTaskEditorPrivate *priv = GET_PRIVATE (object); - + if (priv->task) { koto_task_unref (priv->task); priv->task = NULL; @@ -223,11 +223,11 @@ g_return_if_fail (kind); priv = GET_PRIVATE (editor); - + /* TODO: sort fields and use bsearch */ for (i = 0; i < G_N_ELEMENTS (fields); i++) { GtkWidget *label, *widget; - + if (fields[i].type != kind) continue; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-task-editor-dialog.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-task-editor-dialog.c --- tasks-0.15/libkoto/koto-task-editor-dialog.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-task-editor-dialog.c 2009-07-10 16:33:10.000000000 +0100 @@ -58,18 +58,17 @@ KotoTaskEditorDialogPrivate *priv = GET_PRIVATE (dialog); GtkWidget *confirm; KotoUndoContext *undo = NULL; - + if (!priv->task) { return; } - - switch (response) { - case KOTO_TASK_EDITOR_DIALOG_RESPONSE_DELETE: + + if (response == KOTO_TASK_EDITOR_DIALOG_RESPONSE_DELETE) { confirm = gtk_message_dialog_new (GTK_WINDOW (dialog), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - _("Are you sure you want to delete \"%s\"?"), - icalcomponent_get_summary (priv->task->comp)); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, + _("Are you sure you want to delete \"%s\"?"), + icalcomponent_get_summary (priv->task->comp)); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (confirm), _("If you delete an item, it is permanently lost.")); gtk_dialog_add_buttons (GTK_DIALOG (confirm), @@ -77,7 +76,7 @@ GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_ACCEPT); - + if (gtk_dialog_run (GTK_DIALOG (confirm)) == GTK_RESPONSE_ACCEPT) { if (priv->undo_manager) undo = koto_undo_manager_context_begin_formatted (priv->undo_manager, @@ -93,18 +92,18 @@ /* Stop the response signal from getting anywhere. */ g_signal_stop_emission_by_name (dialog, "response"); } - + gtk_widget_destroy (confirm); - default: + } else { if (koto_task_editor_dialog_is_dirty (KOTO_TASK_EDITOR_DIALOG (dialog))) { if (priv->undo_manager) undo = koto_undo_manager_context_begin_formatted (priv->undo_manager, _("Edit Task %s"), icalcomponent_get_summary (priv->task->comp), NULL); - + koto_action_modify_task (priv->cal, priv->task, priv->old_comp, undo); - + if (priv->undo_manager) koto_undo_manager_context_end (priv->undo_manager, undo); } @@ -117,7 +116,7 @@ { KotoTaskEditorDialog *editor = KOTO_TASK_EDITOR_DIALOG (object); KotoTaskEditorDialogPrivate *priv = GET_PRIVATE (editor); - + switch (property_id) { case PROP_TASK: g_value_set_boxed (value, priv->task); @@ -176,12 +175,12 @@ koto_task_editor_dialog_dispose (GObject *object) { KotoTaskEditorDialogPrivate *priv = GET_PRIVATE (object); - + if (priv->cal) { g_object_unref (priv->cal); priv->cal = NULL; } - + if (priv->task) { koto_task_unref (priv->task); priv->task = NULL; @@ -191,7 +190,7 @@ g_object_unref (priv->undo_manager); priv->undo_manager = NULL; } - + if (G_OBJECT_CLASS (koto_task_editor_dialog_parent_class)->dispose) G_OBJECT_CLASS (koto_task_editor_dialog_parent_class)->dispose (object); } @@ -200,9 +199,9 @@ koto_task_editor_dialog_finalize (GObject *object) { KotoTaskEditorDialogPrivate *priv = GET_PRIVATE (object); - + icalcomponent_free (priv->old_comp); - + G_OBJECT_CLASS (koto_task_editor_dialog_parent_class)->finalize (object); } @@ -334,9 +333,9 @@ if (priv->old_comp) icalcomponent_free (priv->old_comp); priv->old_comp = icalcomponent_new_clone (task->comp); - + g_object_set (priv->editor, "task", priv->task, NULL); - + koto_field_editor_set (priv->desc, task); if (icalcomponent_get_description (priv->task->comp)) { gtk_label_set_markup (GTK_LABEL (priv->desc_label), _("_Notes")); @@ -344,7 +343,7 @@ gtk_label_set_text (GTK_LABEL (priv->desc_label), _("_Notes")); } gtk_label_set_use_underline (GTK_LABEL (priv->desc_label), TRUE); - + title = g_strdup_printf (_("%s - Tasks"), icalcomponent_get_summary (task->comp)); gtk_window_set_title (GTK_WINDOW (dialog), title); g_free (title); diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-task-store.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-task-store.c --- tasks-0.15/libkoto/koto-task-store.c 2009-03-27 17:47:51.000000000 +0000 +++ tasks-0.16/libkoto/koto-task-store.c 2009-04-24 08:02:37.000000000 +0100 @@ -78,14 +78,14 @@ res = done_a < done_b ? -1 : 1; goto done; } - + if (weight_a != weight_b) { res = weight_a < weight_b ? -1 : 1; goto done; } - + res = g_utf8_collate (summary_a ?: "", summary_b ?: ""); - + done: g_free (summary_a); g_free (summary_b); @@ -144,7 +144,7 @@ g_assert (KOTO_IS_TASK_STORE (store)); g_assert (ical); g_assert (iter); - + status = icalcomponent_get_status (ical); due_time = icalcomponent_get_due (ical); if (!icaltime_is_null_time (due_time)) { @@ -153,7 +153,7 @@ icaltime_as_timet_with_zone (due_time, icaltimezone_get_utc_timezone ())); } - + task = koto_task_new (icalcomponent_new_clone (ical)); if (insert) { @@ -177,7 +177,7 @@ COLUMN_URL, ical_util_get_url (ical), -1); } - + if (due_date) g_date_free (due_date); koto_task_unref (task); @@ -202,7 +202,7 @@ g_hash_table_insert (priv->uid_hash, g_strdup (icalcomponent_get_uid (ical)), gtk_tree_iter_copy (&iter)); - + } } @@ -314,7 +314,7 @@ KotoTaskStorePrivate *priv = GET_PRIVATE (object); g_hash_table_destroy (priv->uid_hash); - + G_OBJECT_CLASS (koto_task_store_parent_class)->finalize (object); } @@ -402,13 +402,13 @@ if (priv->sig_done) g_signal_handler_disconnect (priv->view, priv->sig_done); priv->sig_added = priv->sig_modified = priv->sig_removed = priv->sig_done = 0; - + g_object_unref (priv->view); g_object_unref (priv->cal); priv->view = NULL; priv->cal = NULL; } - + if (view) { priv->view = g_object_ref (view); priv->cal = g_object_get_data (G_OBJECT (view), "koto-ecal"); @@ -432,13 +432,13 @@ g_return_if_fail (iter); priv = GET_PRIVATE (store); - + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, COLUMN_TASK, &task, -1); - + old_comp = icalcomponent_new_clone (task->comp); - + icalcomponent_set_status (task->comp, done ? ICAL_STATUS_COMPLETED : ICAL_STATUS_NONE); - + gtk_list_store_set (GTK_LIST_STORE (store), iter, COLUMN_DONE, done, -1); koto_action_modify_task (priv->cal, task, old_comp, undo); diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-task-view.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-task-view.c --- tasks-0.15/libkoto/koto-task-view.c 2009-03-20 16:08:33.000000000 +0000 +++ tasks-0.16/libkoto/koto-task-view.c 2009-06-08 21:35:19.000000000 +0100 @@ -34,7 +34,7 @@ KotoTaskStore *store; KotoGroupFilterModel *filter; KotoUndoManager *undo_manager; - + GdkColor colour_done, colour_low, colour_normal, colour_high; } KotoTaskViewPrivate; @@ -73,7 +73,7 @@ } /* At this point we know the iterator is valid on the base model */ gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter, COLUMN_DONE, &done, -1); - + if (priv->undo_manager) undo = koto_undo_manager_context_begin (priv->undo_manager, _("Complete Task")); koto_task_store_set_done (priv->store, &iter, !done, undo); @@ -101,9 +101,9 @@ GdkColor *colour; g_assert (treeview); - + priv = GET_PRIVATE (treeview); - + gtk_tree_model_get (model, iter, COLUMN_WEIGHT, &weight, COLUMN_DONE, &done, @@ -113,9 +113,9 @@ if (due) { char *temp, *date; - + date = ical_util_get_human_due_date (due); - + temp = g_strdup_printf ("%s (%s)", summary, date); g_free (summary); @@ -142,7 +142,7 @@ ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL; } - + g_object_set (cell, /* The text to display */ "text", summary, @@ -153,13 +153,13 @@ /* The colour from the style */ "foreground-gdk", colour, - + /* If important, bolden */ "weight", font_weight, NULL); - + g_free (summary); } @@ -203,16 +203,16 @@ { char *summary = NULL; gboolean found; - + gtk_tree_model_get (model, iter, COLUMN_SUMMARY, &summary, -1); if (!summary) return FALSE; found = e_util_utf8_strstrcasedecomp (summary, key) != NULL; - + g_free (summary); - + /* GtkTreeView is insane */ return ! found; } @@ -226,14 +226,14 @@ GtkTreeModel *model; GtkTreeIter iter; char *url = NULL; - + model = gtk_tree_view_get_model (view); if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) return; gtk_tree_model_get (model, &iter, COLUMN_URL, &url, -1); - + if (url) { koto_platform_open_url (url); g_free (url); @@ -249,20 +249,57 @@ GtkTreeModel *model; GtkTreeIter iter; KotoTask *task = NULL; - + model = gtk_tree_view_get_model (view); if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) return; gtk_tree_model_get (model, &iter, COLUMN_TASK, &task, -1); - + if (task) { koto_platform_edit_task (task); koto_task_unref (task); } } +#if HAVE_DECL_GTK_WIDGET_SET_HAS_TOOLTIP +static gboolean +on_query_tooltip (GtkWidget *widget, + int x, int y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + gpointer user_data) +{ + GtkTreeView *treeview = GTK_TREE_VIEW (widget); + GtkTreeModel *model = NULL; + GtkTreeIter iter; + KotoTask *task = NULL; + const char *desc; + gboolean ret = FALSE; + + if (!gtk_tree_view_get_tooltip_context + (treeview, &x, &y, keyboard_mode, + &model, NULL, &iter)) + return FALSE; + + gtk_tree_model_get (model, &iter, COLUMN_TASK, &task, -1); + if (!task) + return FALSE; + + desc = icalcomponent_get_description (task->comp); + + if (desc) { + gtk_tooltip_set_text (tooltip, desc); + ret = TRUE; + } + + koto_task_unref (task); + + return ret; +} +#endif + /* * Object methods. */ @@ -271,7 +308,7 @@ koto_task_view_style_set (GtkWidget *widget, GtkStyle *previous) { KotoTaskViewPrivate *priv; - + g_assert (KOTO_IS_TASK_VIEW (widget)); priv = GET_PRIVATE (widget); @@ -369,7 +406,7 @@ g_object_unref (priv->undo_manager); priv->undo_manager = NULL; } - + if (G_OBJECT_CLASS (koto_task_view_parent_class)->dispose) G_OBJECT_CLASS (koto_task_view_parent_class)->dispose (object); } @@ -433,7 +470,7 @@ gtk_tree_view_set_enable_search (treeview, TRUE); gtk_tree_view_set_search_column (treeview, COLUMN_SUMMARY); gtk_tree_view_set_search_equal_func (treeview, search_equal_func, NULL, NULL); - + /* Done column */ renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (renderer, "toggled", G_CALLBACK (on_done_toggled), self); @@ -445,10 +482,10 @@ /* Summary column */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Summary"), - renderer, + renderer, NULL); g_object_set (renderer, - "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, summary_func, treeview, NULL); @@ -467,8 +504,13 @@ gtk_tree_view_column_pack_end (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer, note_icon_func, treeview, NULL); - + gtk_tree_view_append_column (treeview, column); + +#if HAVE_DECL_GTK_WIDGET_SET_HAS_TOOLTIP + gtk_widget_set_has_tooltip (GTK_WIDGET (treeview), TRUE); + g_signal_connect (treeview, "query-tooltip", G_CALLBACK (on_query_tooltip), NULL); +#endif } @@ -502,14 +544,14 @@ GtkTreeModel *model; GtkTreeIter iter; KotoTask *task = NULL; - + g_return_val_if_fail (KOTO_IS_TASK_VIEW (view), NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { return NULL; } - + gtk_tree_model_get (model, &iter, COLUMN_TASK, &task, -1); return task; @@ -519,12 +561,12 @@ koto_task_view_get_selected_iter (KotoTaskView *view, GtkTreeIter *iter) { GtkTreeSelection *selection; - + g_return_val_if_fail (KOTO_IS_TASK_VIEW (view), FALSE); g_return_val_if_fail (iter, FALSE); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - + return gtk_tree_selection_get_selected (selection, NULL, iter); } - + diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-undoable.h /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-undoable.h --- tasks-0.15/libkoto/koto-undoable.h 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-undoable.h 2009-04-24 08:02:37.000000000 +0100 @@ -31,8 +31,8 @@ typedef struct _KotoUndoable { /* The functions that will undo/redo the action if they are passed * the data packet that is stored in closure */ - KotoUndoableFunc undo; - KotoUndoableFunc redo; + KotoUndoableFunc undo; + KotoUndoableFunc redo; KotoUndoableFunc destroy; gpointer closure; /* This is enough data for the undo/redo functions diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-undo-action.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-undo-action.c --- tasks-0.15/libkoto/koto-undo-action.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-undo-action.c 2009-04-24 08:02:37.000000000 +0100 @@ -59,12 +59,12 @@ if (koto_undo_manager_can_undo (manager)) { label = g_strdup_printf (_("Undo %s"), koto_undo_manager_get_undo_name (manager)); - + g_object_set (action, "sensitive", TRUE, "label", label, NULL); - + g_free (label); } else { g_object_set (action, @@ -83,12 +83,12 @@ if (koto_undo_manager_can_redo (manager)) { label = g_strdup_printf (_("Redo %s"), koto_undo_manager_get_redo_name (manager)); - + g_object_set (action, "sensitive", TRUE, "label", label, NULL); - + g_free (label); } else { g_object_set (action, @@ -201,7 +201,7 @@ action_class->connect_proxy = koto_undo_action_connect_proxy; action_class->activate = koto_undo_action_activate; - + g_object_class_install_property (gobject_class, PROP_UNDO, g_param_spec_boolean ("undo", "undo", "TRUE for undo, FALSE for redo", TRUE, diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-undo-manager.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-undo-manager.c --- tasks-0.15/libkoto/koto-undo-manager.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-undo-manager.c 2009-04-24 08:02:37.000000000 +0100 @@ -180,7 +180,7 @@ return (manager->priv->redo != NULL); } -/* FIXME: Should these return copies of the names +/* FIXME: Should these return copies of the names so that they're threadsafe? */ const char * koto_undo_manager_get_undo_name (KotoUndoManager *manager) diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-undo-manager.h /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-undo-manager.h --- tasks-0.15/libkoto/koto-undo-manager.h 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-undo-manager.h 2009-04-24 08:02:37.000000000 +0100 @@ -37,7 +37,7 @@ char *name; gboolean current; /* Is this the position we are at in the history */ - KotoUndoContext *ctxt; + KotoUndoContext *ctxt; } KotoUndoHistory; typedef struct _KotoUndoManager KotoUndoManager; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/koto-utils.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/koto-utils.c --- tasks-0.15/libkoto/koto-utils.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/koto-utils.c 2009-04-24 08:02:37.000000000 +0100 @@ -54,7 +54,7 @@ return FALSE; koto_task_unref (task); - + if (!done) (*count)++; @@ -131,16 +131,16 @@ koto_sync_window_title (GtkWindow *window, GtkTreeModel *model, const char *title) { WindowData *data; - + g_return_if_fail (GTK_WINDOW (window)); g_return_if_fail (GTK_TREE_MODEL (model)); g_return_if_fail (title); - + data = g_slice_new (WindowData); data->window = window; data->model = model; data->title = g_strdup (title); - + g_object_weak_ref (G_OBJECT (model), on_weak_notify, data); g_object_connect (model, diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/libkoto/Makefile.in --- tasks-0.15/libkoto/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/libkoto/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -135,29 +135,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -187,8 +168,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -236,6 +215,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \ @@ -285,8 +265,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -416,7 +396,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -459,7 +439,7 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ if test -n "$$list"; then \ @@ -470,7 +450,7 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ + *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ echo "XPASS: $$tst"; \ @@ -482,7 +462,7 @@ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ + *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ echo "XFAIL: $$tst"; \ ;; \ @@ -496,23 +476,36 @@ echo "SKIP: $$tst"; \ fi; \ done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ if test "$$failed" -eq 0; then \ if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ + banner="$$All$$all $$tests passed"; \ else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ fi; \ else \ if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ + banner="$$failed of $$all $$tests failed"; \ else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ fi; \ fi; \ dashes="$$banner"; \ skipped=""; \ if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/test-ical-util.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/test-ical-util.c --- tasks-0.15/libkoto/test-ical-util.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/test-ical-util.c 2009-04-24 08:02:37.000000000 +0100 @@ -15,9 +15,9 @@ /* Set the locale to C so we can do string comparisons easily */ setlocale(LC_ALL, "C"); - + g_date_clear (&date, 1); - + g_date_set_dmy (&date, 1, G_DATE_MAY, 2001); s = ical_util_get_human_due_date (&date); g_assert (strcmp (s, "due 05/01/01") == 0); diff -Nru /tmp/ycjE72ysa0/tasks-0.15/libkoto/test-koto-group-store.c /tmp/VBgdFrDVAo/tasks-0.16/libkoto/test-koto-group-store.c --- tasks-0.15/libkoto/test-koto-group-store.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/libkoto/test-koto-group-store.c 2009-04-24 08:02:37.000000000 +0100 @@ -17,11 +17,11 @@ g_assert (koto_group_store_get_iter_for_group (store, "Foo", &iter)); g_assert (koto_group_store_get_iter_for_group (store, "Bar", &iter)); g_assert (koto_group_store_get_iter_for_group (store, "Flob", &iter) == FALSE); - + g_assert (koto_group_store_match_group (store, "Flob") == NULL); g_assert (strcmp (koto_group_store_match_group (store, "Foo"), "Foo") == 0); g_assert (strcmp (koto_group_store_match_group (store, "foo"), "Foo") == 0); g_assert (strcmp (koto_group_store_match_group (store, "baR"), "Bar") == 0); - + return 0; } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/Makefile.in --- tasks-0.15/Makefile.in 2009-03-30 10:29:15.000000000 +0100 +++ tasks-0.16/Makefile.in 2009-07-10 16:50:40.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -108,29 +108,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -160,8 +141,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -209,6 +188,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = data po libkoto src @@ -334,7 +314,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/NEWS /tmp/VBgdFrDVAo/tasks-0.16/NEWS --- tasks-0.15/NEWS 2009-03-30 10:02:31.000000000 +0100 +++ tasks-0.16/NEWS 2009-07-10 16:50:01.000000000 +0100 @@ -1,3 +1,13 @@ +Tasks 0.16 +=== + +* Don't crash if you edit a task and then delete it +* Lots of translations +* Don't use SexyIconEntry +* Move task ellipsising to the middle +* Show tooltips for tasks with notes + + Tasks 0.15 === diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/ChangeLog /tmp/VBgdFrDVAo/tasks-0.16/po/ChangeLog --- tasks-0.15/po/ChangeLog 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/ChangeLog 2009-06-08 21:35:14.000000000 +0100 @@ -1,3 +1,11 @@ +2009-04-28 Theppitak Karoonboonyanan + + * th.po: Added Thai translation by Sira Nokyoongtong. + +2009-04-20 Daniel Nylander + + * sv.po: Updated Swedish translation. + 2009-02-22 Timo Jyrinki * fi.po: Added Finnish translationk, regexps would need some care. diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/es.po /tmp/VBgdFrDVAo/tasks-0.16/po/es.po --- tasks-0.15/po/es.po 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/es.po 2009-07-10 16:17:47.000000000 +0100 @@ -5,14 +5,15 @@ # # Jorge González , 2008, 2009. # Chihau Chau , 2009. +# Jorge González , 2009. msgid "" msgstr "" "Project-Id-Version: tasks 0.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=tasks&component=general\n" -"POT-Creation-Date: 2009-02-03 03:28+0000\n" -"PO-Revision-Date: 2009-02-05 16:33-0300\n" -"Last-Translator: Chihau Chau \n" +"POT-Creation-Date: 2009-03-28 03:24+0000\n" +"PO-Revision-Date: 2009-06-21 10:42+0200\n" +"Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,34 +23,34 @@ msgid "Personal task manager" msgstr "Gestor personal de tareas" -#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:457 ../src/gtk/main.c:568 +#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620 #: ../src/hildon/hildon-tasks.c:437 msgid "Tasks" msgstr "Tareas" #: ../data/tasks.desktop.in.h:3 msgid "To Do list" -msgstr "Listas de cosas por hacer" +msgstr "Listas de tareas" -#: ../libkoto/ical-util.c:62 +#: ../libkoto/ical-util.c:63 msgid "due today" msgstr "para hoy" -#: ../libkoto/ical-util.c:64 +#: ../libkoto/ical-util.c:65 msgid "due tomorrow" msgstr "para mañana" -#: ../libkoto/ical-util.c:66 +#: ../libkoto/ical-util.c:67 msgid "due yesterday" msgstr "para ayer" -#: ../libkoto/ical-util.c:70 +#: ../libkoto/ical-util.c:71 #, c-format msgid "due %A" msgstr "para el %A" #. Fallback to returning the preferred date representation -#: ../libkoto/ical-util.c:74 +#: ../libkoto/ical-util.c:75 #, c-format msgid "due %x" msgstr "para el %x" @@ -318,7 +319,7 @@ msgid "If you delete an item, it is permanently lost." msgstr "Si tú eliminas un item, se perderá definitivamente." -#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:377 +#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382 #, c-format msgid "Delete Task %s" msgstr "Borrar tarea %s" @@ -345,7 +346,7 @@ msgid "%s - Tasks" msgstr "%s - Tareas" -#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:356 +#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361 msgid "Complete Task" msgstr "Tarea completa" @@ -379,16 +380,16 @@ msgid "Original Sample" msgstr "Muestra original" -#: ../src/gtk/main.c:200 +#: ../src/gtk/main.c:205 #, c-format msgid "Add task %s" msgstr "Añadir tarea %s" -#: ../src/gtk/main.c:419 +#: ../src/gtk/main.c:424 msgid "Remove Completed" msgstr "Quitar completadas" -#: ../src/gtk/main.c:442 ../src/hildon/hildon-tasks.c:422 +#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422 msgid "" "Tasks is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -418,49 +419,54 @@ "Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, " "Fifth Floor, Boston, MA 0110-1301, USA" -#: ../src/gtk/main.c:463 ../src/hildon/hildon-tasks.c:443 +#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443 msgid "translator-credits" -msgstr "Jorge González , 2008" +msgstr "Jorge González , 2009" -#: ../src/gtk/main.c:467 ../src/hildon/hildon-tasks.c:447 +#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447 msgid "The Pimlico Project" msgstr "El Proyecto Pimlico" #. Action name, stock ID, label, accelerator, tooltip, callback -#: ../src/gtk/main.c:474 +#: ../src/gtk/main.c:479 msgid "_Task" msgstr "_Tarea" -#: ../src/gtk/main.c:476 ../src/hildon/hildon-tasks.c:461 +#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461 msgid "_Remove Completed" msgstr "_Borrar terminadas" -#: ../src/gtk/main.c:479 +#: ../src/gtk/main.c:484 msgid "_Edit" msgstr "_Editar" -#: ../src/gtk/main.c:481 +#: ../src/gtk/main.c:486 msgid "_Help" msgstr "_Ayuda" -#: ../src/gtk/main.c:487 +#: ../src/gtk/main.c:492 msgid "Edit..." msgstr "Editar…" #. TODO: turn this action into a toggle action -#: ../src/gtk/main.c:493 ../src/hildon/hildon-tasks.c:459 +#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459 msgid "_Mark Complete" msgstr "_Marcar como terminada" -#: ../src/gtk/main.c:676 ../src/hildon/hildon-tasks.c:558 +#: ../src/gtk/main.c:621 +#| msgid "To Do list" +msgid " - a to do list" +msgstr ".-. una lista de tareas" + +#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558 msgid "_Category:" msgstr "_Categoría:" -#: ../src/gtk/main.c:701 ../src/hildon/hildon-tasks.c:578 +#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578 msgid "New task..." msgstr "Tarea nueva..." -#: ../src/gtk/main.c:725 ../src/hildon/hildon-tasks.c:602 +#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602 #, c-format msgid "Tasks (%d)" msgstr "Tareas (%d)" diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/fr.po /tmp/VBgdFrDVAo/tasks-0.16/po/fr.po --- tasks-0.15/po/fr.po 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/fr.po 2009-04-24 11:08:33.000000000 +0100 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the tasks package. # # Jordi Mallach , 2007. -# Stéphane Raimbault , 2007-2008. +# Stéphane Raimbault , 2007-2009. # msgid "" msgstr "" "Project-Id-Version: tasks HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-03 14:53+0200\n" -"PO-Revision-Date: 2008-05-03 15:18+0200\n" +"POT-Creation-Date: 2009-04-01 12:54+0200\n" +"PO-Revision-Date: 2009-04-01 13:10+0200\n" "Last-Translator: Stéphane Raimbault \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Personal task manager" msgstr "Gestionnaire personnel de tâches" -#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:446 ../src/gtk/main.c:554 +#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620 #: ../src/hildon/hildon-tasks.c:437 msgid "Tasks" msgstr "Tâches" @@ -30,25 +30,25 @@ msgid "To Do list" msgstr "Liste de tâches à accomplir" -#: ../libkoto/ical-util.c:58 +#: ../libkoto/ical-util.c:63 msgid "due today" msgstr "pour aujourd'hui" -#: ../libkoto/ical-util.c:60 +#: ../libkoto/ical-util.c:65 msgid "due tomorrow" msgstr "pour demain" -#: ../libkoto/ical-util.c:62 +#: ../libkoto/ical-util.c:67 msgid "due yesterday" msgstr "pour hier" -#: ../libkoto/ical-util.c:66 +#: ../libkoto/ical-util.c:71 #, c-format msgid "due %A" msgstr "pour %A" #. Fallback to returning the preferred date representation -#: ../libkoto/ical-util.c:70 +#: ../libkoto/ical-util.c:75 #, c-format msgid "due %x" msgstr "pour le %x" @@ -70,141 +70,184 @@ msgstr "Jamais" # J'ai utilisé les traductions de la glibc avant et après la version 2.8 (Stéphane) -#. This means that the indexes match GDateWeekday -#: ../libkoto/koto-date-parser.c:72 +#. Translators: these strings should have every common form for weekdays +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:80 msgid "monday|mon" msgstr "lundi|lun|lun." -#: ../libkoto/koto-date-parser.c:73 +#: ../libkoto/koto-date-parser.c:81 msgid "tuesday|tue" msgstr "mardi|mar|mar." -#: ../libkoto/koto-date-parser.c:74 +#: ../libkoto/koto-date-parser.c:82 msgid "wednesday|wed" msgstr "mercredi|mer|mer." -#: ../libkoto/koto-date-parser.c:75 +#: ../libkoto/koto-date-parser.c:83 msgid "thursday|thu" msgstr "jeudi|jeu|jeu." -#: ../libkoto/koto-date-parser.c:76 +#: ../libkoto/koto-date-parser.c:84 msgid "friday|fri" msgstr "vendredi|ven|ven." -#: ../libkoto/koto-date-parser.c:77 +#: ../libkoto/koto-date-parser.c:85 msgid "saturday|sat" msgstr "samedi|sam|sam." -#: ../libkoto/koto-date-parser.c:78 +#: ../libkoto/koto-date-parser.c:86 msgid "sunday|sun" msgstr "dimanche|dim|dim." -#. This means that the indexes match GDateMonth -#: ../libkoto/koto-date-parser.c:90 +#. Translators: these strings should have every common form for month names +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:101 msgid "january|jan" msgstr "janvier|jan|janv." -#: ../libkoto/koto-date-parser.c:91 +#: ../libkoto/koto-date-parser.c:102 msgid "february|feb" msgstr "février|fév|fév." -#: ../libkoto/koto-date-parser.c:92 +#: ../libkoto/koto-date-parser.c:103 msgid "march|mar" msgstr "mars|mar." -#: ../libkoto/koto-date-parser.c:93 +#: ../libkoto/koto-date-parser.c:104 msgid "april|apr" msgstr "avril|avr|avr." -#: ../libkoto/koto-date-parser.c:94 +#: ../libkoto/koto-date-parser.c:105 msgid "may" msgstr "mai" -#: ../libkoto/koto-date-parser.c:95 +#: ../libkoto/koto-date-parser.c:106 msgid "june|jun" msgstr "juin|jui" -#: ../libkoto/koto-date-parser.c:96 +#: ../libkoto/koto-date-parser.c:107 msgid "july|jul" msgstr "juillet|jul|juil." -#: ../libkoto/koto-date-parser.c:97 +#: ../libkoto/koto-date-parser.c:108 msgid "august|aug" msgstr "août|aoû" -#: ../libkoto/koto-date-parser.c:98 +#: ../libkoto/koto-date-parser.c:109 msgid "september|sept|sep" msgstr "septembre|sep|sept." -#: ../libkoto/koto-date-parser.c:99 +#: ../libkoto/koto-date-parser.c:110 msgid "october|oct" msgstr "octobre|oct|oct." -#: ../libkoto/koto-date-parser.c:100 +#: ../libkoto/koto-date-parser.c:111 msgid "november|nov" msgstr "novembre|nov|nov." -#: ../libkoto/koto-date-parser.c:101 +#: ../libkoto/koto-date-parser.c:112 msgid "december|dec" msgstr "décembre|déc|déc." +#. +#. Translators: WARNING: scary strings ahead. If you don't understand regular +#. expressions then skip these, otherwise +#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some +#. details about how this works. +#. #. Translators: just translate "today" -#: ../libkoto/koto-date-parser.c:383 +#: ../libkoto/koto-date-parser.c:468 msgid "^(?.+) today$" msgstr "^(?.+) aujourd'hui$" #. Translators: just translate "tomorrow" -#: ../libkoto/koto-date-parser.c:387 +#: ../libkoto/koto-date-parser.c:472 msgid "^(?.+) tomorrow$" msgstr "^(?.+) demain$" #. Translators: just translate "yesterday" -#: ../libkoto/koto-date-parser.c:391 +#: ../libkoto/koto-date-parser.c:476 msgid "^(?.+) yesterday$" msgstr "^(?.+) hier$" #. Translators: just translate "next" -#: ../libkoto/koto-date-parser.c:395 +#: ../libkoto/koto-date-parser.c:480 #, c-format msgid "^(?.+) next (?%s)$" msgstr "^(?.+) (?%s) prochain$" -#: ../libkoto/koto-date-parser.c:396 +#: ../libkoto/koto-date-parser.c:481 msgid "" "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|" "sat|sun" -msgstr "lundi|mardi|mercredi|jeudi|vendredi|samedi|dimanche|lun.|mar.|mer.|jeu.|ven.|sam.|dim." +msgstr "" +"lundi|mardi|mercredi|jeudi|vendredi|samedi|dimanche|lun.|mar.|mer.|jeu.|ven.|" +"sam.|dim." -# Exemple, « mardi » (« ce mardi » ne serait pas joli). Stéphane. -#. Translators: just translate "this" -#: ../libkoto/koto-date-parser.c:403 -msgid "^(?.+) this (?\\w+)$" -msgstr "^(?.+) (?\\w+)$" +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language, moving the day block is required. +#: ../libkoto/koto-date-parser.c:489 +msgid "^(?.+) (this|on|by|due) (?\\w+)$" +msgstr "^(?.+) (ce|pour|prévu) (?\\w+)$" #. Translators: replace by|due|on with suitable words, and re-order the day #. and month expressions as suitable -#: ../libkoto/koto-date-parser.c:408 +#: ../libkoto/koto-date-parser.c:494 msgid "^(?.+) (?:by|due|on) (?\\d{1,2})/(?\\d{1,2})$" msgstr "" "^(?.+) (?:pour|prévu|pour le) (?\\d{1,2})/(?\\d{1,2})$" -#: ../libkoto/koto-date-parser.c:411 +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language. +#: ../libkoto/koto-date-parser.c:499 msgid "^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)?$" msgstr "^(?.+) (?:pour|prévu|pour le)? (?\\d{1,2})(?:er|e)?$" -#: ../libkoto/koto-date-parser.c:414 +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:504 msgid "" "^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)? (?\\w+)$" -msgstr "^(?.+) (?:pour|prévu|pour le)? (?\\d{1,2})(?:er|e)? (?\\w+)$" +msgstr "" +"^(?.+) (?:pour|prévu|pour le)? (?\\d{1,2})(?:er|e)? (?\\w+)" +"$" -#: ../libkoto/koto-date-parser.c:417 +# Ce n'est pas français mais il est inutile d'utiliser la même forme que la +# précédente et permet donc aussi de détecter « tâche pour le juin 12 » - Stéphane +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:509 msgid "" "^(?.+) (?:by|due|on)? (?\\w+) (?\\d{1,2})(?:st|nd|rd|th)?$" msgstr "^(?.+) (?:pour|prévu|pour le)? (?\\w+) (?\\d{1,2})(?:er|e)?$" -#: ../libkoto/koto-date-parser.c:420 +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language +#: ../libkoto/koto-date-parser.c:514 msgid "^(?.+) (?:by|due|on)? (?[\\d/-]+)$" -msgstr "^(?.+) (?:pour|prévu|pour le)? (?[\\d/-]+)$" +msgstr "^(?.+) (?:pour|prévu le|pour le)? (?[\\d/-]+)$" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language and replace the w with whatever shortcut indicated "week". In +#. English, w34 means "week 34". +#: ../libkoto/koto-date-parser.c:520 +msgid "^(?.+) (?:by|due|on)? w(?\\d{1,2})$" +msgstr "^(?.+) (?:pour|prévu|pour la|en)? S(?\\d{1,2})$" + +#. Translators: just translate in ... days to contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:526 +msgid "^(?.+) in (?\\d+) days?$" +msgstr "^(?.+) dans (?\\d+) jours?$" + +#. Translators: just translate in ... weeksto contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:532 +msgid "^(?.+) in (?\\d+) weeks?$" +msgstr "^(?.+) dans (?\\d+) semaines?$" #: ../libkoto/koto-entry.c:98 msgid "Insert" @@ -214,11 +257,11 @@ msgid "Delete" msgstr "Supprimer" -#: ../libkoto/koto-field-editor-factory.c:422 +#: ../libkoto/koto-field-editor-factory.c:428 msgid "New Category" msgstr "Nouvelle catégorie" -#: ../libkoto/koto-field-editor-factory.c:433 +#: ../libkoto/koto-field-editor-factory.c:439 msgid "Enter the name of the new category:" msgstr "Saisissez un nom pour la nouvelle catégorie :" @@ -280,7 +323,7 @@ msgid "If you delete an item, it is permanently lost." msgstr "Si vous supprimez un élément, il sera définitivement perdu." -#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:366 +#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382 #, c-format msgid "Delete Task %s" msgstr "Supprimer la tâche %s" @@ -290,24 +333,24 @@ msgid "Edit Task %s" msgstr "Modifier la tâche %s" -#: ../libkoto/koto-task-editor-dialog.c:279 +#: ../libkoto/koto-task-editor-dialog.c:283 msgid "Det_ails" msgstr "Dét_ails" -#: ../libkoto/koto-task-editor-dialog.c:338 +#: ../libkoto/koto-task-editor-dialog.c:342 msgid "_Notes" msgstr "_Notes" -#: ../libkoto/koto-task-editor-dialog.c:340 +#: ../libkoto/koto-task-editor-dialog.c:344 msgid "_Notes" msgstr "_Notes" -#: ../libkoto/koto-task-editor-dialog.c:344 +#: ../libkoto/koto-task-editor-dialog.c:348 #, c-format msgid "%s - Tasks" msgstr "%s - Tâches" -#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:345 +#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361 msgid "Complete Task" msgstr "Terminer la tâche" @@ -341,16 +384,16 @@ msgid "Original Sample" msgstr "Version originale" -#: ../src/gtk/main.c:203 +#: ../src/gtk/main.c:205 #, c-format msgid "Add task %s" msgstr "Ajouter la tâche %s" -#: ../src/gtk/main.c:408 +#: ../src/gtk/main.c:424 msgid "Remove Completed" msgstr "Supprimer les tâches accomplies" -#: ../src/gtk/main.c:431 ../src/hildon/hildon-tasks.c:422 +#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422 msgid "" "Tasks is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -381,52 +424,56 @@ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, États-" "Unis." -#: ../src/gtk/main.c:452 ../src/hildon/hildon-tasks.c:443 +#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443 msgid "translator-credits" msgstr "" "Bruno Bord\n" "Jean-François Fortin Tam\n" "Stéphane Raimbault " -#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:447 +#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447 msgid "The Pimlico Project" msgstr "Le projet Pimlico" #. Action name, stock ID, label, accelerator, tooltip, callback -#: ../src/gtk/main.c:463 +#: ../src/gtk/main.c:479 msgid "_Task" msgstr "_Tâche" -#: ../src/gtk/main.c:465 ../src/hildon/hildon-tasks.c:461 +#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461 msgid "_Remove Completed" msgstr "Supprimer les tâches _accomplies" -#: ../src/gtk/main.c:468 +#: ../src/gtk/main.c:484 msgid "_Edit" msgstr "É_dition" -#: ../src/gtk/main.c:470 +#: ../src/gtk/main.c:486 msgid "_Help" msgstr "Aid_e" -#: ../src/gtk/main.c:476 +#: ../src/gtk/main.c:492 msgid "Edit..." msgstr "Modifier..." #. TODO: turn this action into a toggle action -#: ../src/gtk/main.c:478 ../src/hildon/hildon-tasks.c:459 +#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459 msgid "_Mark Complete" msgstr "_Marquer comme accomplie" -#: ../src/gtk/main.c:661 ../src/hildon/hildon-tasks.c:558 +#: ../src/gtk/main.c:621 +msgid " - a to do list" +msgstr " - une liste de tâches" + +#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558 msgid "_Category:" msgstr "_Catégorie :" -#: ../src/gtk/main.c:686 ../src/hildon/hildon-tasks.c:578 +#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578 msgid "New task..." msgstr "Nouvelle tâche..." -#: ../src/gtk/main.c:710 ../src/hildon/hildon-tasks.c:602 +#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602 #, c-format msgid "Tasks (%d)" msgstr "Tâches (%d)" diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/gl.po /tmp/VBgdFrDVAo/tasks-0.16/po/gl.po --- tasks-0.15/po/gl.po 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/gl.po 2009-06-08 21:35:14.000000000 +0100 @@ -1,24 +1,31 @@ +# translation of tasks-master-po-gl-8889.po to Galician # Galician messages for Tasks. -# Copyright © 2007 Free Software Foundation, Inc. +# Copyright © 2007, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the tasks package. -# Alejandro Riveira Fernández , 2007. # +# Alejandro Riveira Fernández , 2007. +# Francisco Diéguez , 2009. +# Antón Méixome , 2009. msgid "" msgstr "" -"Project-Id-Version: tasks 0.2\n" +"Project-Id-Version: tasks-master-po-gl-8889\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-01 01:03+0100\n" -"PO-Revision-Date: 2007-03-01 17:18+0100\n" -"Last-Translator: alejandro Riveira Fernández \n" +"POT-Creation-Date: 2009-05-26 20:36+0200\n" +"PO-Revision-Date: 2009-05-25 12:27+0200\n" +"Last-Translator: Antón Méixome \n" +"Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/tasks.desktop.in.h:1 msgid "Personal task manager" msgstr "Xestor Persoal de Tarefas" -#: ../data/tasks.desktop.in.h:2 +#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620 +#: ../src/hildon/hildon-tasks.c:437 msgid "Tasks" msgstr "Tarefas" @@ -26,86 +33,475 @@ msgid "To Do list" msgstr "Lista de cousas por facer" -#: ../src/koto-date-combo.c:40 +#: ../libkoto/ical-util.c:63 +msgid "due today" +msgstr "vence hoxe" + +#: ../libkoto/ical-util.c:65 +msgid "due tomorrow" +msgstr "vence mañá" + +#: ../libkoto/ical-util.c:67 +msgid "due yesterday" +msgstr "venceu onte" + +#: ../libkoto/ical-util.c:71 +#, c-format +msgid "due %A" +msgstr "vence %A" + +#. Fallback to returning the preferred date representation +#: ../libkoto/ical-util.c:75 +#, c-format +msgid "due %x" +msgstr "vence %x" + +#: ../libkoto/koto-all-group.c:28 +msgid "All" +msgstr "Todas" + +#: ../libkoto/koto-date-combo.c:62 msgid "no date set" msgstr "sen data establecida" -#: ../src/koto-date-combo.c:328 +#: ../libkoto/koto-date-combo.c:409 msgid "Today" msgstr "Hoxe" -#: ../src/koto-date-combo.c:331 +#: ../libkoto/koto-date-combo.c:412 +msgid "Never" +msgstr "Nunca" + +#. Translators: these strings should have every common form for weekdays +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:80 +msgid "monday|mon" +msgstr "luns|lun" + +#: ../libkoto/koto-date-parser.c:81 +msgid "tuesday|tue" +msgstr "martes|mar" + +#: ../libkoto/koto-date-parser.c:82 +msgid "wednesday|wed" +msgstr "mércores|mer" + +#: ../libkoto/koto-date-parser.c:83 +msgid "thursday|thu" +msgstr "xoves|xov" + +#: ../libkoto/koto-date-parser.c:84 +msgid "friday|fri" +msgstr "venres|ven" + +#: ../libkoto/koto-date-parser.c:85 +msgid "saturday|sat" +msgstr "sábado|sab" + +#: ../libkoto/koto-date-parser.c:86 +msgid "sunday|sun" +msgstr "domingo|dom" + +#. Translators: these strings should have every common form for month names +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:101 +msgid "january|jan" +msgstr "xaneiro|xan" + +#: ../libkoto/koto-date-parser.c:102 +msgid "february|feb" +msgstr "febreiro|feb" + +#: ../libkoto/koto-date-parser.c:103 +msgid "march|mar" +msgstr "marzal|mar" + +#: ../libkoto/koto-date-parser.c:104 +msgid "april|apr" +msgstr "abril|abril" + +#: ../libkoto/koto-date-parser.c:105 +msgid "may" +msgstr "maio" + +#: ../libkoto/koto-date-parser.c:106 +msgid "june|jun" +msgstr "xuño|xuñ" + +#: ../libkoto/koto-date-parser.c:107 +msgid "july|jul" +msgstr "xullo|xul" + +#: ../libkoto/koto-date-parser.c:108 +msgid "august|aug" +msgstr "agosto|ago" + +#: ../libkoto/koto-date-parser.c:109 +msgid "september|sept|sep" +msgstr "setembro|set" + +#: ../libkoto/koto-date-parser.c:110 +msgid "october|oct" +msgstr "outubro|out" + +#: ../libkoto/koto-date-parser.c:111 +msgid "november|nov" +msgstr "novembro|nov" + +#: ../libkoto/koto-date-parser.c:112 +msgid "december|dec" +msgstr "decembro|dec" + +#. +#. Translators: WARNING: scary strings ahead. If you don't understand regular +#. expressions then skip these, otherwise +#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some +#. details about how this works. +#. +#. Translators: just translate "today" +#: ../libkoto/koto-date-parser.c:468 +msgid "^(?.+) today$" +msgstr "^(?.+) hoxe$" + +#. Translators: just translate "tomorrow" +#: ../libkoto/koto-date-parser.c:472 +msgid "^(?.+) tomorrow$" +msgstr "^(?.+) mañá$" + +#. Translators: just translate "yesterday" +#: ../libkoto/koto-date-parser.c:476 +msgid "^(?.+) yesterday$" +msgstr "^(?.+) onte$" + +#. Translators: just translate "next" +#: ../libkoto/koto-date-parser.c:480 +#, c-format +msgid "^(?.+) next (?%s)$" +msgstr "^(?.+) seguinte (?%s)$" + +#: ../libkoto/koto-date-parser.c:481 +msgid "" +"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|" +"sat|sun" +msgstr "" +"luns|martes|mércores|xoves|venres|sábado|domingo|lun|mar|mer|xov|ven|sab|dom" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language, moving the day block is required. +#: ../libkoto/koto-date-parser.c:489 +msgid "^(?.+) (this|on|by|due) (?\\w+)$" +msgstr "^(?.+) (este|en|por|vence) (?\\w+)$" + +#. Translators: replace by|due|on with suitable words, and re-order the day +#. and month expressions as suitable +#: ../libkoto/koto-date-parser.c:494 +msgid "^(?.+) (?:by|due|on) (?\\d{1,2})/(?\\d{1,2})$" +msgstr "^(?.+) (?:por|vence|en) (?\\d{1,2})/(?\\d{1,2})$" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language. +#: ../libkoto/koto-date-parser.c:499 +msgid "^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)?$" +msgstr "^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)?$" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:504 +msgid "" +"^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)? (?\\w+)$" +msgstr "" +"^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)? (?\\w+)$" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:509 +msgid "" +"^(?.+) (?:by|due|on)? (?\\w+) (?\\d{1,2})(?:st|nd|rd|th)?$" +msgstr "" +"^(?.+) (?:by|due|on)? (?\\w+) (?\\d{1,2})(?:st|nd|rd|th)?$" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language +#: ../libkoto/koto-date-parser.c:514 +msgid "^(?.+) (?:by|due|on)? (?[\\d/-]+)$" +msgstr "^(?.+) (?:by|due|on)? (?[\\d/-]+)$" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language and replace the w with whatever shortcut indicated "week". In +#. English, w34 means "week 34". +#: ../libkoto/koto-date-parser.c:520 +msgid "^(?.+) (?:by|due|on)? w(?\\d{1,2})$" +msgstr "^(?.+) (?:by|due|on)? w(?\\d{1,2})$" + +#. Translators: just translate in ... days to contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:526 +msgid "^(?.+) in (?\\d+) days?$" +msgstr "^(?.+) en (?\\d+) días?$" + +#. Translators: just translate in ... weeksto contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:532 +msgid "^(?.+) in (?\\d+) weeks?$" +msgstr "^(?.+) en (?\\d+) semanas?$" + +#: ../libkoto/koto-entry.c:98 +msgid "Insert" +msgstr "Inserir" + +#: ../libkoto/koto-entry.c:125 +msgid "Delete" +msgstr "Eliminar" + +#: ../libkoto/koto-field-editor-factory.c:428 +msgid "New Category" +msgstr "Nova categoría" + +#: ../libkoto/koto-field-editor-factory.c:439 +msgid "Enter the name of the new category:" +msgstr "Insira o nome da nova categoría:" + +#: ../libkoto/koto-meta-group.c:46 msgid "None" msgstr "Ningunha" -#: ../src/koto-priority-combo.c:91 +#: ../libkoto/koto-meta-group.c:48 +msgid "New Group..." +msgstr "Novo grupo..." + +#: ../libkoto/koto-no-category-group.c:32 +msgid "No Category" +msgstr "Sen categoría" + +#: ../libkoto/koto-priority-combo.c:71 msgid "Low" msgstr "Baixa" -#: ../src/koto-priority-combo.c:93 +#: ../libkoto/koto-priority-combo.c:73 msgid "Normal" msgstr "Normal" -#: ../src/koto-priority-combo.c:95 +#: ../libkoto/koto-priority-combo.c:75 msgid "High" msgstr "Alta" -#: ../src/koto-task-editor.c:65 +#: ../libkoto/koto-task-editor.c:55 msgid "_Summary:" msgstr "_Resumo:" -#. TODO: replace with combo -#: ../src/koto-task-editor.c:68 -msgid "_Category:" +#: ../libkoto/koto-task-editor.c:56 +msgid "Ca_tegory:" msgstr "_Categoría:" -#: ../src/koto-task-editor.c:70 +#: ../libkoto/koto-task-editor.c:57 msgid "_Priority:" msgstr "_Prioridade:" -#: ../src/koto-task-editor.c:71 +#: ../libkoto/koto-task-editor.c:58 msgid "D_ue Date:" -msgstr "_Vencemento:" +msgstr "Data de _vencemento:" -#. TODO: add button to open URL -#: ../src/koto-task-editor.c:73 +#: ../libkoto/koto-task-editor.c:59 msgid "_Web Address:" -msgstr "Dirección _Web:" +msgstr "Enderezo _Web:" -#: ../src/koto-task-editor.c:74 -msgid "_Description:" -msgstr "_Descripción:" +#: ../libkoto/koto-task-editor.c:60 +msgid "D_escription:" +msgstr "_Descrición:" -#: ../src/koto-task-view.c:71 -msgid "today" -msgstr "hoxe" +#: ../libkoto/koto-task-editor-dialog.c:71 ../src/hildon/hildon-tasks.c:326 +#: ../src/omoko/openmoko-tasks.c:217 +#, c-format +msgid "Are you sure you want to delete \"%s\"?" +msgstr "Esta seguro que quere eliminar \"%s\"?" -#: ../src/koto-task-view.c:73 -msgid "tomorrow" -msgstr "mañá" +#: ../libkoto/koto-task-editor-dialog.c:74 ../src/hildon/hildon-tasks.c:329 +msgid "If you delete an item, it is permanently lost." +msgstr "Se elimina o elemento, perderase permanentemente." -#: ../src/koto-task-view.c:75 -msgid "yesterday" -msgstr "onte" +#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382 +#, c-format +msgid "Delete Task %s" +msgstr "Eliminar tarefa %s" -#: ../src/koto-task-view.c:113 +#: ../libkoto/koto-task-editor-dialog.c:102 #, c-format -msgid "%s (due %s)" -msgstr "%s (para %s)" +msgid "Edit Task %s" +msgstr "Editar tarefa %s" -#: ../src/koto-task-view.c:266 +#: ../libkoto/koto-task-editor-dialog.c:283 +msgid "Det_ails" +msgstr "Det_alles" + +#: ../libkoto/koto-task-editor-dialog.c:342 +msgid "_Notes" +msgstr "_Notas" + +#: ../libkoto/koto-task-editor-dialog.c:344 +msgid "_Notes" +msgstr "_Notas" + +#: ../libkoto/koto-task-editor-dialog.c:348 +#, c-format +msgid "%s - Tasks" +msgstr "%s - Tarefas" + +#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361 +msgid "Complete Task" +msgstr "Completar tarefa" + +#: ../libkoto/koto-task-view.c:489 msgid "Done" -msgstr "Feito" +msgstr "Feita" -#: ../src/koto-task-view.c:273 +#: ../libkoto/koto-task-view.c:496 msgid "Summary" msgstr "Resumo" -#: ../src/gtk/main.c:175 +#: ../libkoto/koto-undo-action.c:60 +#, c-format +msgid "Undo %s" +msgstr "Desfacer %s" + +#: ../libkoto/koto-undo-action.c:72 +msgid "Undo" +msgstr "Desfacer" + +#: ../libkoto/koto-undo-action.c:84 +#, c-format +msgid "Redo %s" +msgstr "Refacer %s" + +#: ../libkoto/koto-undo-action.c:96 +msgid "Redo" +msgstr "Refacer" + +#: ../libkoto/koto-undo-manager.c:355 +msgid "Original Sample" +msgstr "Exemplo orixinal" + +#: ../src/gtk/main.c:205 +#, c-format +msgid "Add task %s" +msgstr "Engadir tarefa %s" + +#: ../src/gtk/main.c:424 +msgid "Remove Completed" +msgstr "Eliminar completadas" + +#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422 +msgid "" +"Tasks is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version.\n" +"\n" +"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, " +"Fifth Floor, Boston, MA 0110-1301, USA" +msgstr "" +"Tasks é software libre, pode redistribuílo e/ou modificalo baixo os termos " +"da Licenza pública xeral tal como a publicou a Free Software Foundation; " +"tanto a 2 da Licenza, ou (ao seu criterio) calquera outra versión.\n" +"\n" +"Tasks distribúese na esperanza de que sexa útil pero SEN NINGÚN TIPO DE " +"GARANTÍA, nin sequera a garantía implícita DE COMECIABILIDADE OU ADECUACIÓ " +"PARA CALQUERA PROPÓSITO PARTICULAR. Vexa a Licenza pública xeral para máis " +"detalles.\n" +"\n" +"Debería ter recibido unha copia do Licenza pública xeral xunto con Tasks; de " +"non ser así, escriba á Free Software Foundation, Inc., 51 Franklin St, Fifth " +"Floor, Boston, MA 0110-1301, USA" + +#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443 +msgid "translator-credits" +msgstr "" +"Fran Dieguez , 2009; Mancomún , 2009" + +#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447 +msgid "The Pimlico Project" +msgstr "Proxecto Pimlico" + +#. Action name, stock ID, label, accelerator, tooltip, callback +#: ../src/gtk/main.c:479 +msgid "_Task" +msgstr "_Tarefa" + +#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461 +msgid "_Remove Completed" +msgstr "Eliminar completamente" + +#: ../src/gtk/main.c:484 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/gtk/main.c:486 +msgid "_Help" +msgstr "_Axuda" + +#: ../src/gtk/main.c:492 +msgid "Edit..." +msgstr "Editar..." + +#. TODO: turn this action into a toggle action +#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459 +msgid "_Mark Complete" +msgstr "_Marcar completadas" + +#: ../src/gtk/main.c:621 +msgid " - a to do list" +msgstr " - unha lista de tarefas" + +#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558 +msgid "_Category:" +msgstr "_Categoría:" + +#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578 msgid "New task..." msgstr "Nova tarefa..." -#. FIXME: Use GTK stock label -#: ../src/gtk/main.c:180 -msgid "_Add" -msgstr "_Engadir" +#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602 +#, c-format +msgid "Tasks (%d)" +msgstr "Tarefas (%d)" + +#: ../src/hildon/hildon-tasks.c:388 +msgid "Are you sure you want to delete all completed tasks?" +msgstr "Esta seguro que quere eliminar toda as tarefas completadas?" + +#: ../src/hildon/hildon-tasks.c:390 +msgid "Deleting completed tasks means they are permanently lost." +msgstr "Ao eliminar as tarefas completadas perderanse completamente." + +#. Action name, stock ID, label, accelerator, tooltip, callback +#. dummy +#: ../src/hildon/hildon-tasks.c:456 +msgid "New Task" +msgstr "Nova tarefa" + +#: ../src/hildon/hildon-tasks.c:457 +msgid "Edit Task..." +msgstr "Edita a tarefa..." + +#: ../src/hildon/hildon-tasks.c:460 +msgid "Delete Task" +msgstr "Eliminar tarefa" + +#: ../src/hildon/hildon-tasks.c:462 +msgid "Quit" +msgstr "Saír" + +#: ../src/hildon/hildon-tasks.c:463 +msgid "About" +msgstr "Sobre" + +#: ../src/omoko/openmoko-tasks.c:186 +msgid "New task" +msgstr "Nova tarefa" diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/LINGUAS /tmp/VBgdFrDVAo/tasks-0.16/po/LINGUAS --- tasks-0.15/po/LINGUAS 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/LINGUAS 2009-06-08 21:35:14.000000000 +0100 @@ -23,6 +23,7 @@ ru sk sv +th tr vi zh_CN diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/Makefile.in.in /tmp/VBgdFrDVAo/tasks-0.16/po/Makefile.in.in --- tasks-0.15/po/Makefile.in.in 2009-03-30 10:03:01.000000000 +0100 +++ tasks-0.16/po/Makefile.in.in 2009-07-10 16:50:33.000000000 +0100 @@ -21,7 +21,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/sv.po /tmp/VBgdFrDVAo/tasks-0.16/po/sv.po --- tasks-0.15/po/sv.po 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/po/sv.po 2009-04-24 11:08:33.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: tasks\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 11:25+0100\n" -"PO-Revision-Date: 2009-02-01 11:29+0100\n" +"POT-Creation-Date: 2009-04-20 16:54+0200\n" +"PO-Revision-Date: 2009-04-20 16:54+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "Personlig aktivitetshanterare" #: ../data/tasks.desktop.in.h:2 -#: ../src/gtk/main.c:457 -#: ../src/gtk/main.c:568 +#: ../src/gtk/main.c:462 +#: ../src/gtk/main.c:620 #: ../src/hildon/hildon-tasks.c:437 msgid "Tasks" msgstr "Aktiviteter" @@ -31,25 +31,25 @@ msgid "To Do list" msgstr "Att göra-lista" -#: ../libkoto/ical-util.c:62 +#: ../libkoto/ical-util.c:63 msgid "due today" msgstr "färdig idag" -#: ../libkoto/ical-util.c:64 +#: ../libkoto/ical-util.c:65 msgid "due tomorrow" msgstr "färdig imorgon" -#: ../libkoto/ical-util.c:66 +#: ../libkoto/ical-util.c:67 msgid "due yesterday" msgstr "färdig igår" -#: ../libkoto/ical-util.c:70 +#: ../libkoto/ical-util.c:71 #, c-format msgid "due %A" msgstr "färdig %A" #. Fallback to returning the preferred date representation -#: ../libkoto/ical-util.c:74 +#: ../libkoto/ical-util.c:75 #, c-format msgid "due %x" msgstr "färdig %x" @@ -315,7 +315,7 @@ msgstr "Om du tar bort ett objekt så försvinner det för alltid." #: ../libkoto/koto-task-editor-dialog.c:84 -#: ../src/gtk/main.c:377 +#: ../src/gtk/main.c:382 #, c-format msgid "Delete Task %s" msgstr "Ta bort aktiviteten %s" @@ -343,7 +343,7 @@ msgstr "%s - Aktiviteter" #: ../libkoto/koto-task-view.c:78 -#: ../src/gtk/main.c:356 +#: ../src/gtk/main.c:361 msgid "Complete Task" msgstr "Färdig aktivitet" @@ -377,16 +377,16 @@ msgid "Original Sample" msgstr "Ursprungligt exempel" -#: ../src/gtk/main.c:200 +#: ../src/gtk/main.c:205 #, c-format msgid "Add task %s" msgstr "Lägg till aktiviteten %s" -#: ../src/gtk/main.c:419 +#: ../src/gtk/main.c:424 msgid "Remove Completed" msgstr "Ta bort färdiga" -#: ../src/gtk/main.c:442 +#: ../src/gtk/main.c:447 #: ../src/hildon/hildon-tasks.c:422 msgid "" "Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n" @@ -401,7 +401,7 @@ "\n" "Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA" -#: ../src/gtk/main.c:463 +#: ../src/gtk/main.c:468 #: ../src/hildon/hildon-tasks.c:443 msgid "translator-credits" msgstr "" @@ -411,50 +411,54 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../src/gtk/main.c:467 +#: ../src/gtk/main.c:472 #: ../src/hildon/hildon-tasks.c:447 msgid "The Pimlico Project" msgstr "Pimlico-projektet" #. Action name, stock ID, label, accelerator, tooltip, callback -#: ../src/gtk/main.c:474 +#: ../src/gtk/main.c:479 msgid "_Task" msgstr "A_ktivitet" -#: ../src/gtk/main.c:476 +#: ../src/gtk/main.c:481 #: ../src/hildon/hildon-tasks.c:461 msgid "_Remove Completed" msgstr "_Ta bort färdiga" -#: ../src/gtk/main.c:479 +#: ../src/gtk/main.c:484 msgid "_Edit" msgstr "R_edigera" -#: ../src/gtk/main.c:481 +#: ../src/gtk/main.c:486 msgid "_Help" msgstr "_Hjälp" -#: ../src/gtk/main.c:487 +#: ../src/gtk/main.c:492 msgid "Edit..." msgstr "Redigera..." #. TODO: turn this action into a toggle action -#: ../src/gtk/main.c:493 +#: ../src/gtk/main.c:498 #: ../src/hildon/hildon-tasks.c:459 msgid "_Mark Complete" msgstr "_Markera som färdig" -#: ../src/gtk/main.c:676 +#: ../src/gtk/main.c:621 +msgid " - a to do list" +msgstr " - en att göra-lista" + +#: ../src/gtk/main.c:739 #: ../src/hildon/hildon-tasks.c:558 msgid "_Category:" msgstr "_Kategori:" -#: ../src/gtk/main.c:701 +#: ../src/gtk/main.c:764 #: ../src/hildon/hildon-tasks.c:578 msgid "New task..." msgstr "Ny aktivitet..." -#: ../src/gtk/main.c:725 +#: ../src/gtk/main.c:788 #: ../src/hildon/hildon-tasks.c:602 #, c-format msgid "Tasks (%d)" diff -Nru /tmp/ycjE72ysa0/tasks-0.15/po/th.po /tmp/VBgdFrDVAo/tasks-0.16/po/th.po --- tasks-0.15/po/th.po 1970-01-01 01:00:00.000000000 +0100 +++ tasks-0.16/po/th.po 2009-06-08 21:35:14.000000000 +0100 @@ -0,0 +1,487 @@ +# Thai translation of tasks +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the tasks package. +# Sira Nokyoongtong , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: tasks\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=tasks&component=general\n" +"POT-Creation-Date: 2009-04-24 07:02+0000\n" +"PO-Revision-Date: 2009-04-28 11:27+0700\n" +"Last-Translator: Sira Nokyoongtong \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/tasks.desktop.in.h:1 +msgid "Personal task manager" +msgstr "โปรแกรมจัดการภารกิจส่วนตัว" + +#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620 +#: ../src/hildon/hildon-tasks.c:437 +msgid "Tasks" +msgstr "ภารกิจ" + +#: ../data/tasks.desktop.in.h:3 +msgid "To Do list" +msgstr "งานที่จะทำ" + +#: ../libkoto/ical-util.c:63 +msgid "due today" +msgstr "กำหนดเสร็จวันนี้" + +#: ../libkoto/ical-util.c:65 +msgid "due tomorrow" +msgstr "กำหนดเสร็จพรุ่งนี้" + +#: ../libkoto/ical-util.c:67 +msgid "due yesterday" +msgstr "กำหนดเสร็จเมื่อวาน" + +#: ../libkoto/ical-util.c:71 +#, c-format +msgid "due %A" +msgstr "กำหนดเสร็จ %A" + +#. Fallback to returning the preferred date representation +#: ../libkoto/ical-util.c:75 +#, c-format +msgid "due %x" +msgstr "กำหนดเสร็จ %x" + +#: ../libkoto/koto-all-group.c:28 +msgid "All" +msgstr "ทั้งหมด" + +#: ../libkoto/koto-date-combo.c:62 +msgid "no date set" +msgstr "ไม่ได้กำหนดวัน" + +#: ../libkoto/koto-date-combo.c:409 +msgid "Today" +msgstr "วันนี้" + +#: ../libkoto/koto-date-combo.c:412 +msgid "Never" +msgstr "" + +#. Translators: these strings should have every common form for weekdays +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:80 +msgid "monday|mon" +msgstr "" + +#: ../libkoto/koto-date-parser.c:81 +msgid "tuesday|tue" +msgstr "" + +#: ../libkoto/koto-date-parser.c:82 +msgid "wednesday|wed" +msgstr "" + +#: ../libkoto/koto-date-parser.c:83 +msgid "thursday|thu" +msgstr "" + +#: ../libkoto/koto-date-parser.c:84 +msgid "friday|fri" +msgstr "" + +#: ../libkoto/koto-date-parser.c:85 +msgid "saturday|sat" +msgstr "" + +#: ../libkoto/koto-date-parser.c:86 +msgid "sunday|sun" +msgstr "" + +#. Translators: these strings should have every common form for month names +#. including abbreviations, separated by | +#: ../libkoto/koto-date-parser.c:101 +msgid "january|jan" +msgstr "" + +#: ../libkoto/koto-date-parser.c:102 +msgid "february|feb" +msgstr "" + +#: ../libkoto/koto-date-parser.c:103 +msgid "march|mar" +msgstr "" + +#: ../libkoto/koto-date-parser.c:104 +msgid "april|apr" +msgstr "" + +#: ../libkoto/koto-date-parser.c:105 +msgid "may" +msgstr "" + +#: ../libkoto/koto-date-parser.c:106 +msgid "june|jun" +msgstr "" + +#: ../libkoto/koto-date-parser.c:107 +msgid "july|jul" +msgstr "" + +#: ../libkoto/koto-date-parser.c:108 +msgid "august|aug" +msgstr "" + +#: ../libkoto/koto-date-parser.c:109 +msgid "september|sept|sep" +msgstr "" + +#: ../libkoto/koto-date-parser.c:110 +msgid "october|oct" +msgstr "" + +#: ../libkoto/koto-date-parser.c:111 +msgid "november|nov" +msgstr "" + +#: ../libkoto/koto-date-parser.c:112 +msgid "december|dec" +msgstr "" + +#. +#. Translators: WARNING: scary strings ahead. If you don't understand regular +#. expressions then skip these, otherwise +#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some +#. details about how this works. +#. +#. Translators: just translate "today" +#: ../libkoto/koto-date-parser.c:468 +msgid "^(?.+) today$" +msgstr "" + +#. Translators: just translate "tomorrow" +#: ../libkoto/koto-date-parser.c:472 +msgid "^(?.+) tomorrow$" +msgstr "" + +#. Translators: just translate "yesterday" +#: ../libkoto/koto-date-parser.c:476 +msgid "^(?.+) yesterday$" +msgstr "" + +#. Translators: just translate "next" +#: ../libkoto/koto-date-parser.c:480 +#, c-format +msgid "^(?.+) next (?%s)$" +msgstr "" + +#: ../libkoto/koto-date-parser.c:481 +msgid "" +"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|" +"sat|sun" +msgstr "" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language, moving the day block is required. +#: ../libkoto/koto-date-parser.c:489 +msgid "^(?.+) (this|on|by|due) (?\\w+)$" +msgstr "" + +#. Translators: replace by|due|on with suitable words, and re-order the day +#. and month expressions as suitable +#: ../libkoto/koto-date-parser.c:494 +msgid "^(?.+) (?:by|due|on) (?\\d{1,2})/(?\\d{1,2})$" +msgstr "" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language. +#: ../libkoto/koto-date-parser.c:499 +msgid "^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)?$" +msgstr "" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:504 +msgid "" +"^(?.+) (?:by|due|on)? (?\\d{1,2})(?:st|nd|rd|th)? (?\\w+)$" +msgstr "" + +#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant +#. words in your language, and move the month block if required. +#: ../libkoto/koto-date-parser.c:509 +msgid "" +"^(?.+) (?:by|due|on)? (?\\w+) (?\\d{1,2})(?:st|nd|rd|th)?$" +msgstr "" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language +#: ../libkoto/koto-date-parser.c:514 +msgid "^(?.+) (?:by|due|on)? (?[\\d/-]+)$" +msgstr "" + +#. Translators: just translate this|on|by|due to contain relevant words in +#. your language and replace the w with whatever shortcut indicated "week". In +#. English, w34 means "week 34". +#: ../libkoto/koto-date-parser.c:520 +msgid "^(?.+) (?:by|due|on)? w(?\\d{1,2})$" +msgstr "" + +#. Translators: just translate in ... days to contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:526 +msgid "^(?.+) in (?\\d+) days?$" +msgstr "" + +#. Translators: just translate in ... weeksto contain relevant words in your +#. language. Remember the trailing ? is part of the regular expression to be +#. translated. +#: ../libkoto/koto-date-parser.c:532 +msgid "^(?.+) in (?\\d+) weeks?$" +msgstr "" + +#: ../libkoto/koto-entry.c:98 +msgid "Insert" +msgstr "" + +#: ../libkoto/koto-entry.c:125 +msgid "Delete" +msgstr "" + +#: ../libkoto/koto-field-editor-factory.c:428 +msgid "New Category" +msgstr "" + +#: ../libkoto/koto-field-editor-factory.c:439 +msgid "Enter the name of the new category:" +msgstr "" + +#: ../libkoto/koto-meta-group.c:46 +msgid "None" +msgstr "" + +#: ../libkoto/koto-meta-group.c:48 +msgid "New Group..." +msgstr "" + +#: ../libkoto/koto-no-category-group.c:32 +msgid "No Category" +msgstr "" + +#: ../libkoto/koto-priority-combo.c:71 +msgid "Low" +msgstr "" + +#: ../libkoto/koto-priority-combo.c:73 +msgid "Normal" +msgstr "" + +#: ../libkoto/koto-priority-combo.c:75 +msgid "High" +msgstr "" + +#: ../libkoto/koto-task-editor.c:55 +msgid "_Summary:" +msgstr "" + +#: ../libkoto/koto-task-editor.c:56 +msgid "Ca_tegory:" +msgstr "" + +#: ../libkoto/koto-task-editor.c:57 +msgid "_Priority:" +msgstr "" + +#: ../libkoto/koto-task-editor.c:58 +msgid "D_ue Date:" +msgstr "" + +#: ../libkoto/koto-task-editor.c:59 +msgid "_Web Address:" +msgstr "" + +#: ../libkoto/koto-task-editor.c:60 +msgid "D_escription:" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:71 ../src/hildon/hildon-tasks.c:326 +#: ../src/omoko/openmoko-tasks.c:217 +#, c-format +msgid "Are you sure you want to delete \"%s\"?" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:74 ../src/hildon/hildon-tasks.c:329 +msgid "If you delete an item, it is permanently lost." +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382 +#, c-format +msgid "Delete Task %s" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:102 +#, c-format +msgid "Edit Task %s" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:283 +msgid "Det_ails" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:342 +msgid "_Notes" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:344 +msgid "_Notes" +msgstr "" + +#: ../libkoto/koto-task-editor-dialog.c:348 +#, c-format +msgid "%s - Tasks" +msgstr "" + +#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361 +msgid "Complete Task" +msgstr "" + +#: ../libkoto/koto-task-view.c:489 +msgid "Done" +msgstr "" + +#: ../libkoto/koto-task-view.c:496 +msgid "Summary" +msgstr "" + +#: ../libkoto/koto-undo-action.c:60 +#, c-format +msgid "Undo %s" +msgstr "" + +#: ../libkoto/koto-undo-action.c:72 +msgid "Undo" +msgstr "" + +#: ../libkoto/koto-undo-action.c:84 +#, c-format +msgid "Redo %s" +msgstr "" + +#: ../libkoto/koto-undo-action.c:96 +msgid "Redo" +msgstr "" + +#: ../libkoto/koto-undo-manager.c:355 +msgid "Original Sample" +msgstr "" + +#: ../src/gtk/main.c:205 +#, c-format +msgid "Add task %s" +msgstr "" + +#: ../src/gtk/main.c:424 +msgid "Remove Completed" +msgstr "" + +#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422 +msgid "" +"Tasks is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version.\n" +"\n" +"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, " +"Fifth Floor, Boston, MA 0110-1301, USA" +msgstr "" + +#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443 +msgid "translator-credits" +msgstr "Sira Nokyoongtong " + +#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447 +msgid "The Pimlico Project" +msgstr "" + +#. Action name, stock ID, label, accelerator, tooltip, callback +#: ../src/gtk/main.c:479 +msgid "_Task" +msgstr "" + +#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461 +msgid "_Remove Completed" +msgstr "" + +#: ../src/gtk/main.c:484 +msgid "_Edit" +msgstr "" + +#: ../src/gtk/main.c:486 +msgid "_Help" +msgstr "" + +#: ../src/gtk/main.c:492 +msgid "Edit..." +msgstr "" + +#. TODO: turn this action into a toggle action +#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459 +msgid "_Mark Complete" +msgstr "" + +#: ../src/gtk/main.c:621 +msgid " - a to do list" +msgstr "" + +#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558 +msgid "_Category:" +msgstr "" + +#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578 +msgid "New task..." +msgstr "" + +#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602 +#, c-format +msgid "Tasks (%d)" +msgstr "" + +#: ../src/hildon/hildon-tasks.c:388 +msgid "Are you sure you want to delete all completed tasks?" +msgstr "" + +#: ../src/hildon/hildon-tasks.c:390 +msgid "Deleting completed tasks means they are permanently lost." +msgstr "" + +#. Action name, stock ID, label, accelerator, tooltip, callback +#. dummy +#: ../src/hildon/hildon-tasks.c:456 +msgid "New Task" +msgstr "" + +#: ../src/hildon/hildon-tasks.c:457 +msgid "Edit Task..." +msgstr "" + +#: ../src/hildon/hildon-tasks.c:460 +msgid "Delete Task" +msgstr "" + +#: ../src/hildon/hildon-tasks.c:462 +msgid "Quit" +msgstr "" + +#: ../src/hildon/hildon-tasks.c:463 +msgid "About" +msgstr "" + +#: ../src/omoko/openmoko-tasks.c:186 +msgid "New task" +msgstr "" diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/gtk/Makefile.am /tmp/VBgdFrDVAo/tasks-0.16/src/gtk/Makefile.am --- tasks-0.15/src/gtk/Makefile.am 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/gtk/Makefile.am 2009-06-08 21:37:58.000000000 +0100 @@ -7,14 +7,12 @@ $(WARN_CFLAGS) \ $(GTK_CFLAGS) \ $(ECAL_CFLAGS) \ - $(SEXY_CFLAGS) \ $(OWL_CFLAGS) \ $(UNIQUE_CFLAGS) tasks_LDADD = \ $(top_builddir)/libkoto/libkoto.a \ $(GTK_LIBS) \ $(ECAL_LIBS) \ - $(SEXY_LIBS) \ $(OWL_LIBS) \ $(UNIQUE_LIBS) diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/gtk/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/src/gtk/Makefile.in --- tasks-0.15/src/gtk/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/src/gtk/Makefile.in 2009-07-10 16:50:40.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -48,8 +48,7 @@ am__DEPENDENCIES_1 = tasks_DEPENDENCIES = $(top_builddir)/libkoto/libkoto.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tasks_LINK = $(CCLD) $(tasks_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/libkoto @@ -104,29 +103,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -156,8 +136,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -205,6 +183,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" @@ -213,7 +192,6 @@ $(WARN_CFLAGS) \ $(GTK_CFLAGS) \ $(ECAL_CFLAGS) \ - $(SEXY_CFLAGS) \ $(OWL_CFLAGS) \ $(UNIQUE_CFLAGS) @@ -221,7 +199,6 @@ $(top_builddir)/libkoto/libkoto.a \ $(GTK_LIBS) \ $(ECAL_LIBS) \ - $(SEXY_LIBS) \ $(OWL_LIBS) \ $(UNIQUE_LIBS) @@ -238,8 +215,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -346,7 +323,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/gtk/window-util.c /tmp/VBgdFrDVAo/tasks-0.16/src/gtk/window-util.c --- tasks-0.15/src/gtk/window-util.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/gtk/window-util.c 2009-04-24 08:02:37.000000000 +0100 @@ -66,7 +66,7 @@ GKeyFile *keys; filename = get_filename (); - + keys = g_key_file_new (); if (g_file_test (filename, G_FILE_TEST_EXISTS)) { @@ -75,7 +75,7 @@ g_error_free (error); } } - + return keys; } @@ -99,7 +99,7 @@ gtk_window_get_size (GTK_WINDOW (widget), &w, &h); g_key_file_set_integer (keys, group, WINDOW_WIDTH, w); g_key_file_set_integer (keys, group, WINDOW_HEIGHT, h); - + filename = get_filename (); dirname = g_path_get_dirname (filename); g_mkdir_with_parents (dirname, 0755); @@ -128,10 +128,10 @@ g_signal_connect (window, "unmap", G_CALLBACK (on_unmap), NULL); keys = get_key_file (); - + group = g_strconcat ("Window-", name, NULL); g_object_set_data_full (G_OBJECT (window), GROUP_PROP, group, g_free); - + got_pos = get (keys, group, WINDOW_X, &x); if (got_pos) got_pos &= get (keys, group, WINDOW_Y, &y); @@ -139,11 +139,11 @@ if (got_pos) { gtk_window_move (window, x, y); } - + got_size = get (keys, group, WINDOW_WIDTH, &w); - if (got_size) + if (got_size) got_size &= get (keys, group, WINDOW_HEIGHT, &h); - + if (got_size) { screen_w = gdk_screen_get_width (gtk_window_get_screen (window)); screen_h = gdk_screen_get_width (gtk_window_get_screen (window)); @@ -156,6 +156,6 @@ gtk_window_set_default_size (window, w, h); } - + g_key_file_free (keys); } diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/hildon/hildon-tasks.c /tmp/VBgdFrDVAo/tasks-0.16/src/hildon/hildon-tasks.c --- tasks-0.15/src/hildon/hildon-tasks.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/hildon/hildon-tasks.c 2009-04-24 08:02:37.000000000 +0100 @@ -66,18 +66,18 @@ GtkTreePath *path; g_assert (uid); - + if (koto_task_store_get_iter_for_uid (KOTO_TASK_STORE (task_store), uid, &iter)) { selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - + gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (filter), &real_iter, &iter); - + path = gtk_tree_model_get_path (filter, &real_iter); gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, FALSE); gtk_tree_path_free (path); } - + g_free (uid); return FALSE; } @@ -121,7 +121,7 @@ text = g_utf8_next_char (text); skip_whitespace (&text); } - + /* If the task starts with @foo, put it in the "foo" group. */ if (text[0] == '@') { char *end, *guess; @@ -136,7 +136,7 @@ /* Try and find a matching group */ group = koto_group_store_match_group (KOTO_GROUP_STORE (group_selector_store), guess); - + if (group) g_free (guess); else @@ -154,7 +154,7 @@ group = g_strdup (koto_group_get_name (default_group)); } } - + if (group) { icalcomponent_add_property (comp, icalproperty_new_categories (group)); g_free (group); @@ -173,7 +173,7 @@ icalcomponent *comp; text = gtk_entry_get_text (GTK_ENTRY (new_entry)); - + if (!text || text[0] == '\0') { g_warning ("Got clicked with empty text"); return; @@ -201,7 +201,7 @@ } -/* +/* * Used to enable/disable the new task button depending on the contents of the * entry. */ @@ -225,7 +225,7 @@ "groups", group_selector_store, "task", task, NULL); - + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -235,7 +235,7 @@ koto_platform_edit_task (KotoTask *task) { g_return_if_fail (task); - + edit_task (task); } @@ -283,7 +283,7 @@ g_warning ("TODO: No task selected, EditTask should be disabled"); return; } - + edit_task (task); koto_task_unref (task); @@ -300,7 +300,7 @@ } gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter), &real_iter, &iter); - + koto_task_store_set_done (KOTO_TASK_STORE (task_store), &real_iter, TRUE, NULL); } @@ -319,7 +319,7 @@ g_warning ("TODO: No task selected, DeleteTask should be disabled"); return; } - + dialog = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, @@ -332,14 +332,14 @@ GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { if (!e_cal_remove_object (cal, icalcomponent_get_uid (task->comp), &error)) { g_warning ("Cannot remove object: %s", error->message); g_error_free (error); } } - + gtk_widget_destroy (dialog); koto_task_unref (task); @@ -360,7 +360,7 @@ COLUMN_DONE, &done, COLUMN_TASK, &task, -1); - + if (done) { if (!e_cal_remove_object (cal, icalcomponent_get_uid (task->comp), &error)) { g_warning ("Cannot remove object: %s", error->message); @@ -370,7 +370,7 @@ } koto_task_unref (task); - + return FALSE; } @@ -393,11 +393,11 @@ GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gtk_tree_model_foreach (task_store, purge_foreach, NULL); } - + gtk_widget_destroy (dialog); } @@ -449,7 +449,7 @@ } /* TODO: split into global actions and actions that require a task to be selected */ -static const GtkActionEntry actions[] = +static const GtkActionEntry actions[] = { /* Action name, stock ID, label, accelerator, tooltip, callback */ { "app-menu", NULL, "AppMenu" }, /* dummy */ @@ -486,7 +486,7 @@ cal = e_cal_new_system_tasks (); if (!cal) g_error ("Cannot get system tasks"); - + if (!e_cal_open (cal, FALSE, &error)) g_error("Cannot open calendar: %s", error->message); @@ -497,7 +497,7 @@ /* Create the data stores */ task_store = koto_task_store_new (cal_view); - + group_filter_store = koto_group_store_new (cal_view); koto_group_store_add_group (KOTO_GROUP_STORE (group_filter_store), koto_all_group_new ()); koto_group_store_add_group (KOTO_GROUP_STORE (group_filter_store), koto_meta_group_new (KOTO_META_GROUP_SEPERATOR, -99)); @@ -509,13 +509,13 @@ koto_group_store_add_group (KOTO_GROUP_STORE (group_selector_store), koto_meta_group_new (KOTO_META_GROUP_SEPERATOR, -99)); koto_group_store_add_group (KOTO_GROUP_STORE (group_selector_store), koto_meta_group_new (KOTO_META_GROUP_SEPERATOR, 99)); koto_group_store_add_group (KOTO_GROUP_STORE (group_selector_store), koto_meta_group_new (KOTO_META_GROUP_NEW, 100)); - + /* Create the UI */ program = hildon_program_get_instance (); /* We generally can hibernate. TODO this should be set to false when editing a task */ hildon_program_set_can_hibernate (program, TRUE); - + window = hildon_window_new (); hildon_program_add_window (program, HILDON_WINDOW (window)); @@ -523,7 +523,7 @@ g_signal_connect (window, "destroy", gtk_main_quit, NULL); top_box = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (window), top_box); + gtk_container_add (GTK_CONTAINER (window), top_box); action_group = gtk_action_group_new ("Actions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); @@ -609,7 +609,7 @@ "gtk-menu-images", FALSE, NULL); - gtk_widget_show_all (window); + gtk_widget_show_all (window); gtk_main (); return 0; diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/hildon/Makefile.am /tmp/VBgdFrDVAo/tasks-0.16/src/hildon/Makefile.am --- tasks-0.15/src/hildon/Makefile.am 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/hildon/Makefile.am 2009-06-08 21:37:58.000000000 +0100 @@ -4,7 +4,7 @@ bin_PROGRAMS = tasks tasks_CPPFLAGS = -I$(top_srcdir)/ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(HILDON_CFLAGS) -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(HILDON_LIBS) $(SEXY_LIBS) +tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(HILDON_LIBS) tasks_SOURCES = \ hildon-tasks.c diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/hildon/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/src/hildon/Makefile.in --- tasks-0.15/src/hildon/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/src/hildon/Makefile.in 2009-07-10 16:50:40.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -50,7 +50,7 @@ am__DEPENDENCIES_1 = tasks_DEPENDENCIES = $(top_builddir)/libkoto/libkoto.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) tasks_LINK = $(CCLD) $(tasks_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/libkoto @@ -113,29 +113,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -165,8 +146,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -214,12 +193,13 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" tasks_CPPFLAGS = -I$(top_srcdir)/ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(HILDON_CFLAGS) -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(HILDON_LIBS) $(SEXY_LIBS) +tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(HILDON_LIBS) tasks_SOURCES = \ hildon-tasks.c @@ -233,8 +213,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -343,7 +323,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/src/Makefile.in --- tasks-0.15/src/Makefile.in 2009-03-30 10:03:08.000000000 +0100 +++ tasks-0.16/src/Makefile.in 2009-07-10 16:50:39.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -96,29 +96,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,8 +129,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -197,6 +176,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) @@ -207,8 +187,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -308,7 +288,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/omoko/Makefile.am /tmp/VBgdFrDVAo/tasks-0.16/src/omoko/Makefile.am --- tasks-0.15/src/omoko/Makefile.am 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/omoko/Makefile.am 2009-06-08 21:37:58.000000000 +0100 @@ -4,7 +4,7 @@ bin_PROGRAMS = tasks tasks_CPPFLAGS = -I$(top_srcdir)/ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(OMOKO_CFLAGS) -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(OMOKO_LIBS) $(SEXY_LIBS) +tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(OMOKO_LIBS) tasks_SOURCES = \ openmoko-tasks.c diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/omoko/Makefile.in /tmp/VBgdFrDVAo/tasks-0.16/src/omoko/Makefile.in --- tasks-0.15/src/omoko/Makefile.in 2009-03-30 10:03:09.000000000 +0100 +++ tasks-0.16/src/omoko/Makefile.in 2009-07-10 16:50:40.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -48,7 +48,7 @@ am__DEPENDENCIES_1 = tasks_DEPENDENCIES = $(top_builddir)/libkoto/libkoto.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) tasks_LINK = $(CCLD) $(tasks_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/libkoto @@ -103,29 +103,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -155,8 +136,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ -SEXY_CFLAGS = @SEXY_CFLAGS@ -SEXY_LIBS = @SEXY_LIBS@ SHELL = @SHELL@ STRIP = @STRIP@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ @@ -204,12 +183,13 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" tasks_CPPFLAGS = -I$(top_srcdir)/ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(OMOKO_CFLAGS) -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(OMOKO_LIBS) $(SEXY_LIBS) +tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(OMOKO_LIBS) tasks_SOURCES = \ openmoko-tasks.c @@ -221,8 +201,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -314,7 +294,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/ycjE72ysa0/tasks-0.15/src/omoko/openmoko-tasks.c /tmp/VBgdFrDVAo/tasks-0.16/src/omoko/openmoko-tasks.c --- tasks-0.15/src/omoko/openmoko-tasks.c 2009-03-20 16:00:32.000000000 +0000 +++ tasks-0.16/src/omoko/openmoko-tasks.c 2009-04-24 08:02:37.000000000 +0100 @@ -58,7 +58,7 @@ ECal *cal; } TasksApp; -enum +enum { PAGE_MAIN = 0, PAGE_EDIT @@ -102,7 +102,7 @@ } static void -notebook_switch_page_cb (GtkNotebook *notebook, GtkNotebookPage *page, +notebook_switch_page_cb (GtkNotebook *notebook, GtkNotebookPage *page, guint page_no, gpointer userdata) { TasksApp *app = (TasksApp *)userdata; @@ -225,7 +225,7 @@ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - if (!e_cal_remove_object (app->cal, icalcomponent_get_uid (task->comp), + if (!e_cal_remove_object (app->cal, icalcomponent_get_uid (task->comp), &error)) { g_warning ("Cannot remove object: %s", error->message); g_clear_error (&error); @@ -247,7 +247,7 @@ ECalView *cal_view; GError *error = NULL; GtkWidget *alignment; - + gtk_init (&argc, &argv); app = g_new0 (TasksApp, 1); @@ -265,28 +265,28 @@ g_error("Cannot get calendar view: %s", error->message); /* TODO: nasty, should pass cal to the stores or add e_cal_view_get_cal() */ - g_object_set_data_full (G_OBJECT (cal_view), "koto-ecal", g_object_ref (app->cal), + g_object_set_data_full (G_OBJECT (cal_view), "koto-ecal", g_object_ref (app->cal), g_object_unref); /* Create the data stores */ app->task_store = koto_task_store_new (cal_view); app->group_filter_store = koto_group_store_new (cal_view); - koto_group_store_add_group (KOTO_GROUP_STORE (app->group_filter_store), + koto_group_store_add_group (KOTO_GROUP_STORE (app->group_filter_store), koto_all_group_new ()); - koto_group_store_add_group (KOTO_GROUP_STORE (app->group_filter_store), + koto_group_store_add_group (KOTO_GROUP_STORE (app->group_filter_store), koto_meta_group_new (KOTO_META_GROUP_SEPERATOR, -99)); app->group_store = koto_group_store_new (cal_view); - koto_group_store_add_group (KOTO_GROUP_STORE (app->group_store), + koto_group_store_add_group (KOTO_GROUP_STORE (app->group_store), koto_meta_group_new (KOTO_META_GROUP_SEPERATOR, 99)); - koto_group_store_add_group (KOTO_GROUP_STORE (app->group_store), + koto_group_store_add_group (KOTO_GROUP_STORE (app->group_store), koto_no_category_group_new ()); app->group_filter = koto_group_model_filter_new (KOTO_TASK_STORE (app->task_store)); /* tree view */ - app->treeview = koto_task_view_new (KOTO_TASK_STORE (app->task_store), + app->treeview = koto_task_view_new (KOTO_TASK_STORE (app->task_store), KOTO_GROUP_MODEL_FILTER (app->group_filter)); /* selection */ @@ -308,7 +308,7 @@ app->notebook = gtk_notebook_new (); gtk_container_add (GTK_CONTAINER (app->main_window), app->notebook); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (app->notebook), GTK_POS_BOTTOM); - g_signal_connect (app->notebook, "switch-page", + g_signal_connect (app->notebook, "switch-page", G_CALLBACK (notebook_switch_page_cb), app); /* navigation */