Import upstream version 0.11~rc3~r2502

3 files changed, 21 insertions, 10 deletions

diff --git a/infrastructure/m4/ax_check_dirent_d_type.m4 b/infrastructure/m4/ax_check_dirent_d_type.m4
index 9c08d391..078a39ee 100644
--- a/infrastructure/m4/ax_check_dirent_d_type.m4
+++ b/infrastructure/m4/ax_check_dirent_d_type.m4
@@ -17,15 +17,17 @@ AC_DEFUN([AX_CHECK_DIRENT_D_TYPE], [
   if test "x$ac_cv_member_struct_dirent_d_type" = "xyes"; then
     AC_CACHE_CHECK([[whether struct dirent.d_type is valid]], [box_cv_have_valid_dirent_d_type],
       [AC_TRY_RUN(
-        [AC_LANG_PROGRAM([[
+        [
           $ac_includes_default
           #include <dirent.h>
-          ]], [[
+          int main()
+          {
           DIR* dir = opendir(".");
           struct dirent* res = NULL;
           if(dir) res = readdir(dir);
           return res ? (res->d_type != DT_FILE && res->d_type != DT_DIR) : 1;
-        ]])],
+          }
+        ],
         [box_cv_have_valid_dirent_d_type=yes],
 	[box_cv_have_valid_dirent_d_type=no],
 	[box_cv_have_valid_dirent_d_type=cross]
diff --git a/infrastructure/m4/ax_check_syscall_lseek.m4 b/infrastructure/m4/ax_check_syscall_lseek.m4
index 6c26e025..9fd04c81 100644
--- a/infrastructure/m4/ax_check_syscall_lseek.m4
+++ b/infrastructure/m4/ax_check_syscall_lseek.m4
@@ -17,7 +17,7 @@ AC_DEFUN([AX_CHECK_SYSCALL_LSEEK], [
   if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then
     AC_CACHE_CHECK([[whether syscall lseek requires dummy parameter]], [box_cv_have_lseek_dummy_param],
       [AC_TRY_RUN(
-        [AC_LANG_PROGRAM([[
+        [
           $ac_includes_default
           #include <fcntl.h>
           #include <sys/syscall.h>
@@ -28,7 +28,8 @@ AC_DEFUN([AX_CHECK_SYSCALL_LSEEK], [
             #undef syscall
             #define syscall __syscall
           #endif
-          ]], [[
+          int main()
+          {
           int fh = creat("lseektest", 0600);
           int res = 0;
           if(fh>=0)
@@ -49,7 +50,8 @@ AC_DEFUN([AX_CHECK_SYSCALL_LSEEK], [
           }
           unlink("lseektest");
           return res!=-1;
-        ]])],
+          }
+        ],
         [box_cv_have_lseek_dummy_param=yes],
 	[box_cv_have_lseek_dummy_param=no],
 	[box_cv_have_lseek_dummy_param=no # assume not for cross-compiling]
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
index e9e240db..cc54b23f 100755
--- a/infrastructure/makeparcels.pl.in
+++ b/infrastructure/makeparcels.pl.in
@@ -25,6 +25,13 @@ sub os_matches ($)
 	return 0;
 }
 
+my $copy_command = "cp -p";
+
+if ($build_os eq 'CYGWIN')
+{
+	$copy_command = "cp -pu"; # faster
+}
+
 open PARCELS,"parcels.txt" or die "Can't open parcels file";
 {
 	my $cur_parcel = '';
@@ -168,7 +175,7 @@ for my $parcel (@parcels)
 			print MAKE <<EOF;
 $dir/$name$exeext: release/bin/$name/$name$exeext
 	mkdir -p $dir
-	cp -p release/bin/$name/$name$exeext $dir
+	$copy_command release/bin/$name/$name$exeext $dir
 
 .PHONY: release/bin/$name/$name$exeext
 release/bin/$name/$name$exeext:
@@ -192,11 +199,11 @@ EOF
 			if ($optional)
 			{
 				print MAKE "\ttest -r $fullpath " .
-					"&& cp -p $fullpath $dir || true\n";
+					"&& $copy_command $fullpath $dir || true\n";
 			}
 			else
 			{
-				print MAKE "\tcp -p $fullpath $dir\n";
+				print MAKE "\t$copy_command $fullpath $dir\n";
 			}
 
 			print MAKE "\n";
@@ -208,7 +215,7 @@ EOF
 			print MAKE <<EOF;
 $dir/${name}.gz: docs/man/${name}.gz
 	mkdir -p $dir
-	cp -p docs/man/${name}.gz $dir
+	$copy_command docs/man/${name}.gz $dir
 
 EOF
 			# Releases have the docs pre-made, but users