Ignore:
Timestamp:
Sep 14, 2014, 7:27:18 PM (6 years ago)
Author:
cal@…
Message:

base: Avoid using $GZIP and $BZIP2, since those might be interpreted as flags and cause the build to fail, e.g. #43245

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r120074 r125362  
    119119dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
    120120AC_DEFUN([MP_CONFIG_TARBALL], [
    121         AC_PATH_PROG(GZIP, [gzip], [])
    122         AC_PATH_PROG(BZIP2, [bzip2], [])
     121        dnl Warning: Don't use $GZIP and $BZIP2 here, both tools interpret these
     122        dnl env variables as additional parameters.
     123        AC_PATH_PROG(GZIP_BIN, [gzip], [])
     124        AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
    123125
    124126        mp_tarball="$1"
     
    133135                case "$mp_tarball" in
    134136                        *.tar.gz | *.tgz)
    135                                 if test "x$GZIP" = "x"; then
     137                                if test "x$GZIP_BIN" = "x"; then
    136138                                        AC_MSG_ERROR([gzip not found])
    137139                                fi
    138                                 mp_tarball_extract_cmd="$GZIP"
     140                                mp_tarball_extract_cmd="$GZIP_BIN"
    139141                                ;;
    140142                        *.tar.bz2 | *.tbz2)
    141                                 if test "x$BZIP2" = "x"; then
     143                                if test "x$BZIP2_BIN" = "x"; then
    142144                                        AC_MSG_ERROR([bzip2 not found])
    143145                                fi
    144                                 mp_tarball_extract_cmd="$BZIP2"
     146                                mp_tarball_extract_cmd="$BZIP2_BIN"
    145147                                ;;
    146148                        *)
Note: See TracChangeset for help on using the changeset viewer.