Integrate local changes

1 files changed, 9 insertions, 4 deletions

diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index f2c3eabbcc8..dd3ce3fc14d 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -1856,7 +1856,7 @@ EOF
 
 fi
 
-for ac_func in mkdir rename strstr dup2 strerror valloc waitpid vasprintf strtoul
+for ac_func in mkdir rename strstr dup2 strerror valloc waitpid memmove vasprintf strtoul
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:1863: checking for $ac_func" >&5
@@ -3481,20 +3481,25 @@ EOF
 fi
 fi # enable_server
 
+cat >> confdefs.h <<\EOF
+#define PRESERVE_PERMISSIONS_SUPPORT 1
+EOF
+
+
 echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
-echo "configure:3486: checking for cygwin32" >&5
+echo "configure:3491: checking for cygwin32" >&5
 if eval "test \"`echo '$''{'ccvs_cv_sys_cygwin32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3491 "configure"
+#line 3496 "configure"
 #include "confdefs.h"
 
 int main() {
 return __CYGWIN32__;
 ; return 0; }
 EOF
-if { (eval echo configure:3498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ccvs_cv_sys_cygwin32=yes
 else