[118453] trunk/base/aclocal.m4
cal at macports.org
cal at macports.org
Wed Apr 2 13:08:26 PDT 2014
Revision: 118453
https://trac.macports.org/changeset/118453
Author: cal at macports.org
Date: 2014-04-02 13:08:26 -0700 (Wed, 02 Apr 2014)
Log Message:
-----------
aclocal.m4: Use configured paths for bzip2 and gzip in MP_CONFIG_TARBALL
Modified Paths:
--------------
trunk/base/aclocal.m4
Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4 2014-04-02 19:45:03 UTC (rev 118452)
+++ trunk/base/aclocal.m4 2014-04-02 20:08:26 UTC (rev 118453)
@@ -109,6 +109,9 @@
dnl
dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
AC_DEFUN([MP_CONFIG_TARBALL], [
+ AC_PATH_PROG(GZIP, [gzip], [])
+ AC_PATH_PROG(BZIP2, [bzip2], [])
+
mp_tarball="$1"
ac_dir=$2
@@ -120,10 +123,16 @@
mp_tarball_extract_cmd=
case "$mp_tarball" in
*.tar.gz | *.tgz)
- mp_tarball_extract_cmd="gzip"
+ if test "x$GZIP" = "x"; then
+ AC_MSG_ERROR([gzip not found])
+ fi
+ mp_tarball_extract_cmd="$GZIP"
;;
*.tar.bz2 | *.tbz2)
- mp_tarball_extract_cmd="bzip2"
+ if test "x$BZIP2" = "x"; then
+ AC_MSG_ERROR([bzip2 not found])
+ fi
+ mp_tarball_extract_cmd="$BZIP2"
;;
*)
AC_MSG_ERROR([Don't know how to extract tarball $mp_tarball])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140402/06332353/attachment.html>
More information about the macports-changes
mailing list