From 9015326e327f721050f07618b14ea3d0a3d7ed2c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 15 Mar 2016 18:04:12 +0900
Subject: [PATCH] Bug 1256990 - Move tar detection to moz.configure.
 r=chmanchester

---
 build/moz.configure/init.configure | 1 +
 js/src/old-configure.in            | 8 --------
 moz.configure                      | 1 +
 old-configure.in                   | 6 ------
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 7176c4b6a16f..f92c674b4725 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -260,6 +260,7 @@ def wanted_mozconfig_variables(help):
          'MOZ_BUILD_APP',
          'PERL',
          'RPMBUILD',
+         'TAR',
          'UNZIP',
          'XARGS',
          'ZIP',
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index b67e7278165d..c59eb68ea267 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -451,14 +451,6 @@ AC_SUBST(INTEL_CXX)
 dnl ========================================================
 dnl Checks for programs.
 dnl ========================================================
-AC_MSG_CHECKING([for tar archiver])
-AC_CHECK_PROGS(TAR, gnutar gtar tar, "")
-if test -z "$TAR"; then
-    AC_MSG_WARN([no tar archiver found in \$PATH])
-fi
-AC_MSG_RESULT([$TAR])
-AC_SUBST(TAR)
-
 if test -z "$COMPILE_ENVIRONMENT"; then
     NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py'
 fi
diff --git a/moz.configure b/moz.configure
index ca1cf11bf81a..84cb7f1f5da5 100644
--- a/moz.configure
+++ b/moz.configure
@@ -114,6 +114,7 @@ perl_version_check('5.006')
 # Miscellaneous programs
 # ==============================================================
 check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
+check_prog('TAR', ('gnutar', 'gtar', 'tar'))
 check_prog('UNZIP', ('unzip',))
 check_prog('XARGS', ('xargs',))
 check_prog('ZIP', ('zip',))
diff --git a/old-configure.in b/old-configure.in
index 5c09a474ebdf..197606f20820 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -5687,12 +5687,6 @@ if test "$OS_ARCH" = "WINNT"; then
     fi
 fi
 
-AC_CHECK_PROGS(TAR, gnutar gtar tar, "")
-if test -z "$TAR"; then
-    AC_MSG_ERROR([no tar archiver found in \$PATH])
-fi
-AC_SUBST(TAR)
-
 AC_CHECK_PROGS(WGET, wget, "")
 AC_SUBST(WGET)