Ticket #61276: tar_check.diff

aclocal.m4

@@ -1103 +1103 @@
         AC_SUBST(TAR_Q)
 ])
 
-dnl This macro tests for tar support of --no-same-owner
-AC_DEFUN([MP_TAR_NO_SAME_OWNER],[
+dnl This macro tests for tar support of --no-same-owner and
+dnl full-resolution timestamps
+AC_DEFUN([MP_TAR_CMD],[
         AC_PATH_PROG(TAR, [tar])
         AC_PATH_PROG(GNUTAR, [gnutar])
         
@@ -1121 +1122 @@
                 AC_MSG_RESULT([yes])
                 TAR_CMD="$TAR_CMD --no-same-owner"
         fi
+
+        AC_MSG_CHECKING([for $TAR_CMD full-resolution timestamp support])
+        MP_GNUTAR_VERSION="`$TAR_CMD --version 2>&1 | grep -E 'tar \(GNU tar\) [[0-9.]]+' | cut -d " " -f 4`"
+        MP_GNUTAR_NEW_ENOUGH=yes
+        if test -n "$MP_GNUTAR_VERSION"; then
+            MP_GNUTAR_VERSION_MAJOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`"
+            MP_GNUTAR_VERSION_MINOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`"
+            if test -n "$MP_GNUTAR_VERSION_MAJOR" -a -n "$MP_GNUTAR_VERSION_MINOR"; then
+                if test "$MP_GNUTAR_VERSION_MAJOR" -lt 1 -o "$MP_GNUTAR_VERSION_MAJOR" -eq 1 -a "$MP_GNUTAR_VERSION_MINOR" -lt 16; then
+                    MP_GNUTAR_NEW_ENOUGH=no
+                    TAR_CMD="$TAR_CMD -m"
+                fi
+            fi
+        fi
+        AC_MSG_RESULT([$MP_GNUTAR_NEW_ENOUGH])
 ])
 
 dnl This macro tests for GNU patch

configure

@@ -6386 +6386 @@
                 TAR_CMD="$TAR_CMD --no-same-owner"
         fi
 
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $TAR_CMD full-resolution timestamp support" >&5
+printf %s "checking for $TAR_CMD full-resolution timestamp support... " >&6; }
+        MP_GNUTAR_VERSION="`$TAR_CMD --version 2>&1 | grep -E 'tar \(GNU tar\) [0-9.]+' | cut -d " " -f 4`"
+        MP_GNUTAR_NEW_ENOUGH=yes
+        if test -n "$MP_GNUTAR_VERSION"; then
+            MP_GNUTAR_VERSION_MAJOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`"
+            MP_GNUTAR_VERSION_MINOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`"
+            if test -n "$MP_GNUTAR_VERSION_MAJOR" -a -n "$MP_GNUTAR_VERSION_MINOR"; then
+                if test "$MP_GNUTAR_VERSION_MAJOR" -lt 1 -o "$MP_GNUTAR_VERSION_MAJOR" -eq 1 -a "$MP_GNUTAR_VERSION_MINOR" -lt 16; then
+                    MP_GNUTAR_NEW_ENOUGH=no
+                    TAR_CMD="$TAR_CMD -m"
+                fi
+            fi
+        fi
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MP_GNUTAR_NEW_ENOUGH" >&5
+printf "%s\n" "$MP_GNUTAR_NEW_ENOUGH" >&6; }
+
 
         # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; ac_word=$2

configure.ac

@@ -183 +183 @@
 fi
 
 MP_TAR_FAST_READ
-MP_TAR_NO_SAME_OWNER
+MP_TAR_CMD
 MP_PATCH_GNU_VERSION
 
 # Quiche eaters options.