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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   30-Dec-2007 11:06:39
  Branch: HEAD                             Handle: 2007123010063900

  Modified files:
    rpm/lib                 Makefile.am tpgp.c

  Log:
    allow one to more easily out-of-the-box build and use the tpgp test
    tool, too

  Summary:
    Revision    Changes     Path
    2.171       +13 -3      rpm/lib/Makefile.am
    2.14        +14 -0      rpm/lib/tpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.170 -r2.171 Makefile.am
  --- rpm/lib/Makefile.am	28 Dec 2007 18:15:40 -0000	2.170
  +++ rpm/lib/Makefile.am	30 Dec 2007 10:06:39 -0000	2.171
  @@ -18,6 +18,14 @@
   	@WITH_FILE_CPPFLAGS@ \
   	@WITH_XAR_CPPFLAGS@
   
  +RPM_LDADD = \
  +	$(top_builddir)/build/librpmbuild.la \
  +	$(top_builddir)/lib/librpm.la \
  +	$(top_builddir)/rpmdb/librpmdb.la \
  +	$(top_builddir)/rpmio/librpmio.la \
  +	$(top_builddir)/misc/librpmmisc.la \
  +	@LTLIBINTL@
  +
   EXTRA_DIST = genpgp.sh getdate.y librpm.vers tpgp.c
   
   EXTRA_PROGRAMS = tpgp
  @@ -119,8 +127,10 @@
   	$(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
   
   tpgp_SOURCES = genpgp.h tpgp.c
  -tpgp_CFLAGS  = $(CFLAGS)
  -tpgp_LDADD = librpm.la
  +tpgp_LDADD = $(RPM_LDADD)
   
  -genpgp.h:
  +tpgp.c: genpgp.h
  +
  +genpgp.h: genpgp.sh
   	-sh ./genpgp.sh > genpgp.h
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/tpgp.c
  ============================================================================
  $ cvs diff -u -r2.13 -r2.14 tpgp.c
  --- rpm/lib/tpgp.c	29 Dec 2007 21:34:21 -0000	2.13
  +++ rpm/lib/tpgp.c	30 Dec 2007 10:06:39 -0000	2.14
  @@ -16,10 +16,14 @@
   #include <rpmbc.h>
   #define	_RPMGC_INTERNAL
   #include <rpmgc.h>
  +#if defined(WITH_NSS)
   #define	_RPMNSS_INTERNAL
   #include <rpmnss.h>
  +#endif
  +#if defined(WITH_SSL)
   #define	_RPMSSL_INTERNAL
   #include <rpmssl.h>
  +#endif
   
   #include "genpgp.h"
   
  @@ -331,10 +335,14 @@
    { "gc", 0, POPT_ARG_VAL, &pgpImplVecs, (int)&rpmgcImplVecs,
           N_("use gcrypt crypto implementation"), NULL },
   #endif
  +#if defined(WITH_NSS)
    { "nss", 0, POPT_ARG_VAL, &pgpImplVecs, (int)&rpmnssImplVecs,
           N_("use NSS crypto implementation"), NULL },
  +#endif
  +#if defined(WITH_SSL)
    { "ssl", 0, POPT_ARG_VAL, &pgpImplVecs, (int)&rpmsslImplVecs,
           N_("use OpenSSL crypto implementation"), NULL },
  +#endif
   
      POPT_AUTOALIAS
      POPT_AUTOHELP
  @@ -348,7 +356,11 @@
       rpmts ts = NULL;
       int rc;
   
  +#if defined(WITH_NSS)
       pgpImplVecs = &rpmnssImplVecs;
  +#else
  +    pgpImplVecs = &rpmbcImplVecs;
  +#endif
   _pgp_debug = 1;
   _pgp_print = 1;
   
  @@ -362,8 +374,10 @@
   
       ts = rpmtsFree(ts);
   
  +#if defined(WITH_NSS)
       if (pgpImplVecs == &rpmnssImplVecs)
   	NSS_Shutdown();
  +#endif
   
       optCon = rpmcliFini(optCon);
   
  @@ .