diff options
| author | jbj <devnull@localhost> | 2003-05-22 21:21:43 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-05-22 21:21:43 +0000 |
| commit | dac695e290b95514115d68dbfe21209eeb66ee82 (patch) | |
| tree | 469371d0b7bb44a943643c8b1456758707dbb2b3 /rpmio | |
| parent | 185ee2095cc22a9ab6d3f6e918a7577c7fd6e996 (diff) | |
| download | librpm-tizen-dac695e290b95514115d68dbfe21209eeb66ee82.tar.gz librpm-tizen-dac695e290b95514115d68dbfe21209eeb66ee82.tar.bz2 librpm-tizen-dac695e290b95514115d68dbfe21209eeb66ee82.zip | |
Prepare to build with external beecrypt-3.0.0.
CVS patchset: 6871
CVS date: 2003/05/22 21:21:43
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/Makefile.am | 6 | ||||
| -rw-r--r-- | rpmio/rpmio_internal.h | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index adeee1c25..35ebe37a0 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -10,6 +10,7 @@ EXTRA_PROGRAMS = tdigest tdir tfts tglob tinv tkey tring trpmio tsw dumpasn1 INCLUDES = -I. \ -I$(top_srcdir) \ + @WITH_BEECRYPT_INCLUDE@ \ -I$(top_srcdir)/popt \ @INCPATH@ @@ -31,11 +32,12 @@ librpmio_la_SOURCES = \ rpmio.c rpmlog.c rpmmalloc.c \ rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c librpmio_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ + @WITH_BEECRYPT_LIB@ \ $(top_builddir)/file/src/libfmagic.la \ @WITH_ZLIB_LIB@ \ -lrt -lpthread -librpmio_la_LIBADD = $(BEECRYPTLOBJS) -librpmio_la_DEPENDENCIES = .created +librpmio_la_LIBADD = # $(BEECRYPTLOBJS) +librpmio_la_DEPENDENCIES = # .created $(top_builddir)/beecrypt/listobjs: ${MAKE} -C $(top_builddir)/beecrypt listobjs diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index c881c55d6..f6530619b 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -9,20 +9,20 @@ #include <rpmio.h> #include <rpmurl.h> -#include <beecrypt/beecrypt.api.h> +#include <beecrypt.api.h> #include <rpmpgp.h> #include <rpmsw.h> /* Drag in the beecrypt includes. */ -#include <beecrypt/beecrypt.h> -#include <beecrypt/base64.h> -#include <beecrypt/dsa.h> -#include <beecrypt/endianness.h> -#include <beecrypt/md5.h> -#include <beecrypt/mp.h> -#include <beecrypt/rsa.h> -#include <beecrypt/rsapk.h> -#include <beecrypt/sha1.h> +#include <beecrypt.h> +#include <base64.h> +#include <dsa.h> +#include <endianness.h> +#include <md5.h> +#include <mp.h> +#include <rsa.h> +#include <rsapk.h> +#include <sha1.h> /** \ingroup rpmio * Values parsed from OpenPGP signature/pubkey packet(s). |