Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 210768 Details for
Bug 274213
sys-cluster/csync2 fails to build with >=net-libs/gnutls-2.7.1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
New version of the shipped patch
csync2-1.34-pure-gnutls-r2.patch (text/plain), 175.76 KB, created by
Giampaolo Tomassoni
on 2009-11-21 09:12:51 UTC
(
hide
)
Description:
New version of the shipped patch
Filename:
MIME Type:
Creator:
Giampaolo Tomassoni
Created:
2009-11-21 09:12:51 UTC
Size:
175.76 KB
patch
obsolete
>diff -ruNd /root/csync2-1.34/Makefile.in ./Makefile.in >--- /root/csync2-1.34/Makefile.in 2007-07-24 23:04:25.000000000 +0200 >+++ ./Makefile.in 2009-11-21 09:53:27.000000000 +0100 >@@ -81,6 +81,8 @@ > ECHO_N = @ECHO_N@ > ECHO_T = @ECHO_T@ > EXEEXT = @EXEEXT@ >+HAVE_LIBGNUTLS_FALSE = @HAVE_LIBGNUTLS_FALSE@ >+HAVE_LIBGNUTLS_TRUE = @HAVE_LIBGNUTLS_TRUE@ > INSTALL_DATA = @INSTALL_DATA@ > INSTALL_PROGRAM = @INSTALL_PROGRAM@ > INSTALL_SCRIPT = @INSTALL_SCRIPT@ >@@ -104,6 +106,7 @@ > PACKAGE_TARNAME = @PACKAGE_TARNAME@ > PACKAGE_VERSION = @PACKAGE_VERSION@ > PATH_SEPARATOR = @PATH_SEPARATOR@ >+PKG_CONFIG = @PKG_CONFIG@ > PRIVATE_LIBRSYNC_FALSE = @PRIVATE_LIBRSYNC_FALSE@ > PRIVATE_LIBRSYNC_TRUE = @PRIVATE_LIBRSYNC_TRUE@ > PRIVATE_LIBSQLITE_FALSE = @PRIVATE_LIBSQLITE_FALSE@ >@@ -215,7 +218,7 @@ > DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ > COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ > cfgfile_parser.c cfgfile_parser.h cfgfile_scanner.c config.h.in \ >- configure.ac depcomp install-sh missing mkinstalldirs >+ configure configure.ac depcomp install-sh missing mkinstalldirs > SOURCES = $(csync2_SOURCES) > > all: $(BUILT_SOURCES) config.h >diff -ruNd /root/csync2-1.34/aclocal.m4 ./aclocal.m4 >--- /root/csync2-1.34/aclocal.m4 2007-07-24 23:04:23.000000000 +0200 >+++ ./aclocal.m4 2009-11-21 09:53:27.000000000 +0100 >@@ -833,32 +833,6 @@ > Usually this means the macro was only invoked conditionally.]) > fi])]) > >-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- >- >-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. >- >-# This program 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, or (at your option) >-# any later version. >- >-# This program 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. >- >-# You should have received a copy of the GNU General Public License >-# along with this program; if not, write to the Free Software >-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA >-# 02111-1307, USA. >- >-AC_PREREQ([2.52]) >- >-# serial 6 >- >-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. >-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) >- > > # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. > >@@ -899,6 +873,9 @@ > # Configure paths for LIBGCRYPT > # Shamelessly stolen from the one of XDELTA by Owen Taylor > # Werner Koch 99-12-09 >+# 10-years-old code is not as good as brandy would... >+# gnutls now uses pkg-config and doesn't ship gnutls-config anymore. >+# Giampaolo Tomassoni 2009-09-15 > > dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) > dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS >@@ -911,34 +888,43 @@ > [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], > libgnutls_config_prefix="$withval", libgnutls_config_prefix="") > >- if test x$libgnutls_config_prefix != x ; then >- if test x${LIBGNUTLS_CONFIG+set} != xset ; then >- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config >- fi >- fi >- >- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) > min_libgnutls_version=ifelse([$1], ,0.1.0,$1) > AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) >- no_libgnutls="" >- if test "$LIBGNUTLS_CONFIG" = "no" ; then >- no_libgnutls=yes >- else >- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` >- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` >- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` > >+ PKG_CHECK_EXISTS( >+ gnutls, >+ [ >+ LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls` >+ LIBGNUTLS_LIBS=`$PKG_CONFIG --libs gnutls` >+ libgnutls_config_version=`$PKG_CONFIG --modversion gnutls` >+ ], >+ [ >+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config,, [$libgnutls_config_prefix/bin$PATH_SEPARATOR$PATH]) >+ if test "$LIBGNUTLS_CONFIG"=no >+ then >+ no_libgnutls=yes >+ echo "Can't obtain gnutls package info!" >&2 >+ fi >+ >+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` >+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` >+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` >+ ] >+ ) >+ >+ if test "$no_libgnutls" != no >+ then >+ ac_save_CFLAGS="$CFLAGS" >+ ac_save_LIBS="$LIBS" >+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >+ LIBS="$LIBS $LIBGNUTLS_LIBS" > >- ac_save_CFLAGS="$CFLAGS" >- ac_save_LIBS="$LIBS" >- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >- LIBS="$LIBS $LIBGNUTLS_LIBS" > dnl > dnl Now check if the installed libgnutls is sufficiently new. Also sanity > dnl checks the results of libgnutls-config to some extent > dnl >- rm -f conf.libgnutlstest >- AC_TRY_RUN([ >+ rm -f conf.libgnutlstest >+ AC_TRY_RUN([ > #include <stdio.h> > #include <stdlib.h> > #include <string.h> >@@ -1000,6 +986,8 @@ > if test "x$no_libgnutls" = x ; then > AC_MSG_RESULT(yes) > ifelse([$2], , :, [$2]) >+ >+ AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define to 1 if you have the `gnutls' library (-lgnutls).]) > else > if test -f conf.libgnutlstest ; then > : >@@ -1045,11 +1033,166 @@ > LIBGNUTLS_CFLAGS="" > LIBGNUTLS_LIBS="" > ifelse([$3], , :, [$3]) >- fi >+ fi >+ > rm -f conf.libgnutlstest > AC_SUBST(LIBGNUTLS_CFLAGS) > AC_SUBST(LIBGNUTLS_LIBS) > ]) > >-dnl *-*wedit:notab*-* Please keep this as the last line. >+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- >+# >+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. >+# >+# This program 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. >+# >+# This program 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. >+# >+# You should have received a copy of the GNU General Public License >+# along with this program; if not, write to the Free Software >+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. >+# >+# As a special exception to the GNU General Public License, if you >+# distribute this file as part of a program that contains a >+# configuration script generated by Autoconf, you may include it under >+# the same distribution terms that you use for the rest of that program. >+ >+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) >+# ---------------------------------- >+AC_DEFUN([PKG_PROG_PKG_CONFIG], >+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) >+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) >+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl >+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then >+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) >+fi >+if test -n "$PKG_CONFIG"; then >+ _pkg_min_version=m4_default([$1], [0.9.0]) >+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) >+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then >+ AC_MSG_RESULT([yes]) >+ else >+ AC_MSG_RESULT([no]) >+ PKG_CONFIG="" >+ fi >+ >+fi[]dnl >+])# PKG_PROG_PKG_CONFIG >+ >+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) >+# >+# Check to see whether a particular set of modules exists. Similar >+# to PKG_CHECK_MODULES(), but does not set variables or print errors. >+# >+# >+# Similar to PKG_CHECK_MODULES, make sure that the first instance of >+# this or PKG_CHECK_MODULES is called, or make sure to call >+# PKG_CHECK_EXISTS manually >+# -------------------------------------------------------------- >+AC_DEFUN([PKG_CHECK_EXISTS], >+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl >+if test -n "$PKG_CONFIG" && \ >+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then >+ m4_ifval([$2], [$2], [:]) >+m4_ifvaln([$3], [else >+ $3])dnl >+fi]) >+ >+ >+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) >+# --------------------------------------------- >+m4_define([_PKG_CONFIG], >+[if test -n "$$1"; then >+ pkg_cv_[]$1="$$1" >+ elif test -n "$PKG_CONFIG"; then >+ PKG_CHECK_EXISTS([$3], >+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], >+ [pkg_failed=yes]) >+ else >+ pkg_failed=untried >+fi[]dnl >+])# _PKG_CONFIG >+ >+# _PKG_SHORT_ERRORS_SUPPORTED >+# ----------------------------- >+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], >+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) >+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then >+ _pkg_short_errors_supported=yes >+else >+ _pkg_short_errors_supported=no >+fi[]dnl >+])# _PKG_SHORT_ERRORS_SUPPORTED >+ >+ >+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], >+# [ACTION-IF-NOT-FOUND]) >+# >+# >+# Note that if there is a possibility the first call to >+# PKG_CHECK_MODULES might not happen, you should be sure to include an >+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac >+# >+# >+# -------------------------------------------------------------- >+AC_DEFUN([PKG_CHECK_MODULES], >+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl >+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl >+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl >+ >+pkg_failed=no >+AC_MSG_CHECKING([for $1]) >+ >+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) >+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) >+ >+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS >+and $1[]_LIBS to avoid the need to call pkg-config. >+See the pkg-config man page for more details.]) >+ >+if test $pkg_failed = yes; then >+ _PKG_SHORT_ERRORS_SUPPORTED >+ if test $_pkg_short_errors_supported = yes; then >+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` >+ else >+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` >+ fi >+ # Put the nasty error message in config.log where it belongs >+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD >+ >+ ifelse([$4], , [AC_MSG_ERROR(dnl >+[Package requirements ($2) were not met: >+ >+$$1_PKG_ERRORS >+ >+Consider adjusting the PKG_CONFIG_PATH environment variable if you >+installed software in a non-standard prefix. >+ >+_PKG_TEXT >+])], >+ [AC_MSG_RESULT([no]) >+ $4]) >+elif test $pkg_failed = untried; then >+ ifelse([$4], , [AC_MSG_FAILURE(dnl >+[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. >+ >+_PKG_TEXT >+ >+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], >+ [$4]) >+else >+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS >+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS >+ AC_MSG_RESULT([yes]) >+ ifelse([$3], , :, [$3]) >+fi[]dnl >+])# PKG_CHECK_MODULES > >diff -ruNd /root/csync2-1.34/autogen.sh ./autogen.sh >--- /root/csync2-1.34/autogen.sh 2007-07-24 23:04:18.000000000 +0200 >+++ ./autogen.sh 2009-11-21 09:53:27.000000000 +0100 >@@ -18,7 +18,7 @@ > # along with this program; if not, write to the Free Software > # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > >-aclocal-1.7 >+aclocal-1.7 -I m4 > autoheader > automake-1.7 --add-missing --copy > autoconf >diff -ruNd /root/csync2-1.34/config.h.in ./config.h.in >--- /root/csync2-1.34/config.h.in 2007-07-24 23:04:24.000000000 +0200 >+++ ./config.h.in 2009-11-21 09:53:27.000000000 +0100 >@@ -1,7 +1,7 @@ > /* config.h.in. Generated from configure.ac by autoheader. */ > >-/* Define to 1 if you have the `gnutls-openssl' library (-lgnutls-openssl). */ >-#undef HAVE_LIBGNUTLS_OPENSSL >+/* Define to 1 if you have the `gnutls' library (-lgnutls). */ >+#undef HAVE_LIBGNUTLS > > /* Define to 1 if you have the `rsync' library (-lrsync). */ > #undef HAVE_LIBRSYNC >diff -ruNd /root/csync2-1.34/configure ./configure >--- /root/csync2-1.34/configure 2007-07-24 23:04:25.000000000 +0200 >+++ ./configure 2009-11-21 09:53:27.000000000 +0100 >@@ -1,11 +1,11 @@ > #! /bin/sh > # Guess values for system-dependent variables and create Makefiles. >-# Generated by GNU Autoconf 2.61 for csync2 1.34. >+# Generated by GNU Autoconf 2.63 for csync2 1.34. > # > # Report bugs to <clifford@clifford.at>. > # > # 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 >@@ -579,94 +601,105 @@ > PACKAGE_BUGREPORT='clifford@clifford.at' > > ac_unique_file="csync2.c" >-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 >-CYGPATH_W >-PACKAGE >-VERSION >-ACLOCAL >-AUTOCONF >-AUTOMAKE >-AUTOHEADER >-MAKEINFO >-AMTAR >-install_sh >-STRIP >-INSTALL_STRIP_PROGRAM >-AWK >-SET_MAKE >-am__leading_dot >-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 >-YACC >-YFLAGS >-LEX >-LEX_OUTPUT_ROOT >-LEXLIB >-librsync_source_file >-PRIVATE_LIBRSYNC_TRUE >-PRIVATE_LIBRSYNC_FALSE >-libsqlite_source_file >-PRIVATE_LIBSQLITE_TRUE >-PRIVATE_LIBSQLITE_FALSE >-LIBGNUTLS_CONFIG >-LIBGNUTLS_CFLAGS >-LIBGNUTLS_LIBS >+ac_subst_vars='LTLIBOBJS > LIBOBJS >-LTLIBOBJS' >+HAVE_LIBGNUTLS_FALSE >+HAVE_LIBGNUTLS_TRUE >+LIBGNUTLS_LIBS >+LIBGNUTLS_CFLAGS >+LIBGNUTLS_CONFIG >+PKG_CONFIG >+PRIVATE_LIBSQLITE_FALSE >+PRIVATE_LIBSQLITE_TRUE >+libsqlite_source_file >+PRIVATE_LIBRSYNC_FALSE >+PRIVATE_LIBRSYNC_TRUE >+librsync_source_file >+LEXLIB >+LEX_OUTPUT_ROOT >+LEX >+YFLAGS >+YACC >+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__leading_dot >+SET_MAKE >+AWK >+INSTALL_STRIP_PROGRAM >+STRIP >+install_sh >+AMTAR >+MAKEINFO >+AUTOHEADER >+AUTOMAKE >+AUTOCONF >+ACLOCAL >+VERSION >+PACKAGE >+CYGPATH_W >+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 >+with_librsync_source >+with_libsqlite_source >+enable_gnutls >+with_libgnutls_prefix >+' > ac_precious_vars='build_alias > host_alias > target_alias >@@ -676,12 +709,15 @@ > LIBS > CPPFLAGS > YACC >-YFLAGS' >+YFLAGS >+PKG_CONFIG' > > > # 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 >@@ -780,13 +816,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 ;; >@@ -799,13 +843,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- \ >@@ -996,22 +1048,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. >@@ -1031,7 +1099,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; }; } > ;; >@@ -1040,16 +1108,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} > ;; > >@@ -1058,22 +1126,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 > >@@ -1088,7 +1172,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 >@@ -1104,10 +1188,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; }; } > > >@@ -1115,12 +1199,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 >@@ -1147,12 +1231,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=. >@@ -1201,9 +1285,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 >@@ -1213,25 +1297,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/csync2] >- --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/csync2] >+ --htmldir=DIR html documentation [DOCDIR] >+ --dvidir=DIR dvi documentation [DOCDIR] >+ --pdfdir=DIR pdf documentation [DOCDIR] >+ --psdir=DIR ps documentation [DOCDIR] > _ACEOF > > cat <<\_ACEOF >@@ -1250,6 +1334,7 @@ > 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 builds >@@ -1280,6 +1365,7 @@ > YFLAGS The list of arguments that will be passed by default to $YACC. > This script will default YFLAGS to the empty string to avoid a > default value of `-d' given by some make applications. >+ PKG_CONFIG path to pkg-config utility > > Use these variables to override the choices made by `configure' or to help > it to find libraries and programs with nonstandard names/locations. >@@ -1292,15 +1378,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/ ;; >@@ -1336,7 +1424,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 >@@ -1346,10 +1434,10 @@ > if $ac_init_version; then > cat <<\_ACEOF > csync2 configure 1.34 >-generated by GNU Autoconf 2.61 >+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 >@@ -1360,7 +1448,7 @@ > running configure, to aid debugging if configure makes a mistake. > > It was created by csync2 $as_me 1.34, which was >-generated by GNU Autoconf 2.61. Invocation command line was >+generated by GNU Autoconf 2.63. Invocation command line was > > $ $0 $@ > >@@ -1396,7 +1484,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 > >@@ -1431,7 +1519,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'" ;; >@@ -1483,11 +1571,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 >@@ -1517,9 +1606,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 > >@@ -1534,9 +1623,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 >@@ -1552,8 +1641,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 && >@@ -1595,21 +1684,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 >@@ -1619,16 +1711,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 > >@@ -1642,29 +1734,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 >@@ -1674,10 +1775,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 > >@@ -1730,8 +1833,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 > >@@ -1757,11 +1860,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 >@@ -1790,17 +1894,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 >@@ -1813,8 +1929,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. >@@ -1824,8 +1940,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 >@@ -1848,9 +1964,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 >@@ -1861,26 +1977,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 >@@ -1892,18 +2005,18 @@ > 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 > > for ac_prog in gawk mawk nawk awk > 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. >@@ -1916,7 +2029,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 >@@ -1927,22 +2040,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 >@@ -1959,12 +2073,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 > >@@ -1980,8 +2094,8 @@ > # test to see if srcdir already configured > if test "`cd $srcdir && pwd`" != "`pwd`" && > 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 > >@@ -2038,10 +2152,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. >@@ -2054,7 +2168,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 >@@ -2065,11 +2179,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 > > >@@ -2078,10 +2192,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. >@@ -2094,7 +2208,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 >@@ -2105,11 +2219,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 >@@ -2117,12 +2231,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 >@@ -2157,10 +2267,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. >@@ -2173,7 +2283,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 >@@ -2184,11 +2294,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 > > >@@ -2197,10 +2307,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. >@@ -2213,7 +2323,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 >@@ -2224,11 +2334,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 >@@ -2236,12 +2346,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 >@@ -2254,10 +2360,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. >@@ -2270,7 +2376,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 >@@ -2281,11 +2387,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 > > >@@ -2294,10 +2400,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. >@@ -2315,7 +2421,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 >@@ -2338,11 +2444,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 > > >@@ -2353,10 +2459,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. >@@ -2369,7 +2475,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 >@@ -2380,11 +2486,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 > > >@@ -2397,10 +2503,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. >@@ -2413,7 +2519,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 >@@ -2424,11 +2530,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 > > >@@ -2440,12 +2546,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 >@@ -2455,44 +2557,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 >@@ -2511,27 +2619,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 >@@ -2542,10 +2645,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' >@@ -2556,7 +2660,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 >@@ -2583,25 +2687,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 >@@ -2610,49 +2716,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 >@@ -2661,31 +2771,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. */ >@@ -2708,40 +2820,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. */ >@@ -2767,20 +2882,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 >@@ -2790,15 +2906,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 >@@ -2825,20 +2945,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="" >@@ -2863,20 +2984,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 >@@ -2902,20 +3024,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 > > >@@ -2930,8 +3053,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 >@@ -2947,10 +3070,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 >@@ -3021,20 +3144,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 > > >@@ -3050,15 +3174,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 > > >@@ -3079,8 +3203,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 >@@ -3107,8 +3231,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. >@@ -3135,10 +3259,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 >@@ -3218,8 +3342,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 > > >@@ -3248,11 +3372,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 >@@ -3281,17 +3406,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 >@@ -3304,8 +3441,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. >@@ -3319,10 +3456,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_YACC+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > if test -n "$YACC"; then > ac_cv_prog_YACC="$YACC" # Let the user override the test. >@@ -3335,7 +3472,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_YACC="$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 >@@ -3346,11 +3483,11 @@ > fi > YACC=$ac_cv_prog_YACC > if test -n "$YACC"; then >- { echo "$as_me:$LINENO: result: $YACC" >&5 >-echo "${ECHO_T}$YACC" >&6; } >+ { $as_echo "$as_me:$LINENO: result: $YACC" >&5 >+$as_echo "$YACC" >&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 > > >@@ -3363,10 +3500,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_LEX+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > if test -n "$LEX"; then > ac_cv_prog_LEX="$LEX" # Let the user override the test. >@@ -3379,7 +3516,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_LEX="$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 >@@ -3390,11 +3527,11 @@ > fi > LEX=$ac_cv_prog_LEX > if test -n "$LEX"; then >- { echo "$as_me:$LINENO: result: $LEX" >&5 >-echo "${ECHO_T}$LEX" >&6; } >+ { $as_echo "$as_me:$LINENO: result: $LEX" >&5 >+$as_echo "$LEX" >&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 > > >@@ -3427,15 +3564,16 @@ > *\"* | *\`* | *\\*) 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 "$LEX conftest.l") 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 lex output file root" >&5 >-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } >+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5 >+$as_echo_n "checking lex output file root... " >&6; } > if test "${ac_cv_prog_lex_root+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > > if test -f lex.yy.c; then >@@ -3443,20 +3581,20 @@ > elif test -f lexyy.c; then > ac_cv_prog_lex_root=lexyy > else >- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 >-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} >+ { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 >+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} > { (exit 1); exit 1; }; } > fi > fi >-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 >-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } >+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 >+$as_echo "$ac_cv_prog_lex_root" >&6; } > LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root > > if test -z "${LEXLIB+set}"; then >- { echo "$as_me:$LINENO: checking lex library" >&5 >-echo $ECHO_N "checking lex library... $ECHO_C" >&6; } >+ { $as_echo "$as_me:$LINENO: checking lex library" >&5 >+$as_echo_n "checking lex library... " >&6; } > if test "${ac_cv_lib_lex+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > > ac_save_LIBS=$LIBS >@@ -3472,26 +3610,30 @@ > *\"* | *\`* | *\\*) 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_lex=$ac_lib > else >- echo "$as_me: failed program was:" >&5 >+ $as_echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > > > fi > >+rm -rf conftest.dSYM > rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ > conftest$ac_exeext conftest.$ac_ext > test "$ac_cv_lib_lex" != 'none needed' && break >@@ -3499,16 +3641,16 @@ > LIBS=$ac_save_LIBS > > fi >-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 >-echo "${ECHO_T}$ac_cv_lib_lex" >&6; } >+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 >+$as_echo "$ac_cv_lib_lex" >&6; } > test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex > fi > > >-{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 >-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } >+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 >+$as_echo_n "checking whether yytext is a pointer... " >&6; } > if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > # POSIX says lex can declare yytext either as a pointer or an array; the > # default is implementation-dependent. Figure out which it is, since >@@ -3526,33 +3668,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_prog_lex_yytext_pointer=yes > else >- echo "$as_me: failed program was:" >&5 >+ $as_echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > > > 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_save_LIBS > > fi >-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 >-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; } >+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 >+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } > if test $ac_cv_prog_lex_yytext_pointer = yes; then > > cat >>confdefs.h <<\_ACEOF >@@ -3575,10 +3721,10 @@ > > else > >-{ echo "$as_me:$LINENO: checking for rs_sig_file in -lrsync" >&5 >-echo $ECHO_N "checking for rs_sig_file in -lrsync... $ECHO_C" >&6; } >+{ $as_echo "$as_me:$LINENO: checking for rs_sig_file in -lrsync" >&5 >+$as_echo_n "checking for rs_sig_file in -lrsync... " >&6; } > if test "${ac_cv_lib_rsync_rs_sig_file+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > ac_check_lib_save_LIBS=$LIBS > LIBS="-lrsync $LIBS" >@@ -3610,33 +3756,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_rsync_rs_sig_file=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_rsync_rs_sig_file=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_rsync_rs_sig_file" >&5 >-echo "${ECHO_T}$ac_cv_lib_rsync_rs_sig_file" >&6; } >-if test $ac_cv_lib_rsync_rs_sig_file = yes; then >+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rsync_rs_sig_file" >&5 >+$as_echo "$ac_cv_lib_rsync_rs_sig_file" >&6; } >+if test "x$ac_cv_lib_rsync_rs_sig_file" = x""yes; then > cat >>confdefs.h <<_ACEOF > #define HAVE_LIBRSYNC 1 > _ACEOF >@@ -3644,8 +3794,8 @@ > LIBS="-lrsync $LIBS" > > else >- { { echo "$as_me:$LINENO: error: librsync is required" >&5 >-echo "$as_me: error: librsync is required" >&2;} >+ { { $as_echo "$as_me:$LINENO: error: librsync is required" >&5 >+$as_echo "$as_me: error: librsync is required" >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -3671,10 +3821,10 @@ > > else > >-{ echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5 >-echo $ECHO_N "checking for sqlite_exec in -lsqlite... $ECHO_C" >&6; } >+{ $as_echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5 >+$as_echo_n "checking for sqlite_exec in -lsqlite... " >&6; } > if test "${ac_cv_lib_sqlite_sqlite_exec+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > ac_check_lib_save_LIBS=$LIBS > LIBS="-lsqlite $LIBS" >@@ -3706,33 +3856,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_sqlite_sqlite_exec=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_sqlite_sqlite_exec=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_sqlite_sqlite_exec" >&5 >-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_exec" >&6; } >-if test $ac_cv_lib_sqlite_sqlite_exec = yes; then >+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_exec" >&5 >+$as_echo "$ac_cv_lib_sqlite_sqlite_exec" >&6; } >+if test "x$ac_cv_lib_sqlite_sqlite_exec" = x""yes; then > cat >>confdefs.h <<_ACEOF > #define HAVE_LIBSQLITE 1 > _ACEOF >@@ -3740,8 +3894,8 @@ > LIBS="-lsqlite $LIBS" > > else >- { { echo "$as_me:$LINENO: error: libsqlite is required" >&5 >-echo "$as_me: error: libsqlite is required" >&2;} >+ { { $as_echo "$as_me:$LINENO: error: libsqlite is required" >&5 >+$as_echo "$as_me: error: libsqlite is required" >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -3769,9 +3923,124 @@ > > if test "$enable_gnutls" != no > then >- > # Check for gnuTLS. > >+ >+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then >+ if test -n "$ac_tool_prefix"; then >+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. >+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 >+{ $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 >+ $as_echo_n "(cached) " >&6 >+else >+ case $PKG_CONFIG in >+ [\\/]* | ?:[\\/]*) >+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. >+ ;; >+ *) >+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >+for as_dir in $PATH >+do >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ 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" >+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+ fi >+done >+done >+IFS=$as_save_IFS >+ >+ ;; >+esac >+fi >+PKG_CONFIG=$ac_cv_path_PKG_CONFIG >+if test -n "$PKG_CONFIG"; then >+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 >+$as_echo "$PKG_CONFIG" >&6; } >+else >+ { $as_echo "$as_me:$LINENO: result: no" >&5 >+$as_echo "no" >&6; } >+fi >+ >+ >+fi >+if test -z "$ac_cv_path_PKG_CONFIG"; then >+ 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 >+{ $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 >+ $as_echo_n "(cached) " >&6 >+else >+ case $ac_pt_PKG_CONFIG in >+ [\\/]* | ?:[\\/]*) >+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. >+ ;; >+ *) >+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >+for as_dir in $PATH >+do >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ 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" >+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+ fi >+done >+done >+IFS=$as_save_IFS >+ >+ ;; >+esac >+fi >+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG >+if test -n "$ac_pt_PKG_CONFIG"; then >+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 >+$as_echo "$ac_pt_PKG_CONFIG" >&6; } >+else >+ { $as_echo "$as_me:$LINENO: result: no" >&5 >+$as_echo "no" >&6; } >+fi >+ >+ if test "x$ac_pt_PKG_CONFIG" = x; then >+ PKG_CONFIG="" >+ else >+ case $cross_compiling:$ac_tool_warned in >+yes:) >+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 >+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >+ac_tool_warned=yes ;; >+esac >+ PKG_CONFIG=$ac_pt_PKG_CONFIG >+ fi >+else >+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" >+fi >+ >+fi >+if test -n "$PKG_CONFIG"; then >+ _pkg_min_version=0.9.0 >+ { $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 >+ { $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; } >+ PKG_CONFIG="" >+ fi >+ >+fi >+ > # Check whether --with-libgnutls-prefix was given. > if test "${with_libgnutls_prefix+set}" = set; then > withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval" >@@ -3780,18 +4049,29 @@ > fi > > >- if test x$libgnutls_config_prefix != x ; then >- if test x${LIBGNUTLS_CONFIG+set} != xset ; then >- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config >- fi >- fi >+ min_libgnutls_version=1.0.0 >+ { $as_echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5 >+$as_echo_n "checking for libgnutls - version >= $min_libgnutls_version... " >&6; } > >- # Extract the first word of "libgnutls-config", so it can be a program name with args. >+ if test -n "$PKG_CONFIG" && \ >+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls\"") >&5 >+ ($PKG_CONFIG --exists --print-errors "gnutls") 2>&5 >+ ac_status=$? >+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; then >+ >+ LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls` >+ LIBGNUTLS_LIBS=`$PKG_CONFIG --libs gnutls` >+ libgnutls_config_version=`$PKG_CONFIG --modversion gnutls` >+ >+else >+ >+ # Extract the first word of "libgnutls-config", so it can be a program name with args. > set dummy libgnutls-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_LIBGNUTLS_CONFIG+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >+ $as_echo_n "(cached) " >&6 > else > case $LIBGNUTLS_CONFIG in > [\\/]* | ?:[\\/]*) >@@ -3799,52 +4079,55 @@ > ;; > *) > as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >-for as_dir in $PATH >+for as_dir in $libgnutls_config_prefix/bin$PATH_SEPARATOR$PATH > do > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > 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_LIBGNUTLS_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 > done > IFS=$as_save_IFS > >- test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no" > ;; > esac > fi > LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG > if test -n "$LIBGNUTLS_CONFIG"; then >- { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 >-echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; } >+ { $as_echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 >+$as_echo "$LIBGNUTLS_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 > > >- min_libgnutls_version=1.0.0 >- { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5 >-echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; } >- no_libgnutls="" >- if test "$LIBGNUTLS_CONFIG" = "no" ; then >- no_libgnutls=yes >- else >- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` >- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` >- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` >+ if test "$LIBGNUTLS_CONFIG"=no >+ then >+ no_libgnutls=yes >+ echo "Can't obtain gnutls package info!" >&2 >+ fi > >+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` >+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` >+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` > >- ac_save_CFLAGS="$CFLAGS" >- ac_save_LIBS="$LIBS" >- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >- LIBS="$LIBS $LIBGNUTLS_LIBS" >- rm -f conf.libgnutlstest >- if test "$cross_compiling" = yes; then >+ >+fi >+ >+ if test "$no_libgnutls" != no >+ then >+ ac_save_CFLAGS="$CFLAGS" >+ ac_save_LIBS="$LIBS" >+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >+ LIBS="$LIBS $LIBGNUTLS_LIBS" >+ >+ rm -f conf.libgnutlstest >+ if test "$cross_compiling" = yes; then > echo $ac_n "cross compiling; assumed OK... $ac_c" > else > cat >conftest.$ac_ext <<_ACEOF >@@ -3915,29 +4198,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>&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 ) > no_libgnutls=yes > 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 > >@@ -3947,15 +4233,21 @@ > fi > > if test "x$no_libgnutls" = x ; 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; } > : >+ >+ >+cat >>confdefs.h <<\_ACEOF >+#define HAVE_LIBGNUTLS 1 >+_ACEOF >+ > else > if test -f conf.libgnutlstest ; then > : > 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 "$LIBGNUTLS_CONFIG" = "no" ; then > echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" >@@ -3995,18 +4287,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_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 > echo "*** The test program compiled, but did not run. This usually means" > echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" > echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" >@@ -4018,7 +4313,7 @@ > echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" > echo "***" > else >- echo "$as_me: failed program was:" >&5 >+ $as_echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > > echo "*** The test program failed to compile or link. See the file config.log for the" >@@ -4027,6 +4322,7 @@ > echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" > fi > >+rm -rf conftest.dSYM > rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ > conftest$ac_exeext conftest.$ac_ext > CFLAGS="$ac_save_CFLAGS" >@@ -4035,98 +4331,31 @@ > fi > LIBGNUTLS_CFLAGS="" > LIBGNUTLS_LIBS="" >- { { echo "$as_me:$LINENO: error: gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&5 >-echo "$as_me: error: gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&2;} >+ { { $as_echo "$as_me:$LINENO: error: gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&5 >+$as_echo "$as_me: error: gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&2;} > { (exit 1); exit 1; }; } >- fi >+ fi >+ > rm -f conf.libgnutlstest > > > > >- # This is a bloody hack for fedora core >+ ## This is a bloody hack for fedora core > CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" > LIBS="$LIBS $LIBGNUTLS_LIBS -ltasn1" >- >- # Check gnuTLS SSL compatibility lib. >- >-{ echo "$as_me:$LINENO: checking for SSL_new in -lgnutls-openssl" >&5 >-echo $ECHO_N "checking for SSL_new in -lgnutls-openssl... $ECHO_C" >&6; } >-if test "${ac_cv_lib_gnutls_openssl_SSL_new+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- ac_check_lib_save_LIBS=$LIBS >-LIBS="-lgnutls-openssl $LIBS" >-cat >conftest.$ac_ext <<_ACEOF >-/* confdefs.h. */ >-_ACEOF >-cat confdefs.h >>conftest.$ac_ext >-cat >>conftest.$ac_ext <<_ACEOF >-/* end confdefs.h. */ >- >-/* Override any GCC internal prototype to avoid an error. >- Use char because int might match the return type of a GCC >- builtin and then its argument prototype would still apply. */ >-#ifdef __cplusplus >-extern "C" >-#endif >-char SSL_new (); >-int >-main () >-{ >-return SSL_new (); >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-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_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 >- (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 >- ac_cv_lib_gnutls_openssl_SSL_new=yes >-else >- echo "$as_me: failed program was:" >&5 >-sed 's/^/| /' conftest.$ac_ext >&5 >- >- ac_cv_lib_gnutls_openssl_SSL_new=no > fi > >-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_gnutls_openssl_SSL_new" >&5 >-echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_new" >&6; } >-if test $ac_cv_lib_gnutls_openssl_SSL_new = yes; then >- cat >>confdefs.h <<_ACEOF >-#define HAVE_LIBGNUTLS_OPENSSL 1 >-_ACEOF >- >- LIBS="-lgnutls-openssl $LIBS" > >+if test "$enable_gnutls" != no ; then >+ HAVE_LIBGNUTLS_TRUE= >+ HAVE_LIBGNUTLS_FALSE='#' > else >- { { echo "$as_me:$LINENO: error: gnutls-openssl not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&5 >-echo "$as_me: error: gnutls-openssl not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls" >&2;} >- { (exit 1); exit 1; }; } >+ HAVE_LIBGNUTLS_TRUE='#' >+ HAVE_LIBGNUTLS_FALSE= > fi > > >-fi >- > ac_config_files="$ac_config_files Makefile" > > cat >confcache <<\_ACEOF >@@ -4156,11 +4385,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 >@@ -4193,12 +4423,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 >@@ -4214,7 +4444,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" >@@ -4226,40 +4456,48 @@ > > > 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 "${PRIVATE_LIBRSYNC_TRUE}" && test -z "${PRIVATE_LIBRSYNC_FALSE}"; then >- { { echo "$as_me:$LINENO: error: conditional \"PRIVATE_LIBRSYNC\" was never defined. >+ { { $as_echo "$as_me:$LINENO: error: conditional \"PRIVATE_LIBRSYNC\" was never defined. > Usually this means the macro was only invoked conditionally." >&5 >-echo "$as_me: error: conditional \"PRIVATE_LIBRSYNC\" was never defined. >+$as_echo "$as_me: error: conditional \"PRIVATE_LIBRSYNC\" was never defined. > Usually this means the macro was only invoked conditionally." >&2;} > { (exit 1); exit 1; }; } > fi > if test -z "${PRIVATE_LIBSQLITE_TRUE}" && test -z "${PRIVATE_LIBSQLITE_FALSE}"; then >- { { echo "$as_me:$LINENO: error: conditional \"PRIVATE_LIBSQLITE\" was never defined. >+ { { $as_echo "$as_me:$LINENO: error: conditional \"PRIVATE_LIBSQLITE\" was never defined. > Usually this means the macro was only invoked conditionally." >&5 >-echo "$as_me: error: conditional \"PRIVATE_LIBSQLITE\" was never defined. >+$as_echo "$as_me: error: conditional \"PRIVATE_LIBSQLITE\" was never defined. >+Usually this means the macro was only invoked conditionally." >&2;} >+ { (exit 1); exit 1; }; } >+fi >+if test -z "${HAVE_LIBGNUTLS_TRUE}" && test -z "${HAVE_LIBGNUTLS_FALSE}"; then >+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGNUTLS\" was never defined. >+Usually this means the macro was only invoked conditionally." >&5 >+$as_echo "$as_me: error: conditional \"HAVE_LIBGNUTLS\" 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. >@@ -4272,7 +4510,7 @@ > SHELL=\${CONFIG_SHELL-$SHELL} > _ACEOF > >-cat >>$CONFIG_STATUS <<\_ACEOF >+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 > ## --------------------- ## > ## M4sh Initialization. ## > ## --------------------- ## >@@ -4282,7 +4520,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 >@@ -4304,17 +4542,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. >@@ -4330,8 +4596,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. >@@ -4354,7 +4618,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 > >@@ -4367,17 +4631,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 && >@@ -4399,7 +4656,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 >@@ -4450,7 +4707,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 >@@ -4478,7 +4735,6 @@ > *) > ECHO_N='-n';; > esac >- > if expr a : '\(a\)' >/dev/null 2>&1 && > test "X`expr 00001 : '.*\(...\)'`" = X001; then > as_expr=expr >@@ -4491,19 +4747,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 >@@ -4528,10 +4787,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 >@@ -4554,7 +4813,7 @@ > # values after options handling. > ac_log=" > This file was extended by csync2 $as_me 1.34, which was >-generated by GNU Autoconf 2.61. Invocation command line was >+generated by GNU Autoconf 2.63. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > CONFIG_HEADERS = $CONFIG_HEADERS >@@ -4567,7 +4826,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" >@@ -4575,22 +4843,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 >@@ -4604,24 +4873,25 @@ > Report bugs to <bug-autoconf@gnu.org>." > > _ACEOF >-cat >>$CONFIG_STATUS <<_ACEOF >+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 > ac_cs_version="\\ > csync2 config.status 1.34 >-configured by $0, generated by GNU Autoconf 2.61, >- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" >+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." > > ac_pwd='$ac_pwd' > srcdir='$srcdir' > INSTALL='$INSTALL' >+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 >@@ -4643,30 +4913,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; }; } ;; > >@@ -4685,27 +4961,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 > # >@@ -4713,7 +4991,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 >@@ -4723,8 +5001,8 @@ > "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; > "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; > >- *) { { 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 >@@ -4765,152 +5043,144 @@ > (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_cr=' ' >+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` >+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then >+ ac_cs_awk_cr='\\r' >+else >+ ac_cs_awk_cr=$ac_cr >+fi >+ >+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 >-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 >-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 >-AMTAR!$AMTAR$ac_delim >-install_sh!$install_sh$ac_delim >-STRIP!$STRIP$ac_delim >-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim >-AWK!$AWK$ac_delim >-SET_MAKE!$SET_MAKE$ac_delim >-am__leading_dot!$am__leading_dot$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 >-YACC!$YACC$ac_delim >-YFLAGS!$YFLAGS$ac_delim >-LEX!$LEX$ac_delim >-LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim >-LEXLIB!$LEXLIB$ac_delim >-librsync_source_file!$librsync_source_file$ac_delim >-PRIVATE_LIBRSYNC_TRUE!$PRIVATE_LIBRSYNC_TRUE$ac_delim >-PRIVATE_LIBRSYNC_FALSE!$PRIVATE_LIBRSYNC_FALSE$ac_delim >-libsqlite_source_file!$libsqlite_source_file$ac_delim >-PRIVATE_LIBSQLITE_TRUE!$PRIVATE_LIBSQLITE_TRUE$ac_delim >-PRIVATE_LIBSQLITE_FALSE!$PRIVATE_LIBSQLITE_FALSE$ac_delim >-LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim >-LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim >-LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$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` = 87; 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 || 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 >+' <conf$$subs.awk | sed ' >+/^[^""]/{ >+ N >+ s/\n// >+} >+' >>$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 = "" > >-cat >>$CONFIG_STATUS <<_ACEOF >-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof >-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end >+} >+{ >+ 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 >-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 <conf$$subs.sed >-rm -f conf$$subs.sed >-cat >>$CONFIG_STATUS <<_ACEOF >-:end >-s/|#_!!_#|//g >-CEOF$ac_eof >+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 > # trailing colons and then remove the whole line if VPATH becomes empty >@@ -4926,19 +5196,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 > >-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS >+# 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 >+' <confdefs.h | sed ' >+s/'"$ac_delim"'/"\\\ >+"/g' >>$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" >+ >+ >+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;; >@@ -4967,26 +5351,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 >@@ -4996,7 +5392,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 >@@ -5022,7 +5418,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" >@@ -5031,7 +5427,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 >@@ -5052,17 +5448,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/ ;; >@@ -5102,12 +5498,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 > } >@@ -5116,13 +5513,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 >@@ -5136,15 +5534,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 >@@ -5154,135 +5553,74 @@ > s&@abs_top_builddir@&$ac_abs_top_builddir&;t t > s&@INSTALL@&$ac_INSTALL&;t t > $ac_datarootdir_hack >-" $ac_file_inputs | sed -f "$tmp/subs-1.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. >+# Compute "$ac_file"'s index in $config_headers. > _am_stamp_count=1 > for _am_header in $config_headers :; do > case $_am_header in >- $ac_file | $ac_file:* ) >+ "$ac_file" | "$ac_file":* ) > break ;; > * ) > _am_stamp_count=`expr $_am_stamp_count + 1` ;; > esac > done >-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || >-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >- X$ac_file : 'X\(//\)[^/]' \| \ >- X$ac_file : 'X\(//\)$' \| \ >- X$ac_file : 'X\(/\)' \| . 2>/dev/null || >-echo X$ac_file | >+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || >+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$ac_file" : 'X\(//\)[^/]' \| \ >+ X"$ac_file" : 'X\(//\)$' \| \ >+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || >+$as_echo X"$ac_file" | > sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > s//\1/ > q >@@ -5302,8 +5640,8 @@ > 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 > >@@ -5324,7 +5662,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 >@@ -5374,7 +5712,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 >@@ -5400,7 +5738,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" >@@ -5409,7 +5747,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 >@@ -5430,8 +5768,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" >@@ -5448,6 +5786,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. >@@ -5469,5 +5812,8 @@ > # 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 > >diff -ruNd /root/csync2-1.34/configure.ac ./configure.ac >--- /root/csync2-1.34/configure.ac 2007-07-24 23:04:19.000000000 +0200 >+++ ./configure.ac 2009-11-21 09:53:27.000000000 +0100 >@@ -17,11 +17,11 @@ > # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > # Process this file with autoconf to produce a configure script. >-AC_INIT(csync2, 1.34, clifford@clifford.at) >+AC_INIT([csync2],[1.34],[clifford@clifford.at]) > AM_INIT_AUTOMAKE > > AC_CONFIG_SRCDIR(csync2.c) >-AM_CONFIG_HEADER(config.h) >+AC_CONFIG_HEADERS([config.h]) > > # Use /etc and /var instead of $prefix/... > test "$localstatedir" = '${prefix}/var' && localstatedir=/var >@@ -52,25 +52,19 @@ > AM_CONDITIONAL([PRIVATE_LIBSQLITE], [test -n "$libsqlite_source_file"]) > > AC_ARG_ENABLE([gnutls], >- [AC_HELP_STRING([--disable-gnutls], >- [enable/disable GNU TLS support (default is enabled)])], >+ [AS_HELP_STRING([--disable-gnutls],[enable/disable GNU TLS support (default is enabled)])], > [], [ enable_gnutls=yes ]) > > if test "$enable_gnutls" != no > then >- > # Check for gnuTLS. > AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ]) > >- # This is a bloody hack for fedora core >+ ## This is a bloody hack for fedora core > CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" > LIBS="$LIBS $LIBGNUTLS_LIBS -ltasn1" >- >- # Check gnuTLS SSL compatibility lib. >- AC_CHECK_LIB([gnutls-openssl], [SSL_new], , [AC_MSG_ERROR([[gnutls-openssl not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]])]) >- > fi >+AM_CONDITIONAL([HAVE_LIBGNUTLS], [test "$enable_gnutls" != no ]) > > AC_CONFIG_FILES([Makefile]) > AC_OUTPUT >- >diff -ruNd /root/csync2-1.34/conn.c ./conn.c >--- /root/csync2-1.34/conn.c 2007-07-24 23:04:18.000000000 +0200 >+++ ./conn.c 2009-11-21 09:53:58.000000000 +0100 >@@ -30,21 +30,20 @@ > #include <netdb.h> > #include <errno.h> > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > # include <gnutls/gnutls.h> >-# include <gnutls/openssl.h> >+# include <gnutls/x509.h> > #endif > > int conn_fd_in = -1; > int conn_fd_out = -1; > int conn_clisok = 0; > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > int csync_conn_usessl = 0; > >-SSL_METHOD *conn_ssl_meth; >-SSL_CTX *conn_ssl_ctx; >-SSL *conn_ssl; >+static gnutls_session_t conn_tls_session; >+static gnutls_certificate_credentials_t conn_x509_cred; > #endif > > int conn_open(const char *peername) >@@ -83,7 +82,7 @@ > > conn_fd_out = conn_fd_in; > conn_clisok = 1; >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > csync_conn_usessl = 0; > #endif > >@@ -97,7 +96,7 @@ > conn_fd_in = infd; > conn_fd_out = outfd; > conn_clisok = 1; >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > csync_conn_usessl = 0; > #endif > >@@ -110,43 +109,106 @@ > } > > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > >-char *ssl_keyfile = ETCDIR "/csync2_ssl_key.pem"; >-char *ssl_certfile = ETCDIR "/csync2_ssl_cert.pem"; >+static void ssl_log(int level, const char* msg) >+{ csync_debug(level, "%s", msg); } >+ >+static const char *ssl_keyfile = ETCDIR "/csync2_ssl_key.pem"; >+static const char *ssl_certfile = ETCDIR "/csync2_ssl_cert.pem"; > > int conn_activate_ssl(int server_role) > { >- static int sslinit = 0; >+ gnutls_alert_description_t alrt; >+ int err; > > if (csync_conn_usessl) > return 0; > >- if (!sslinit) { >- SSL_load_error_strings(); >- SSL_library_init(); >- sslinit=1; >+ gnutls_global_init(); >+ gnutls_global_set_log_function(ssl_log); >+ gnutls_global_set_log_level(10); >+ >+ gnutls_certificate_allocate_credentials(&conn_x509_cred); >+ >+ err = gnutls_certificate_set_x509_key_file(conn_x509_cred, ssl_certfile, ssl_keyfile, GNUTLS_X509_FMT_PEM); >+ if(err != GNUTLS_E_SUCCESS) { >+ gnutls_certificate_free_credentials(conn_x509_cred); >+ gnutls_global_deinit(); >+ >+ csync_fatal( >+ "SSL: failed to use key file %s and/or certificate file %s: %s (%s)\n", >+ ssl_keyfile, >+ ssl_certfile, >+ gnutls_strerror(err), >+ gnutls_strerror_name(err) >+ ); > } > >- conn_ssl_meth = (server_role ? SSLv23_server_method : SSLv23_client_method)(); >- conn_ssl_ctx = SSL_CTX_new(conn_ssl_meth); >+ if(server_role) { >+ gnutls_certificate_free_cas(conn_x509_cred); > >- if (SSL_CTX_use_PrivateKey_file(conn_ssl_ctx, ssl_keyfile, SSL_FILETYPE_PEM) <= 0) >- csync_fatal("SSL: failed to use key file %s.\n", ssl_keyfile); >+ if(gnutls_certificate_set_x509_trust_file(conn_x509_cred, ssl_certfile, GNUTLS_X509_FMT_PEM) < 1) { >+ gnutls_certificate_free_credentials(conn_x509_cred); >+ gnutls_global_deinit(); > >- if (SSL_CTX_use_certificate_file(conn_ssl_ctx, ssl_certfile, SSL_FILETYPE_PEM) <= 0) >- csync_fatal("SSL: failed to use certificate file %s.\n", ssl_certfile); >+ csync_fatal( >+ "SSL: failed to use certificate file %s as CA.\n", >+ ssl_certfile >+ ); >+ } >+ } else >+ gnutls_certificate_free_ca_names(conn_x509_cred); > >- if (! (conn_ssl = SSL_new(conn_ssl_ctx)) ) >- csync_fatal("Creating a new SSL handle failed.\n"); >+ gnutls_init(&conn_tls_session, (server_role ? GNUTLS_SERVER : GNUTLS_CLIENT)); >+ gnutls_priority_set_direct(conn_tls_session, "PERFORMANCE", NULL); >+ gnutls_credentials_set(conn_tls_session, GNUTLS_CRD_CERTIFICATE, conn_x509_cred); > >- gnutls_certificate_server_set_request(conn_ssl->gnutls_state, GNUTLS_CERT_REQUIRE); >+ if(server_role) { >+ gnutls_certificate_send_x509_rdn_sequence(conn_tls_session, 0); >+ gnutls_certificate_server_set_request(conn_tls_session, GNUTLS_CERT_REQUIRE); >+ } > >- SSL_set_rfd(conn_ssl, conn_fd_in); >- SSL_set_wfd(conn_ssl, conn_fd_out); >+ gnutls_transport_set_ptr2( >+ conn_tls_session, >+ (gnutls_transport_ptr_t)conn_fd_in, >+ (gnutls_transport_ptr_t)conn_fd_out >+ ); > >- if ( (server_role ? SSL_accept : SSL_connect)(conn_ssl) < 1 ) >- csync_fatal("Establishing SSL connection failed.\n"); >+ err = gnutls_handshake(conn_tls_session); >+ switch(err) { >+ case GNUTLS_E_SUCCESS: >+ break; >+ >+ case GNUTLS_E_WARNING_ALERT_RECEIVED: >+ alrt = gnutls_alert_get(conn_tls_session); >+ fprintf( >+ csync_debug_out, >+ "SSL: warning alert received from peer: %d (%s).\n", >+ alrt, gnutls_alert_get_name(alrt) >+ ); >+ break; >+ >+ case GNUTLS_E_FATAL_ALERT_RECEIVED: >+ alrt = gnutls_alert_get(conn_tls_session); >+ fprintf( >+ csync_debug_out, >+ "SSL: fatal alert received from peer: %d (%s).\n", >+ alrt, gnutls_alert_get_name(alrt) >+ ); >+ >+ default: >+ gnutls_bye(conn_tls_session, GNUTLS_SHUT_RDWR); >+ gnutls_deinit(conn_tls_session); >+ gnutls_certificate_free_credentials(conn_x509_cred); >+ gnutls_global_deinit(); >+ >+ csync_fatal( >+ "SSL: handshake failed: %s (%s)\n", >+ gnutls_strerror(err), >+ gnutls_strerror_name(err) >+ ); >+ } > > csync_conn_usessl = 1; > >@@ -155,15 +217,15 @@ > > int conn_check_peer_cert(const char *peername, int callfatal) > { >- const X509 *peercert; >+ const gnutls_datum_t *peercerts; >+ unsigned npeercerts; > int i, cert_is_ok = -1; > > if (!csync_conn_usessl) > return 1; > >- peercert = SSL_get_peer_certificate(conn_ssl); >- >- if (!peercert || peercert->size <= 0) { >+ peercerts = gnutls_certificate_get_peers(conn_tls_session, &npeercerts); >+ if(peercerts == NULL || npeercerts == 0) { > if (callfatal) > csync_fatal("Peer did not provide an SSL X509 cetrificate.\n"); > csync_debug(1, "Peer did not provide an SSL X509 cetrificate.\n"); >@@ -171,11 +233,11 @@ > } > > { >- char certdata[peercert->size*2 + 1]; >+ char certdata[2*peercerts[0].size + 1]; > >- for (i=0; i<peercert->size; i++) >- sprintf(certdata+i*2, "%02X", peercert->data[i]); >- certdata[peercert->size*2] = 0; >+ for (i=0; i<peercerts[0].size; i++) >+ sprintf(&certdata[2*i], "%02X", peercerts[0].data[i]); >+ certdata[2*i] = 0; > > SQL_BEGIN("Checking peer x509 certificate.", > "SELECT certdata FROM x509_cert WHERE peername = '%s'", >@@ -215,14 +277,19 @@ > return 1; > } > >-#endif /* HAVE_LIBGNUTLS_OPENSSL */ >+#endif /* HAVE_LIBGNUTLS */ > > int conn_close() > { > if ( !conn_clisok ) return -1; > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >- if ( csync_conn_usessl ) SSL_free(conn_ssl); >+#ifdef HAVE_LIBGNUTLS >+ if ( csync_conn_usessl ) { >+ gnutls_bye(conn_tls_session, GNUTLS_SHUT_RDWR); >+ gnutls_deinit(conn_tls_session); >+ gnutls_certificate_free_credentials(conn_x509_cred); >+ gnutls_global_deinit(); >+ } > #endif > > if ( conn_fd_in != conn_fd_out) close(conn_fd_in); >@@ -237,9 +304,9 @@ > > static inline int READ(void *buf, size_t count) > { >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > if (csync_conn_usessl) >- return SSL_read(conn_ssl, buf, count); >+ return gnutls_record_recv(conn_tls_session, buf, count); > else > #endif > return read(conn_fd_in, buf, count); >@@ -249,9 +316,9 @@ > { > static int n, total; > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > if (csync_conn_usessl) >- return SSL_write(conn_ssl, buf, count); >+ return gnutls_record_send(conn_tls_session, buf, count); > else > #endif > { >diff -ruNd /root/csync2-1.34/csync2.c ./csync2.c >--- /root/csync2-1.34/csync2.c 2007-07-24 23:04:18.000000000 +0200 >+++ ./csync2.c 2009-11-21 09:53:27.000000000 +0100 >@@ -482,7 +482,7 @@ > para = cmd ? strtok(0, "\t \r\n") : 0; > > if (cmd && !strcasecmp(cmd, "ssl")) { >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > conn_printf("OK (activating_ssl).\n"); > conn_activate_ssl(1); > >diff -ruNd /root/csync2-1.34/csync2.h ./csync2.h >--- /root/csync2-1.34/csync2.h 2007-07-24 23:04:18.000000000 +0200 >+++ ./csync2.h 2009-11-21 09:53:27.000000000 +0100 >@@ -328,7 +328,7 @@ > > extern int csync_compare_mode; > >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > extern int csync_conn_usessl; > #endif > >diff -ruNd /root/csync2-1.34/daemon.c ./daemon.c >--- /root/csync2-1.34/daemon.c 2007-07-24 23:04:18.000000000 +0200 >+++ ./daemon.c 2009-11-21 09:53:27.000000000 +0100 >@@ -465,7 +465,7 @@ > cmd_error = "Identification failed!"; > break; > } >-#ifdef HAVE_LIBGNUTLS_OPENSSL >+#ifdef HAVE_LIBGNUTLS > if (!csync_conn_usessl) { > struct csync_nossl *t; > for (t = csync_nossl; t; t=t->next) { >diff -ruNd /root/csync2-1.34/m4/libgnutls.m4 ./m4/libgnutls.m4 >--- /root/csync2-1.34/m4/libgnutls.m4 1970-01-01 01:00:00.000000000 +0100 >+++ ./m4/libgnutls.m4 2009-11-21 09:53:27.000000000 +0100 >@@ -0,0 +1,173 @@ >+dnl Autoconf macros for libgnutls >+dnl $id$ >+ >+# Modified for LIBGNUTLS -- nmav >+# Configure paths for LIBGCRYPT >+# Shamelessly stolen from the one of XDELTA by Owen Taylor >+# Werner Koch 99-12-09 >+# 10-years-old code is not as good as brandy would... >+# gnutls now uses pkg-config and doesn't ship gnutls-config anymore. >+# Giampaolo Tomassoni 2009-09-15 >+ >+dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) >+dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS >+dnl >+AC_DEFUN([AM_PATH_LIBGNUTLS], >+[dnl >+dnl Get the cflags and libraries from the libgnutls-config script >+dnl >+AC_ARG_WITH(libgnutls-prefix, >+ [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], >+ libgnutls_config_prefix="$withval", libgnutls_config_prefix="") >+ >+ min_libgnutls_version=ifelse([$1], ,0.1.0,$1) >+ AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) >+ >+ PKG_CHECK_EXISTS( >+ gnutls, >+ [ >+ LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls` >+ LIBGNUTLS_LIBS=`$PKG_CONFIG --libs gnutls` >+ libgnutls_config_version=`$PKG_CONFIG --modversion gnutls` >+ ], >+ [ >+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config,, [$libgnutls_config_prefix/bin$PATH_SEPARATOR$PATH]) >+ if test "$LIBGNUTLS_CONFIG"=no >+ then >+ no_libgnutls=yes >+ echo "Can't obtain gnutls package info!" >&2 >+ fi >+ >+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` >+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` >+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` >+ ] >+ ) >+ >+ if test "$no_libgnutls" != no >+ then >+ ac_save_CFLAGS="$CFLAGS" >+ ac_save_LIBS="$LIBS" >+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >+ LIBS="$LIBS $LIBGNUTLS_LIBS" >+ >+dnl >+dnl Now check if the installed libgnutls is sufficiently new. Also sanity >+dnl checks the results of libgnutls-config to some extent >+dnl >+ rm -f conf.libgnutlstest >+ AC_TRY_RUN([ >+#include <stdio.h> >+#include <stdlib.h> >+#include <string.h> >+#include <gnutls/gnutls.h> >+ >+int >+main () >+{ >+ system ("touch conf.libgnutlstest"); >+ >+ if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) >+ { >+ printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", >+ "$libgnutls_config_version", gnutls_check_version(NULL) ); >+ printf("*** was found! If libgnutls-config was correct, then it is best\n"); >+ printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); >+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); >+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); >+ printf("*** required on your system.\n"); >+ printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); >+ printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); >+ printf("*** before re-running configure\n"); >+ } >+ else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) >+ { >+ printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); >+ printf("*** library (version %s)\n", gnutls_check_version(NULL) ); >+ } >+ else >+ { >+ if ( gnutls_check_version( "$min_libgnutls_version" ) ) >+ { >+ return 0; >+ } >+ else >+ { >+ printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", >+ gnutls_check_version(NULL) ); >+ printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", >+ "$min_libgnutls_version" ); >+ printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); >+ printf("*** \n"); >+ printf("*** If you have already installed a sufficiently new version, this error\n"); >+ printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); >+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); >+ printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); >+ printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); >+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); >+ printf("*** so that the correct libraries are found at run-time))\n"); >+ } >+ } >+ return 1; >+} >+],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) >+ CFLAGS="$ac_save_CFLAGS" >+ LIBS="$ac_save_LIBS" >+ fi >+ >+ if test "x$no_libgnutls" = x ; then >+ AC_MSG_RESULT(yes) >+ ifelse([$2], , :, [$2]) >+ >+ AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define to 1 if you have the `gnutls' library (-lgnutls).]) >+ else >+ if test -f conf.libgnutlstest ; then >+ : >+ else >+ AC_MSG_RESULT(no) >+ fi >+ if test "$LIBGNUTLS_CONFIG" = "no" ; then >+ echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" >+ echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" >+ echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" >+ echo "*** full path to libgnutls-config." >+ else >+ if test -f conf.libgnutlstest ; then >+ : >+ else >+ echo "*** Could not run libgnutls test program, checking why..." >+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" >+ LIBS="$LIBS $LIBGNUTLS_LIBS" >+ AC_TRY_LINK([ >+#include <stdio.h> >+#include <stdlib.h> >+#include <string.h> >+#include <gnutls/gnutls.h> >+], [ return !!gnutls_check_version(NULL); ], >+ [ echo "*** The test program compiled, but did not run. This usually means" >+ echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" >+ echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" >+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" >+ echo "*** to the installed location Also, make sure you have run ldconfig if that" >+ echo "*** is required on your system" >+ echo "***" >+ echo "*** If you have an old version installed, it is best to remove it, although" >+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" >+ echo "***" ], >+ [ echo "*** The test program failed to compile or link. See the file config.log for the" >+ echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" >+ echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" >+ echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) >+ CFLAGS="$ac_save_CFLAGS" >+ LIBS="$ac_save_LIBS" >+ fi >+ fi >+ LIBGNUTLS_CFLAGS="" >+ LIBGNUTLS_LIBS="" >+ ifelse([$3], , :, [$3]) >+ fi >+ >+ rm -f conf.libgnutlstest >+ AC_SUBST(LIBGNUTLS_CFLAGS) >+ AC_SUBST(LIBGNUTLS_LIBS) >+]) >diff -ruNd /root/csync2-1.34/update.c ./update.c >--- /root/csync2-1.34/update.c 2007-07-24 23:04:18.000000000 +0200 >+++ ./update.c 2009-11-21 09:53:27.000000000 +0100 >@@ -70,7 +70,7 @@ > if ( conn_open(peername) ) return -1; > > if ( use_ssl ) { >-#if HAVE_LIBGNUTLS_OPENSSL >+#if HAVE_LIBGNUTLS > conn_printf("SSL\n"); > if ( read_conn_status(0, peername) ) { > csync_debug(1, "SSL command failed.\n");
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=210768">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 274213
:
194765
|
204892
|
205047
|
205049
|
206362
|
210757
| 210768
