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: xar                              Date:   17-Dec-2007 09:02:53
  Branch: HEAD                             Handle: 2007121708025300

  Modified files:
    xar                     ChangeLog configure.ac

  Log:
    merge upstream

  Summary:
    Revision    Changes     Path
    1.13        +3  -0      xar/ChangeLog
    1.14        +17 -3      xar/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: xar/ChangeLog
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 ChangeLog
  --- xar/ChangeLog	9 Dec 2007 21:24:36 -0000	1.12
  +++ xar/ChangeLog	17 Dec 2007 08:02:53 -0000	1.13
  @@ -1,7 +1,10 @@
   devel
  +	2007-12-14 Rob Braun bbraun@synack.net
  +	* configure.ac: Fix a broken configure check for sys/acl.h and acl_t
   	2007-12-09 Rob Braun bbraun@synack.net
   	* include/xar.h.in lib/filetree.c lib/stat.c test/validate.c: Make sure xar_iter_new() takes no parameters.  From rpm5.
   	* lib/libxar.la.in.in: set the libxir to @LIBDIR@ from autoconf.  From rpm5.
  +	* configure.ac: Allow specifying the path to lzma with --with-lzma=PATH
   	* lib/lzmaxar.c: Use the global macro for compression level.
   	2007-11-11 Rob Braun bbraun@synack.net
   	* lib/archive.c: Add a #define for a mising function in Mac OS X's old version of libxml2 from Anders F Björklund.
  @@ .
  patch -p0 <<'@@ .'
  Index: xar/configure.ac
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 configure.ac
  --- xar/configure.ac	9 Dec 2007 21:23:58 -0000	1.13
  +++ xar/configure.ac	17 Dec 2007 08:02:53 -0000	1.14
  @@ -183,7 +183,8 @@
   )
   AC_SUBST([enable_autogen])
   
  -AC_TRY_COMPILE([#include <sys/types.h> #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
  +AC_TRY_COMPILE([#include <sys/types.h> 
  +#include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
   AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
   AC_CHECK_FUNCS(lgetxattr)
   AC_CHECK_FUNCS(lsetxattr)
  @@ -354,8 +355,21 @@
   dnl Configure liblzma.
   dnl 
   have_liblzma="1"
  -AC_CHECK_HEADERS([lzma.h], , [have_liblzma="0"])
  -AC_CHECK_LIB([lzma], [lzma_code], , [have_liblzma="0"])
  +AC_ARG_WITH([lzma], [AS_HELP_STRING([--with-lzma=PATH],
  +	  [Compile in lzma support.  PATH is the prefix where liblzma is installed.],
  +	  [], [])],
  +	[ OLDCFLAGS=$CFLAGS; CFLAGS="-I$withval/include/ $CFLAGS";
  +	  OLDLDFLAGS=$LDFLAGS; LDFLAGS="-L$withval/lib/ $LDFLAGS";
  +	  OLDCPPFLAGS=$CPPFLAGS; CPPFLAGS="-I$withval/include/ $CPPFLAGS";
  +	  AC_CHECK_HEADER([$withval/include/lzma.h], ,
  +	    [have_liblzma="0"; CFLAGS=$OLDCFLAGS; LDFLAGS=$OLDLDFLAGS; 
  +	    CPPFLAGS=$OLDCPPFLAGS;])
  +	  AC_CHECK_LIB([lzma],  [lzma_code], [LIBS="-L$withval/lib/ -llzma $LIBS"], 
  +	    [have_liblzma="0"])
  +	],
  +	[ AC_CHECK_HEADERS([lzma.h], , [have_liblzma="0"])
  +	  AC_CHECK_LIB([lzma], [lzma_code], [], [have_liblzma="0"])
  +	])
   if test "x${have_liblzma}" = "x1" ; then
     AC_DEFINE([HAVE_LIBLZMA])
   fi
  @@ .