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:   11-Nov-2007 19:49:45
  Branch: HEAD                             Handle: 2007111118494500

  Modified files:
    rpm/tools               Makefile.am txar.c

  Log:
    fix building txar with internal xar

  Summary:
    Revision    Changes     Path
    2.102       +4  -2      rpm/tools/Makefile.am
    2.9         +1  -1      rpm/tools/txar.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.101 -r2.102 Makefile.am
  --- rpm/tools/Makefile.am	18 Sep 2007 19:19:21 -0000	2.101
  +++ rpm/tools/Makefile.am	11 Nov 2007 18:49:45 -0000	2.102
  @@ -7,7 +7,8 @@
   	-I$(top_srcdir)/lib \
   	-I$(top_srcdir)/rpmdb \
   	-I$(top_srcdir)/rpmio \
  -	-I$(top_srcdir)/misc
  +	-I$(top_srcdir)/misc \
  +	@WITH_XAR_CPPFLAGS@
   
   EXTRA_DIST =	hashtab.h
   
  @@ -49,7 +50,8 @@
   ## XAR package format work-in-progress.
   ##
   txar_SOURCES =		txar.c
  -txar_LDADD =		$(myLDADD) -lxar
  +txar_LDADD =		$(myLDADD) @WITH_XAR_LDFLAGS@
  +txar_LIBS =		@WITH_XAR_LIBS@
   
   ##
   ##  provide Berkeley-DB tools
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/txar.c
  ============================================================================
  $ cvs diff -u -r2.8 -r2.9 txar.c
  --- rpm/tools/txar.c	10 Nov 2007 20:09:25 -0000	2.8
  +++ rpm/tools/txar.c	11 Nov 2007 18:49:45 -0000	2.9
  @@ -2,7 +2,7 @@
   #define	RPM2XAR
   #include "system.h"
   #include <inttypes.h>
  -#include <xar/xar.h>
  +#include "xar.h"
   #include <rpmio.h>
   #include <rpmcli.h>
   
  @@ .