RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   30-Nov-2007 19:03:04
  Branch: HEAD                             Handle: 2007113018030400

  Modified files:
    rpm                     configure.ac

  Log:
    indicate that the 'lzma' here is the command line tool and use
    sub-shell constructs to more portably support the situation where no
    lzma(1) is in PATH at all (and hence the shell itself already
    complains with a confusing 'lzma: file not found')

  Summary:
    Revision    Changes     Path
    2.254       +4  -4      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.253 -r2.254 configure.ac
  --- rpm/configure.ac  30 Nov 2007 15:26:24 -0000      2.253
  +++ rpm/configure.ac  30 Nov 2007 18:03:04 -0000      2.254
  @@ -428,13 +428,13 @@
   fi
   AC_SUBST(__ID_U)
   
  -dnl # check whether we are using LZMA SDK or LZMA Utils variant of lzma.
  -AC_MSG_CHECKING(lzma variant)
  -if ${__LZMA} -V 2>&1 | grep "LZMA Utils" >/dev/null 2>&1; then
  +dnl # check whether we are using LZMA SDK or LZMA Utils variant of lzma(1).
  +AC_MSG_CHECKING(for lzma(1) variant)
  +if (${__LZMA} -V 2>&1 | grep "LZMA Utils") >/dev/null 2>&1; then
       AC_MSG_RESULT([LZMA Utils])
       __LZMA_ENCODE_ARGS="%{nil}"
       __LZMA_DECODE_ARGS="-dc"
  -elif ${__LZMA} -V 2>&1 | grep "^LZMA" >/dev/null 2>&1; then
  +elif (${__LZMA} -V 2>&1 | grep "^LZMA") >/dev/null 2>&1; then
       AC_MSG_RESULT([LZMA SDK])
       __LZMA_ENCODE_ARGS="e -si -so"
       __LZMA_DECODE_ARGS="d -si -so"
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to