diff -rc rsync-2.6.6.orig/checksum.c rsync-2.6.6/checksum.c *** rsync-2.6.6.orig/checksum.c Sun Jan 2 07:08:05 2005 --- rsync-2.6.6/checksum.c Thu Dec 1 09:55:33 2005 *************** *** 18,23 **** --- 18,24 ---- */ #include "rsync.h" + #include "zlib/zlib.h" int csum_length=2; /* initial value */ *************** *** 126,131 **** --- 127,159 ---- unmap_file(buf); } + uint32 file_crc32(char *fname, OFF_T size) + { + OFF_T i; + struct map_struct *buf; + int fd; + OFF_T len = size; + uint32 m = 0; + + fd = do_open(fname, O_RDONLY, 0); + if (fd == -1) + return 0; + + buf = map_file(fd, size, MAX_MAP_SIZE, CSUM_CHUNK); + + for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { + m = crc32(m, (uchar *)map_ptr(buf, i, CSUM_CHUNK), CSUM_CHUNK); + } + + if (len - i > 0) + m = crc32(m, (uchar *)map_ptr(buf, i, len-i), len-i); + + close(fd); + unmap_file(buf); + + return m; + } + static int32 sumresidue; static char sumrbuf[CSUM_CHUNK]; diff -rc rsync-2.6.6.orig/config.h.in rsync-2.6.6/config.h.in *** rsync-2.6.6.orig/config.h.in Sat Jun 11 02:47:15 2005 --- rsync-2.6.6/config.h.in Mon Nov 21 09:29:50 2005 *************** *** 14,19 **** --- 14,22 ---- /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA + /* true if ea support enabled */ + #undef EA_SUPPORT + /* Define to the type of elements in the array set by `getgroups'. Usually this is either `int' or `gid_t'. */ #undef GETGROUPS_T *************** *** 55,60 **** --- 58,69 ---- /* Define to 1 if you have the "connect" function */ #undef HAVE_CONNECT + /* Define to 1 if you have the `copyfile' function. */ + #undef HAVE_COPYFILE + + /* Define to 1 if you have the header file. */ + #undef HAVE_COPYFILE_H + /* Define to 1 if you have the header file. */ #undef HAVE_CTYPE_H diff -rc rsync-2.6.6.orig/configure rsync-2.6.6/configure *** rsync-2.6.6.orig/configure Fri Jul 29 05:31:05 2005 --- rsync-2.6.6/configure Fri Dec 2 23:10:39 2005 *************** *** 853,858 **** --- 853,860 ---- --disable-largefile omit support for large files --disable-ipv6 don't even try to use IPv6 --disable-locale turn off locale features + --enable-ea-support allow support for copying extended attributes + (default no) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] *************** *** 963,969 **** else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi ! cd "$ac_popdir" done fi --- 965,971 ---- else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi ! cd $ac_popdir done fi *************** *** 2004,2010 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2006,2013 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2062,2068 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2065,2072 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2178,2184 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2182,2189 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2232,2238 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2237,2244 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2277,2283 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2283,2290 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2321,2327 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2328,2335 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3027,3033 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3035,3042 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3056,3062 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3065,3072 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3126,3132 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3136,3143 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3178,3184 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3189,3196 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3249,3255 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3261,3268 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3301,3307 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3314,3321 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3594,3600 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3608,3615 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3648,3654 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3663,3670 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3732,3738 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3748,3755 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3774,3780 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3791,3798 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3831,3837 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3849,3856 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3964,3970 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3983,3990 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4036,4042 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4056,4063 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4090,4096 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4111,4118 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4161,4167 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4183,4190 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4215,4221 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4238,4245 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4282,4288 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4306,4313 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4352,4358 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4377,4384 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4416,4422 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4442,4449 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4586,4592 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4613,4620 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4683,4689 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4711,4718 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4827,4833 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4856,4863 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 4884,4890 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 4914,4921 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5031,5037 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5062,5069 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5182,5188 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5214,5221 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5244,5250 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5277,5284 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5284,5290 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5318,5325 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5340,5346 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5375,5382 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5380,5386 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5416,5423 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5444,5450 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5481,5488 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5475,5482 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 5513,5522 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 5588,5594 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5628,5635 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5650,5656 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5691,5698 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5690,5696 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5732,5739 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5746,5752 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5789,5796 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5786,5792 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5830,5837 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5850,5856 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 5895,5902 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 5881,5888 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 5927,5936 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 5994,6000 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6042,6049 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6056,6062 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6105,6112 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6096,6102 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6146,6153 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6152,6158 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6203,6210 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6192,6198 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6244,6251 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6256,6262 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6309,6316 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6287,6294 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 6341,6350 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 6400,6406 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6456,6463 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6462,6468 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6519,6526 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6502,6508 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6560,6567 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6558,6564 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6617,6624 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6598,6604 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6658,6665 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6662,6668 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6723,6730 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6693,6700 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 6755,6764 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 6806,6812 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6870,6877 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6868,6874 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6933,6940 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6908,6914 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 6974,6981 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 6964,6970 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7031,7038 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7004,7010 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7072,7079 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7068,7074 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7137,7144 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7099,7106 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 7169,7178 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 7212,7218 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7284,7291 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7274,7280 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7347,7354 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7314,7320 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7388,7395 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7370,7376 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7445,7452 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7410,7416 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7486,7493 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7474,7480 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7551,7558 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7505,7512 **** esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ! echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF --- 7583,7592 ---- esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF *************** *** 7616,7622 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7696,7703 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7691,7697 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7772,7779 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7762,7768 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7844,7851 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7861,7867 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 7944,7951 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7926,7932 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8010,8017 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 7991,7997 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8076,8083 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8056,8062 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8142,8149 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8207,8213 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8294,8301 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8250,8256 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8338,8345 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8320,8326 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8409,8416 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8390,8396 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8480,8487 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8464,8470 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8555,8562 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8572,8578 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8664,8671 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8646,8652 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8739,8746 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8722,8728 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8816,8823 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8798,8804 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8893,8900 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8874,8880 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 8970,8977 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 8960,8966 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9057,9064 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9065,9071 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9163,9170 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9175,9181 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9274,9281 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9323,9329 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9423,9430 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9381,9387 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9482,9489 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9489,9495 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9591,9598 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9584,9590 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9687,9694 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9631,9637 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9735,9742 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9701,9707 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9806,9813 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9749,9755 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9855,9862 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9819,9825 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9926,9933 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9867,9873 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 9975,9982 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9928,9934 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10037,10044 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 9992,9998 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10102,10109 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10040,10046 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10151,10158 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10115,10121 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10227,10234 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10214,10220 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10327,10334 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10286,10292 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10400,10407 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10419,10425 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10534,10541 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10500,10506 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10616,10623 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10641,10647 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10758,10765 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10859,10865 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 10977,10984 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 10962,10968 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11081,11088 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11025,11031 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11145,11152 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11220,11226 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11341,11348 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11308,11314 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11430,11437 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11424,11430 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11547,11554 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11486,11492 **** cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 11610,11617 ---- cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 11926,11931 **** --- 12051,12335 ---- + + ################################################# + # check for extended attribute support + echo "$as_me:$LINENO: checking whether to support extended attributes" >&5 + echo $ECHO_N "checking whether to support extended attributes... $ECHO_C" >&6 + # Check whether --enable-ea-support or --disable-ea-support was given. + if test "${enable_ea_support+set}" = set; then + enableval="$enable_ea_support" + + fi; + echo "$as_me:$LINENO: result: $enable_ea_support" >&5 + echo "${ECHO_T}$enable_ea_support" >&6 + if test x"$enable_ea_support" == x"yes"; then + + cat >>confdefs.h <<\_ACEOF + #define EA_SUPPORT 1 + _ACEOF + + + for ac_func in copyfile + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ + #define $ac_func innocuous_$ac_func + + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + + #ifdef __STDC__ + # include + #else + # include + #endif + + #undef $ac_func + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + { + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + char (*f) () = $ac_func; + #endif + #ifdef __cplusplus + } + #endif + + int + main () + { + return f != $ac_func; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + case $LIBOBJS in + "lib/copyfile.$ac_objext" | \ + *" lib/copyfile.$ac_objext" | \ + "lib/copyfile.$ac_objext "* | \ + *" lib/copyfile.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS lib/copyfile.$ac_objext" ;; + esac + + fi + done + + + for ac_header in copyfile.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 + echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## + ## Report this to the AC_PACKAGE_NAME lists. ## + ## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + fi + ac_config_files="$ac_config_files Makefile lib/dummy zlib/dummy popt/dummy shconfig" cat >confcache <<\_ACEOF *************** *** 12742,12747 **** --- 13146,13156 ---- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # 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. */ *************** *** 12780,12791 **** fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub --- 13189,13194 ---- diff -rc rsync-2.6.6.orig/configure.in rsync-2.6.6/configure.in *** rsync-2.6.6.orig/configure.in Fri Jul 29 05:31:05 2005 --- rsync-2.6.6/configure.in Fri Dec 2 23:10:31 2005 *************** *** 745,750 **** --- 745,765 ---- AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) + + ################################################# + # check for extended attribute support + AC_MSG_CHECKING(whether to support extended attributes) + AC_ARG_ENABLE(ea-support, + AC_HELP_STRING([--enable-ea-support], + [allow support for copying extended attributes (default no)]), + [], []) + AC_MSG_RESULT($enable_ea_support) + if test x"$enable_ea_support" == x"yes"; then + AC_DEFINE(EA_SUPPORT, 1, [true if ea support enabled]) + AC_CHECK_FUNCS(copyfile, [AC_LIBOBJ(lib/copyfile)],) + AC_CHECK_HEADERS(copyfile.h) + fi + AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT diff -rc rsync-2.6.6.orig/flist.c rsync-2.6.6/flist.c *** rsync-2.6.6.orig/flist.c Fri Jul 8 05:49:14 2005 --- rsync-2.6.6/flist.c Fri Aug 18 20:23:09 2006 *************** *** 59,64 **** --- 59,73 ---- extern int orig_umask; extern struct stats stats; extern struct file_list *the_file_list; + #ifdef EA_SUPPORT + extern char *tmpdir; + extern int extended_attributes; + #ifdef HAVE_COPYFILE + extern int hfs_export; + extern int hfs_import; + extern int ea_checksum; + #endif + #endif extern char curr_dir[MAXPATHLEN]; *************** *** 699,704 **** --- 708,717 ---- dev = read_longint(f); inode = read_longint(f); } + #ifdef EA_SUPPORT + if (extended_attributes && protocol_version <= 28) + if (strncmp(file->basename, "._", 2) != 0) + #endif if (flist->hlink_pool) { file->link_u.idev = pool_talloc(flist->hlink_pool, struct idev, 1, "inode_table"); *************** *** 798,804 **** enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FINFO; io_error |= IOERR_VANISHED; ! rprintf(c, "file has vanished: %s\n", full_fname(thisname)); } } else { --- 811,817 ---- enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FINFO; io_error |= IOERR_VANISHED; ! rprintf(c, "flist: file has vanished: %s\n", full_fname(thisname)); } } else { *************** *** 979,987 **** --- 992,1111 ---- flist_expand(flist); + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if (file->basename[0] && extended_attributes && strncmp(file->basename, "._", 2) == 0) { + char dst_fname[MAXPATHLEN]; + if (file->dirname) + snprintf(dst_fname, MAXPATHLEN, "%s/%s", file->dirname, file->basename + 2); + else + snprintf(dst_fname, MAXPATHLEN, "%s", file->basename + 2); + + if (!copyfile(dst_fname, NULL, 0, + COPYFILE_NOFOLLOW | COPYFILE_CHECK | COPYFILE_METADATA)) { + return NULL; + } + } + #endif + #endif + if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + /* If the file doesn't begin with "._", and has + * either acls or extended attributes, serialize + * the data out and add a fake file to the file + * list with the "._" prepended to the basename. + * of the original source. + */ + if (extended_attributes || hfs_export) { + if(strncmp(file->basename, "._", 2) != 0 + && !(hfs_export && S_ISLNK(file->mode)) + && (copyfile(fname, NULL, 0, + COPYFILE_NOFOLLOW | COPYFILE_CHECK | COPYFILE_METADATA) > 0)) { + char *bp; + struct file_struct *file2 = NULL; + int alloc_len; + STRUCT_STAT st; + char dst_fname[MAXPATHLEN]; + char fname_tmp[MAXPATHLEN]; + int fd; + + if (file->dirname) + snprintf(dst_fname, MAXPATHLEN, "%s/._%s", file->dirname, file->basename); + else + snprintf(dst_fname, MAXPATHLEN, "._%s", file->basename); + + if (verbose > 4) + rprintf(FINFO, "added synthetic file for: %s\n", fname); + + alloc_len = file_struct_len + + strlen(file->basename) + 1 + 2 // + strlen("._") + + (always_checksum ? MD4_SUM_LENGTH : 0); + + bp = pool_alloc(flist->file_pool, alloc_len, "send_metadata_entry"); + + file2 = (struct file_struct *)bp; + memcpy(file2, file, file_struct_len); + bp += file_struct_len; + + file2->basename = bp; + memcpy(bp + 2, file->basename, strlen(file->basename) + 1); + file2->basename[0] = '.'; + file2->basename[1] = '_'; + bp += strlen(file2->basename) + 1; + + file2->uid = file->uid; + file2->gid = file->gid; + file2->length = 1; + file2->mode = S_IFREG | (file->mode & CHMOD_BITS); + file2->flags = 0; + file2->link_u.idev = 0; + + if (link_stat(dst_fname, &st, 0)==0) + file2->modtime = st.st_mtime; + else if (link_stat(fname, &st, 0)==0) + file2->modtime = st.st_ctime; + else + file2->modtime = file->modtime; + + if (tmpdir == NULL) + tmpdir = "/tmp"; + + if((always_checksum || ea_checksum) && + get_tmpname(fname_tmp, file2->basename) && (fd = mkstemp(fname_tmp)) != -1) { + close(fd); + if(copyfile(fname, fname_tmp, 0, + COPYFILE_NOFOLLOW | COPYFILE_PACK | COPYFILE_METADATA)==0) { + if (link_stat(fname_tmp, &st, 0) == 0) { + if (!always_checksum) { + /* Use the modtime field to store a CRC-32 checksum */ + file2->modtime = file_crc32(fname_tmp, st.st_size); + file2->length = st.st_size; + } else { + file2->u.sum = bp; + memset(bp, 0, MD4_SUM_LENGTH); + file_checksum(fname_tmp, bp, st.st_size); + file2->length = st.st_size; + } + } + } + do_unlink(fname_tmp); + } + + flist_expand(flist); + flist->files[flist->count++] = file2; + if (extended_attributes && protocol_version <= 28 && f != -1) + write_byte(f, 1); + send_file_entry(file2, f, base_flags); + } + if (extended_attributes && protocol_version <= 28 && f != -1) + write_byte(f, 0); + } + #endif + #endif } return file; } *************** *** 1318,1323 **** --- 1442,1452 ---- flags |= read_byte(f) << 8; file = receive_file_entry(flist, flags, f); + #ifdef EA_SUPPORT + if (extended_attributes && protocol_version <= 28) + read_byte(f); + #endif + if (S_ISREG(file->mode)) stats.total_size += file->length; *************** *** 1623,1628 **** --- 1752,1773 ---- enum fnc_type type1, type2; enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM; + #ifdef EA_SUPPORT + int ea1 = 0; + int ea2 = 0; + + #ifdef HAVE_COPYFILE + if ((extended_attributes && protocol_version >= 29) || hfs_import > 1) { + #else + if (extended_attributes && protocol_version >= 29) { + #endif + if (f1 && f1->basename) + ea1 = strncmp(f1->basename, "._", 2) == 0; + if (f2 && f2->basename) + ea2 = strncmp(f2->basename, "._", 2) == 0; + } + #endif + if (!f1 || !f1->basename) { if (!f2 || !f2->basename) return 0; *************** *** 1637,1642 **** --- 1782,1792 ---- c1 = c2 = NULL; if (!c1) { type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; + #ifdef EA_SUPPORT + if (ea1) + c1 = (uchar*)f1->basename + 2; + else + #endif c1 = (uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; *************** *** 1654,1659 **** --- 1804,1814 ---- } if (!c2) { type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; + #ifdef EA_SUPPORT + if (ea2) + c2 = (uchar*)f2->basename + 2; + else + #endif c2 = (uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; *************** *** 1684,1689 **** --- 1839,1849 ---- break; case s_SLASH: type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; + #ifdef EA_SUPPORT + if (ea1) + c1 = (uchar*)f1->basename + 2; + else + #endif c1 = (uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; *************** *** 1714,1719 **** --- 1874,1884 ---- break; case s_SLASH: type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; + #ifdef EA_SUPPORT + if (ea2) + c2 = (uchar*)f2->basename + 2; + else + #endif c2 = (uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; *************** *** 1730,1737 **** } /* FALL THROUGH */ case s_TRAILING: ! if (!*c1) return 0; type2 = t_ITEM; break; } --- 1895,1911 ---- } /* FALL THROUGH */ case s_TRAILING: ! if (!*c1) { ! #ifdef EA_SUPPORT ! if (ea1 && ea2) ! return 0; ! if (ea1) ! return 1; ! if (ea2) ! return -1; ! #endif return 0; + } type2 = t_ITEM; break; } *************** *** 1739,1745 **** return type1 == t_PATH ? 1 : -1; } } - return dif; } --- 1913,1918 ---- diff -rc rsync-2.6.6.orig/generator.c rsync-2.6.6/generator.c *** rsync-2.6.6.orig/generator.c Fri Jul 29 05:06:03 2005 --- rsync-2.6.6/generator.c Fri Aug 18 17:06:22 2006 *************** *** 23,28 **** --- 23,34 ---- #include "rsync.h" + #ifdef HAVE_COPYFILE + #include + #include + #include + #endif + extern int verbose; extern int dry_run; extern int do_xfers; *************** *** 88,93 **** --- 94,105 ---- extern int backup_suffix_len; extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; + #ifdef EA_SUPPORT + extern char *tmpdir; + extern int extended_attributes; + extern int hfs_import; + extern int ea_checksum; + #endif static int deletion_count = 0; /* used to implement --max-delete */ *************** *** 109,114 **** --- 121,168 ---- int j, dlen, zap_dir, ok; void *save_filters; + #ifdef EA_SUPPORT + STRUCT_STAT st; + #endif + + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if ((extended_attributes) && strncmp(basename(fname), "._", 2) == 0 + && link_stat(fname, &st, 0) < 0) { + char fname_src[MAXPATHLEN]; + ssize_t nsize; + char *name; + char *namebuf; + int flags = 0; + + snprintf(fname_src, MAXPATHLEN, "%s/%s", dirname(fname), basename(fname) + 2); + + /* delete EAs on destination */ + if (link_stat(fname_src, &st, 0) >= 0 && (nsize = listxattr(fname_src, 0, 0, 0)) > 0) { + if (make_backups && (backup_dir || !is_backup_file(fname_src))) + ok = make_backup(fname_src); + if (verbose>4) + rprintf(FINFO, "deleting metadata from %s\n", safe_fname(fname_src)); + + if (dry_run) + return 0; + + if ((namebuf = (char *) malloc(nsize)) != NULL) { + nsize = listxattr(fname_src, namebuf, nsize, 0); + + if (nsize > 0) + for (name = namebuf; name < namebuf + nsize; name += strlen(name) + 1) + removexattr(fname_src, name, flags); + + free(namebuf); + set_modtime(fname_src, st.st_mtime); + return 0; + } + } + } + #endif + #endif + if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) return 0; *************** *** 359,364 **** --- 413,473 ---- /* Perform our quick-check heuristic for determining if a file is unchanged. */ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { + + #ifdef EA_SUPPORT + if (extended_attributes && strncmp(file->basename, "._", 2) == 0) { + STRUCT_STAT st2; + char fname_src[MAXPATHLEN]; + char fname_tmp[MAXPATHLEN]; + int fd; + + if (file->dirname) + snprintf(fname_src, MAXPATHLEN, "%s/%s", file->dirname, file->basename + 2); + else + snprintf(fname_src, MAXPATHLEN, "%s", file->basename + 2); + + if ((link_stat(fname_src, &st2, 0) < 0) || + (preserve_hard_links && protocol_version <= 28)) + return 0; + + #ifdef HAVE_COPYFILE + if (tmpdir == NULL) + tmpdir = "/tmp"; + + if ((always_checksum || ea_checksum) && + get_tmpname(fname_tmp,file->basename) && (fd = do_mkstemp(fname_tmp, INITACCESSPERMS)) != -1) { + close(fd); + if (copyfile(fname_src, fname_tmp, NULL, + COPYFILE_NOFOLLOW | COPYFILE_PACK | COPYFILE_METADATA) == 0) { + + if(link_stat(fname_tmp, &st2, 0) < 0) + return 0; + + if (always_checksum) { + char sum[MD4_SUM_LENGTH]; + memset(sum, 0, MD4_SUM_LENGTH); + + file_checksum(fname_tmp,sum,st2.st_size); + unlink(fname_tmp); + + return memcmp(sum, file->u.sum, + protocol_version < 21 ? 2 : MD4_SUM_LENGTH) == 0; + } else { + int sum; + + sum = file_crc32(fname_tmp, st2.st_size); + unlink(fname_tmp); + return file->modtime == sum; + } + } + unlink(fname_tmp); + return 0; + } + #endif + if (ignore_times) + return 0; + } + #endif if (st->st_size != file->length) return 0; *************** *** 821,826 **** --- 930,940 ---- return; } + #ifdef EA_SUPPORT + if (extended_attributes && protocol_version <= 28) + if (strncmp(fname, "._", 2) != 0) + #endif + if (preserve_hard_links && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_CHECK_MASTER)) *************** *** 992,997 **** --- 1106,1119 ---- } } + #ifdef EA_SUPPORT + if (extended_attributes && strncmp(file->basename, "._", 2) == 0) { + if (unchanged_file(fnamecmp, file, &st)) { + return; + } + } + #endif + if (statret != 0) { if (preserve_hard_links && hard_link_check(file, ndx, fname, statret, &st, *************** *** 1017,1022 **** --- 1139,1147 ---- itemize(file, ndx, real_ret, &real_st, 0, 0, NULL); } + #ifdef EA_SUPPORT + if (!(strncmp(file->basename, "._", 2) == 0 && ea_checksum)) + #endif set_perms(fname, file, &st, maybe_PERMS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); *************** *** 1138,1143 **** --- 1263,1274 ---- close(fd); } + #ifdef EA_SUPPORT + static int file_compare(struct file_struct **file1, struct file_struct **file2) + { + return f_name_cmp(*file1, *file2); + } + #endif void generate_files(int f_out, struct file_list *flist, char *local_name) { *************** *** 1152,1157 **** --- 1283,1292 ---- int save_opt_ignore_existing = opt_ignore_existing; int save_do_progress = do_progress; int save_make_backups = make_backups; + #ifdef HAVE_COPYFILE + int ea_map[flist->count]; + int ea_saved = -1; + #endif if (protocol_version >= 29) { itemizing = 1; *************** *** 1195,1203 **** --- 1330,1378 ---- * notice that and let us know via the redo pipe (or its closing). */ ignore_timeout = 1; + #ifdef HAVE_COPYFILE + /* Extended attribute files (._foo) need to be transferred + * after the corresponding file (foo). This creates a map the size + * of flist with a re-sorted file order to ensure this occurs. + */ + if ((extended_attributes && protocol_version <= 28) || hfs_import) { + + struct file_list *sort_list; + + flist->low = 0; + flist->high = flist->count -1; + + sort_list = flist_new(0, "sort_file_list"); + memcpy(sort_list, flist, sizeof(struct file_list)); + + sort_list->files = new_array(struct file_struct *, flist->count); + memcpy(sort_list->files, flist->files, sizeof(flist->files[0]) * flist->count); + + hfs_import += 2; + qsort(sort_list->files, sort_list->count, + sizeof sort_list->files[0], (int (*)())file_compare); + hfs_import -= 2; + + for (i = 0; i < flist->count; ++i) { + ea_map[i] = flist_find(flist, sort_list->files[i]); + } + + free(sort_list->files); + free(sort_list); + } + #endif + for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; + #ifdef HAVE_COPYFILE + if ((extended_attributes && protocol_version <= 28) || hfs_import) { + ea_saved = i; + i = ea_map[i]; + file = flist->files[i]; + } + #endif + if (!file->basename) continue; *************** *** 1227,1232 **** --- 1402,1412 ---- maybe_send_keepalive(); else if (!(i % 200)) maybe_flush_socket(); + + #ifdef HAVE_COPYFILE + if ((extended_attributes && protocol_version <= 28) || hfs_import) + i = ea_saved; + #endif } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) *************** *** 1315,1317 **** --- 1495,1498 ---- if (verbose > 2) rprintf(FINFO,"generate_files finished\n"); } + diff -rc rsync-2.6.6.orig/main.c rsync-2.6.6/main.c *** rsync-2.6.6.orig/main.c Thu May 12 17:43:14 2005 --- rsync-2.6.6/main.c Thu Nov 24 10:35:38 2005 *************** *** 57,62 **** --- 57,65 ---- extern int batch_fd; extern int batch_gen_fd; extern int filesfrom_fd; + #ifdef EA_SUPPORT + extern int extended_attributes; + #endif extern pid_t cleanup_child_pid; extern struct stats stats; extern char *filesfrom_host; *************** *** 407,412 **** --- 410,421 ---- } return NULL; } + #ifdef EA_SUPPORT + if (extended_attributes) { + if(flist->count == 2 && strncmp(flist->files[1]->basename, "._", 2) == 0) + return name; + } + #endif if (flist->count > 1) { rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n"); exit_cleanup(RERR_FILESELECT); *************** *** 414,419 **** --- 423,434 ---- return name; } + #ifdef EA_SUPPORT + if (extended_attributes) { + if(flist->count == 2 && strncmp(flist->files[1]->basename, "._", 2) == 0) + return name; + } + #endif if (flist->count <= 1 && ((e = strlen(name)) <= 1 || name[e-1] != '/')) return name; diff -rc rsync-2.6.6.orig/options.c rsync-2.6.6/options.c *** rsync-2.6.6.orig/options.c Thu May 19 18:52:17 2005 --- rsync-2.6.6/options.c Fri Dec 2 23:17:59 2005 *************** *** 106,112 **** int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ ! /** Network address family. **/ #ifdef INET6 --- 106,119 ---- int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ ! #ifdef EA_SUPPORT ! int extended_attributes = 0; ! #ifdef HAVE_COPYFILE ! int hfs_export = 0; ! int hfs_import = 0; ! int ea_checksum = 0; ! #endif ! #endif /** Network address family. **/ #ifdef INET6 *************** *** 348,353 **** --- 355,368 ---- rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); rprintf(F," --protocol=NUM force an older protocol version to be used\n"); + #ifdef EA_SUPPORT + rprintf(F," -E, --extended-attributes copy extended attributes\n"); + #ifdef HAVE_COPYFILE + rprintf(F," -X, --hfs-export export extended attributes\n"); + rprintf(F," --hfs-import import to HFS volume with extended attributes\n"); + rprintf(F," --ea-checksum always checksum extended attributes\n"); + #endif + #endif #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); *************** *** 460,465 **** --- 475,488 ---- {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, + #ifdef EA_SUPPORT + {"extended-attributes", 'E', POPT_ARG_NONE, &extended_attributes, 0, 0, 0 }, + #ifdef HAVE_COPYFILE + {"hfs-export", 'X', POPT_ARG_NONE, &hfs_export, 0, 0, 0 }, + {"hfs-import", 0, POPT_ARG_NONE, &hfs_import, 0, 0, 0 }, + {"ea-checksum", 0, POPT_ARG_NONE, &ea_checksum, 0, 0, 0 }, + #endif + #endif #ifdef INET6 {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, *************** *** 1129,1135 **** --- 1152,1182 ---- if (delay_updates && !partial_dir) partial_dir = partialdir_for_delayupdate; + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if (ea_checksum && !extended_attributes) { + snprintf(err_buf, sizeof err_buf, + "--ea-checksum can only be used when --extended-attributes is enabled\n"); + return 0; + } + #endif + #endif + if (inplace) { + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if (hfs_import) { + snprintf(err_buf, sizeof err_buf, + "--inplace cannot be used with --hfs_import\n"); + return 0; + } + #endif + if (extended_attributes) { + snprintf(err_buf, sizeof err_buf, + "--inplace cannot be used with --extended-attributes\n"); + return 0; + } + #endif #ifdef HAVE_FTRUNCATE if (partial_dir) { snprintf(err_buf, sizeof err_buf, *************** *** 1310,1315 **** --- 1357,1366 ---- argstr[x++] = 'S'; if (do_compression) argstr[x++] = 'z'; + #ifdef EA_SUPPORT + if (extended_attributes) + argstr[x++] = 'E'; + #endif /* This is a complete hack - blame Rusty. FIXME! * This hack is only needed for older rsync versions that *************** *** 1336,1341 **** --- 1387,1399 ---- args[ac++] = "--log-format=X"; } + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if (ea_checksum) + args[ac++] = "--ea-checksum"; + #endif + #endif + if (block_size) { if (asprintf(&arg, "-B%lu", block_size) < 0) goto oom; diff -rc rsync-2.6.6.orig/proto.h rsync-2.6.6/proto.h *** rsync-2.6.6.orig/proto.h Fri Jul 8 05:49:14 2005 --- rsync-2.6.6/proto.h Tue Feb 14 12:22:53 2006 *************** *** 15,20 **** --- 15,21 ---- uint32 get_checksum1(char *buf1, int32 len); void get_checksum2(char *buf, int32 len, char *sum); void file_checksum(char *fname,char *sum,OFF_T size); + uint32 file_crc32(char *fname, OFF_T size); void sum_init(int seed); void sum_update(char *p, int32 len); void sum_end(char *sum); *************** *** 211,216 **** --- 212,218 ---- int (*child_main)(int, char*[])); void end_progress(OFF_T size); void show_progress(OFF_T ofs, OFF_T size); + int get_tmpname(char *fnametmp, char *fname); int recv_files(int f_in, struct file_list *flist, char *local_name); void free_sums(struct sum_struct *s); int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, *************** *** 251,256 **** --- 253,259 ---- int do_fstat(int fd, STRUCT_STAT *st); OFF_T do_lseek(int fd, OFF_T offset, int whence); char *d_name(struct dirent *di); + int do_copyfile(const char *from, const char *to, copyfile_state_t state, copyfile_flags_t flags); void set_compression(char *fname); void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset, int32 n, int32 toklen); diff -rc rsync-2.6.6.orig/receiver.c rsync-2.6.6/receiver.c *** rsync-2.6.6.orig/receiver.c Thu Apr 14 11:42:13 2005 --- rsync-2.6.6/receiver.c Thu Dec 1 21:40:13 2005 *************** *** 20,25 **** --- 20,31 ---- #include "rsync.h" + #ifdef HAVE_COPYFILE + #include + #include + #include + #endif + extern int verbose; extern int do_xfers; extern int am_daemon; *************** *** 56,61 **** --- 62,70 ---- extern char *basis_dir[]; extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; + #ifdef EA_SUPPORT + extern int extended_attributes; + #endif #define SLOT_SIZE (16*1024) /* Desired size in bytes */ #define PER_SLOT_BITS (SLOT_SIZE * 8) /* Number of bits per slot */ *************** *** 143,149 **** * As long as it's unique, rsync will work. */ ! static int get_tmpname(char *fnametmp, char *fname) { char *f; int length = 0; --- 152,158 ---- * As long as it's unique, rsync will work. */ ! int get_tmpname(char *fnametmp, char *fname) { char *f; int length = 0; *************** *** 426,432 **** --- 435,462 ---- continue; file = flist->files[i]; + + #ifdef HAVE_COPYFILE + if (local_name) + { + if ((extended_attributes) + && (strncmp(file->basename, "._", 2) == 0)) { + if (strchr(local_name, '/')) { + snprintf(fbuf, MAXPATHLEN, "%s/._%s", + dirname(local_name), basename(local_name)); + } else { + snprintf(fbuf, MAXPATHLEN, "._%s", local_name); + errno = 0; + } + fname = fbuf; + } else + fname = local_name; + } else + fname = f_name_to(file, fbuf); + #else fname = local_name ? local_name : f_name_to(file, fbuf); + #endif + if (verbose > 2) rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); diff -rc rsync-2.6.6.orig/rsync.c rsync-2.6.6/rsync.c *** rsync-2.6.6.orig/rsync.c Tue Mar 15 03:06:08 2005 --- rsync-2.6.6/rsync.c Tue Mar 21 00:54:02 2006 *************** *** 22,27 **** --- 22,31 ---- #include "rsync.h" + #ifdef HAVE_COPYFILE + #include + #endif + extern int verbose; extern int dry_run; extern int daemon_log_format_has_i; *************** *** 38,43 **** --- 42,53 ---- extern int keep_dirlinks; extern int make_backups; extern struct stats stats; + #ifdef EA_SUPPORT + extern int extended_attributes; + #ifdef HAVE_COPYFILE + extern int hfs_import; + #endif + #endif /* *************** *** 177,182 **** --- 187,218 ---- goto do_set_perms; } + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if(extended_attributes || hfs_import) + { + if(strncmp(basename(fname), "._", 2) == 0) + { + char dst_fname[MAXPATHLEN]; + STRUCT_STAT st; + + snprintf(dst_fname, MAXPATHLEN, "%s/%s", dirname(fname), basename(fname) + 2); + if(link_stat(dst_fname, &st, 0) == 0 && + do_copyfile(fnametmp, dst_fname, 0, + COPYFILE_NOFOLLOW | COPYFILE_UNPACK | COPYFILE_METADATA) >= 0) { + if (verbose>4) + rprintf(FINFO, "copied metadata to %s\n", dst_fname); + file->mode = st.st_mode; + file->modtime = st.st_mtime; + set_perms(dst_fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + } + unlink(fnametmp); + return; + } + } + #endif + #endif + if (make_backups && overwriting_basis && !make_backup(fname)) return; diff -rc rsync-2.6.6.orig/rsync.h rsync-2.6.6/rsync.h *** rsync-2.6.6.orig/rsync.h Wed May 4 03:00:47 2005 --- rsync-2.6.6/rsync.h Tue Feb 14 12:22:16 2006 *************** *** 638,643 **** --- 638,647 ---- #include "lib/permstring.h" #include "lib/addrinfo.h" + #ifdef HAVE_COPYFILE_H + #include "copyfile.h" + #endif + #include "proto.h" /* We have replacement versions of these if they're missing. */ diff -rc rsync-2.6.6.orig/sender.c rsync-2.6.6/sender.c *** rsync-2.6.6.orig/sender.c Thu May 19 18:52:24 2005 --- rsync-2.6.6/sender.c Sat Feb 4 10:52:03 2006 *************** *** 40,46 **** extern struct stats stats; extern struct file_list *the_file_list; extern char *log_format; ! /** * @file --- 40,49 ---- extern struct stats stats; extern struct file_list *the_file_list; extern char *log_format; ! #ifdef EA_SUPPORT ! extern int extended_attributes; ! extern int hfs_export; ! #endif /** * @file *************** *** 286,291 **** --- 289,330 ---- return; } + #ifdef EA_SUPPORT + #ifdef HAVE_COPYFILE + if ((extended_attributes || hfs_export) + && (strncmp(file->basename, "._", 2) == 0)) { + char fname_tmp[MAXPATHLEN]; + char fname_src[MAXPATHLEN]; + extern char *tmpdir; + + if (tmpdir == NULL) + tmpdir = "/tmp"; + + strlcpy(fname_src, fname, MAXPATHLEN); + + if (file->dirname) + sprintf(fname_src + offset, "%s/%s", + file->dirname, file->basename + 2); + else + strlcpy(fname_src + offset, file->basename + 2, MAXPATHLEN); + + if(get_tmpname(fname_tmp, file->basename) && (fd = mkstemp(fname_tmp))) { + if (!copyfile(fname_src, fname_tmp, NULL, + COPYFILE_NOFOLLOW | COPYFILE_PACK | COPYFILE_METADATA)) { + } else { + fd = do_open(fname, O_RDONLY, 0); + } + do_unlink(fname_tmp); + } + else + { + rprintf(FERROR, "send_files failed to create temp file while opening %s: %s\n", + full_fname(fname_src), strerror(errno)); + continue; + } + } else + #endif + #endif fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { if (errno == ENOENT) { *************** *** 293,299 **** && protocol_version < 28 ? FERROR : FINFO; io_error |= IOERR_VANISHED; ! rprintf(c, "file has vanished: %s\n", full_fname(fname)); } else { io_error |= IOERR_GENERAL; --- 332,338 ---- && protocol_version < 28 ? FERROR : FINFO; io_error |= IOERR_VANISHED; ! rprintf(c, "sender: file has vanished: %s\n", full_fname(fname)); } else { io_error |= IOERR_GENERAL; diff -rc rsync-2.6.6.orig/syscall.c rsync-2.6.6/syscall.c *** rsync-2.6.6.orig/syscall.c Wed Apr 6 12:08:21 2005 --- rsync-2.6.6/syscall.c Fri Aug 18 17:31:00 2006 *************** *** 259,261 **** --- 259,275 ---- return di->d_name; #endif } + + #if HAVE_COPYFILE + int do_copyfile(const char *from, const char *to, copyfile_state_t state, copyfile_flags_t flags) + { + STRUCT_STAT st; + + if (dry_run) return 0; + + if (lstat(from, &st) < 0) + return -1; + + return copyfile(from, to, state, flags); + } + #endif diff -rc rsync-2.6.6.orig/t_unsafe.c rsync-2.6.6/t_unsafe.c *** rsync-2.6.6.orig/t_unsafe.c Wed Sep 10 18:27:34 2003 --- rsync-2.6.6/t_unsafe.c Mon Nov 21 23:16:03 2005 *************** *** 29,34 **** --- 29,37 ---- int dry_run, read_only, list_only, verbose; int preserve_perms = 0; + #ifdef EA_SUPPORT + int extended_attributes = 0; + #endif int diff -rc rsync-2.6.6.orig/tls.c rsync-2.6.6/tls.c *** rsync-2.6.6.orig/tls.c Thu Jan 20 05:30:29 2005 --- rsync-2.6.6/tls.c Mon Nov 21 09:29:51 2005 *************** *** 47,52 **** --- 47,55 ---- int read_only = 1; int list_only = 0; int preserve_perms = 0; + #ifdef EA_SUPPORT + int extended_attributes = 0; + #endif static void failed(char const *what, char const *where) diff -rc rsync-2.6.6.orig/trimslash.c rsync-2.6.6/trimslash.c *** rsync-2.6.6.orig/trimslash.c Wed Sep 10 18:27:34 2003 --- rsync-2.6.6/trimslash.c Mon Nov 21 09:29:51 2005 *************** *** 23,28 **** --- 23,31 ---- int read_only = 1; int list_only = 0; int preserve_perms = 0; + #ifdef EA_SUPPORT + int extended_attributes = 0; + #endif /** * @file trimslash.c diff -rc rsync-2.6.6.orig/util.c rsync-2.6.6/util.c *** rsync-2.6.6.orig/util.c Fri Jul 8 05:49:14 2005 --- rsync-2.6.6/util.c Tue Feb 14 12:22:02 2006 *************** *** 161,167 **** } } - /** Create any necessary directories in fname. Unfortunately we don't know what perms to give the directory when this is called so we need to rely --- 161,166 ----