diff --git a/aclocal.m4 b/aclocal.m4
index 5777ecbd..9f66c1b6 100644
a
|
b
|
AC_DEFUN([MP_TAR_FAST_READ],[ |
1103 | 1103 | AC_SUBST(TAR_Q) |
1104 | 1104 | ]) |
1105 | 1105 | |
1106 | | dnl This macro tests for tar support of --no-same-owner |
1107 | | AC_DEFUN([MP_TAR_NO_SAME_OWNER],[ |
| 1106 | dnl This macro tests for tar support of --no-same-owner and |
| 1107 | dnl full-resolution timestamps |
| 1108 | AC_DEFUN([MP_TAR_CMD],[ |
1108 | 1109 | AC_PATH_PROG(TAR, [tar]) |
1109 | 1110 | AC_PATH_PROG(GNUTAR, [gnutar]) |
1110 | 1111 | |
… |
… |
AC_DEFUN([MP_TAR_NO_SAME_OWNER],[ |
1121 | 1122 | AC_MSG_RESULT([yes]) |
1122 | 1123 | TAR_CMD="$TAR_CMD --no-same-owner" |
1123 | 1124 | fi |
| 1125 | |
| 1126 | AC_MSG_CHECKING([for $TAR_CMD full-resolution timestamp support]) |
| 1127 | MP_GNUTAR_VERSION="`$TAR_CMD --version 2>&1 | grep -E 'tar \(GNU tar\) [[0-9.]]+' | cut -d " " -f 4`" |
| 1128 | MP_GNUTAR_NEW_ENOUGH=yes |
| 1129 | if test -n "$MP_GNUTAR_VERSION"; then |
| 1130 | MP_GNUTAR_VERSION_MAJOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`" |
| 1131 | MP_GNUTAR_VERSION_MINOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`" |
| 1132 | if test -n "$MP_GNUTAR_VERSION_MAJOR" -a -n "$MP_GNUTAR_VERSION_MINOR"; then |
| 1133 | if test "$MP_GNUTAR_VERSION_MAJOR" -lt 1 -o "$MP_GNUTAR_VERSION_MAJOR" -eq 1 -a "$MP_GNUTAR_VERSION_MINOR" -lt 16; then |
| 1134 | MP_GNUTAR_NEW_ENOUGH=no |
| 1135 | TAR_CMD="$TAR_CMD -m" |
| 1136 | fi |
| 1137 | fi |
| 1138 | fi |
| 1139 | AC_MSG_RESULT([$MP_GNUTAR_NEW_ENOUGH]) |
1124 | 1140 | ]) |
1125 | 1141 | |
1126 | 1142 | dnl This macro tests for GNU patch |
diff --git a/configure b/configure
index e71cddea..8d9ad0ef 100755
a
|
b
|
printf "%s\n" "yes" >&6; } |
6386 | 6386 | TAR_CMD="$TAR_CMD --no-same-owner" |
6387 | 6387 | fi |
6388 | 6388 | |
| 6389 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $TAR_CMD full-resolution timestamp support" >&5 |
| 6390 | printf %s "checking for $TAR_CMD full-resolution timestamp support... " >&6; } |
| 6391 | MP_GNUTAR_VERSION="`$TAR_CMD --version 2>&1 | grep -E 'tar \(GNU tar\) [0-9.]+' | cut -d " " -f 4`" |
| 6392 | MP_GNUTAR_NEW_ENOUGH=yes |
| 6393 | if test -n "$MP_GNUTAR_VERSION"; then |
| 6394 | MP_GNUTAR_VERSION_MAJOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`" |
| 6395 | MP_GNUTAR_VERSION_MINOR="`echo "$MP_GNUTAR_VERSION" | cut -d . -f 1`" |
| 6396 | if test -n "$MP_GNUTAR_VERSION_MAJOR" -a -n "$MP_GNUTAR_VERSION_MINOR"; then |
| 6397 | if test "$MP_GNUTAR_VERSION_MAJOR" -lt 1 -o "$MP_GNUTAR_VERSION_MAJOR" -eq 1 -a "$MP_GNUTAR_VERSION_MINOR" -lt 16; then |
| 6398 | MP_GNUTAR_NEW_ENOUGH=no |
| 6399 | TAR_CMD="$TAR_CMD -m" |
| 6400 | fi |
| 6401 | fi |
| 6402 | fi |
| 6403 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MP_GNUTAR_NEW_ENOUGH" >&5 |
| 6404 | printf "%s\n" "$MP_GNUTAR_NEW_ENOUGH" >&6; } |
| 6405 | |
6389 | 6406 | |
6390 | 6407 | # Extract the first word of "patch", so it can be a program name with args. |
6391 | 6408 | set dummy patch; ac_word=$2 |
diff --git a/configure.ac b/configure.ac
index d06d62b7..6c1ebf0d 100644
a
|
b
|
if test "x$MTREE" = "x"; then |
183 | 183 | fi |
184 | 184 | |
185 | 185 | MP_TAR_FAST_READ |
186 | | MP_TAR_NO_SAME_OWNER |
| 186 | MP_TAR_CMD |
187 | 187 | MP_PATCH_GNU_VERSION |
188 | 188 | |
189 | 189 | # Quiche eaters options. |