summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-05-03 20:13:30 +0200
committerunknown <lenz@mysql.com>2002-05-03 20:13:30 +0200
commitf34a7fc24f48b7dbe1329e62cd89d48d9c9dbc61 (patch)
tree37e86e0e2876a73236770f055db0efe7c3b1ae5d
parent531d2a63eee5f02985a8b230c66a7b1b6721320c (diff)
downloadmariadb-git-f34a7fc24f48b7dbe1329e62cd89d48d9c9dbc61.tar.gz
Added "gnutar" to the TARs to check for, since this seems to be
how it's named on Mac OS X (thanks to Paul DuBois <paul@snake.net> for the hint) BitKeeper/etc/ignore: Added mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-4.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz to the ignore list configure.in: Added "gnutar" to AC_CHECK_PROGS(TAR) for MacOS
-rw-r--r--.bzrignore3
-rw-r--r--configure.in6
2 files changed, 6 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index 497008d103a..b813694c805 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -464,3 +464,6 @@ Docs/safe-mysql.xml
mysys/test_vsnprintf
Docs/manual.de.log
Docs/internals.info
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
diff --git a/configure.in b/configure.in
index 5e593d17dc4..fc85a2070b1 100644
--- a/configure.in
+++ b/configure.in
@@ -364,9 +364,9 @@ AC_PATH_PROG(SED, sed, sed)
AC_PATH_PROG(CMP, cmp, cmp)
AC_PATH_PROG(CHMOD, chmod, chmod)
AC_PATH_PROG(HOSTNAME, hostname, hostname)
-# Check for a GNU tar named 'gtar', fall back to 'tar' otherwise
-# and hope that it's a GNU tar as well
-AC_CHECK_PROGS(TAR, gtar tar)
+# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and
+# fall back to 'tar' otherwise and hope that it's a GNU tar as well
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
dnl We use a path for perl so the script startup works
dnl We make sure to use perl, not perl5, in hopes that the RPMs will
dnl not depend on the perl5 binary being installed (probably a bug in RPM)