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:   16-Nov-2007 10:40:46
  Branch: HEAD                             Handle: 2007111609404600

  Modified files:
    rpm/rpmdb               rpmwf.c

  Log:
    make rpmdb compile without xar too

  Summary:
    Revision    Changes     Path
    1.10        +9  -3      rpm/rpmdb/rpmwf.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmwf.c
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 rpmwf.c
  --- rpm/rpmdb/rpmwf.c	14 Nov 2007 23:56:33 -0000	1.9
  +++ rpm/rpmdb/rpmwf.c	16 Nov 2007 09:40:46 -0000	1.10
  @@ -19,7 +19,9 @@
   
   rpmRC rpmwfFiniXAR(rpmwf wf)
   {
  +#ifdef WITH_XAR
       int xx;
  +#endif
   
   if (_rpmwf_debug)
   fprintf(stderr, "*** rpmwfFiniXAR(%p)\n", wf);
  @@ -80,11 +82,13 @@
       } else
   	wf->f = xar_file_next(wf->i);
   /*@=moduncon@*/
  -#endif
   
       if (wf->f == NULL)
   	return RPMRC_NOTFOUND;
       return RPMRC_OK;
  +#else
  +    return RPMRC_FAIL;
  +#endif
   }
   
   rpmRC rpmwfPushXAR(rpmwf wf, const char * fn)
  @@ -109,16 +113,18 @@
   	nb = wf->np;
       }
   
  -    if (wf->x && b && nb > 0) {
   #ifdef WITH_XAR
  +    if (wf->x && b && nb > 0) {
   /*@-moduncon@*/
   	wf->f = xar_add_frombuffer(wf->x, NULL, fn, b, nb);
   /*@=moduncon@*/
   	if (wf->f == NULL)
  -#endif
   	    return RPMRC_FAIL;
       }
       return RPMRC_OK;
  +#else
  +    return RPMRC_FAIL;
  +#endif
   }
   
   rpmRC rpmwfPullXAR(rpmwf wf, const char * fn)
  @@ .