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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   30-Nov-2007 15:53:55
  Branch: HEAD                             Handle: 2007113014535500

  Modified files:
    rpm                     configure.ac macros.in

  Log:
    add configure detection of lzma args

  Summary:
    Revision    Changes     Path
    2.252       +18 -0      rpm/configure.ac
    1.201       +3  -1      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.251 -r2.252 configure.ac
  --- rpm/configure.ac	12 Nov 2007 23:58:26 -0000	2.251
  +++ rpm/configure.ac	30 Nov 2007 14:53:55 -0000	2.252
  @@ -428,6 +428,24 @@
   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
  +    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
  +    AC_MSG_RESULT([LZMA SDK])
  +    __LZMA_ENCODE_ARGS="e -si -so"
  +    __LZMA_DECODE_ARGS="d -si -so"
  +else
  +    AC_MSG_RESULT(none)
  +    __LZMA_ENCODE_ARGS="%{nil}"
  +    __LZMA_DECODE_ARGS="%{nil}"
  +fi
  +AC_SUBST(__LZMA_ENCODE_ARGS)
  +AC_SUBST(__LZMA_DECODE_ARGS)
  +
   dnl # auto-detect whether doxygen generated API docs should be included.
   AC_PATH_PROG(__DOXYGEN, doxygen, no, $PATH)
   withval=auto
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.200 -r1.201 macros.in
  --- rpm/macros.in	30 Nov 2007 04:51:29 -0000	1.200
  +++ rpm/macros.in	30 Nov 2007 14:53:55 -0000	1.201
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.200 2007/11/30 04:51:29 jbj Exp $
  +# $Id: macros.in,v 1.201 2007/11/30 14:53:55 afb Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -64,6 +64,8 @@
   %__lua			@__LUA@
   %__ln_s			@LN_S@
   %__lzma			@__LZMA@
  +%__lzma_encode_args	@__LZMA_ENCODE_ARGS@
  +%__lzma_decode_args	@__LZMA_DECODE_ARGS@
   %__lzmash		@__LZMASH@
   %__lzop			@__LZOP@
   %__make			@__MAKE@
  @@ .