diff options
| author | rjray <devnull@localhost> | 2001-06-20 05:15:46 +0000 |
|---|---|---|
| committer | rjray <devnull@localhost> | 2001-06-20 05:15:46 +0000 |
| commit | 24245d28f88728b3ba40d305d857c74e394846c9 (patch) | |
| tree | 67f735b3e09a24c0b4a9e601a38c3ac2cdc61139 /Perl-RPM | |
| parent | c23977f8bf6478d5f050a0e02093a73ee58e9d08 (diff) | |
| download | rpm-24245d28f88728b3ba40d305d857c74e394846c9.tar.gz rpm-24245d28f88728b3ba40d305d857c74e394846c9.tar.bz2 rpm-24245d28f88728b3ba40d305d857c74e394846c9.zip | |
These are adjustments made on the rpm-4_0 branch by Jeff. I've built and tested
them again my 3.0.5 test platform with no errors. Thus, they are being merged
onto the trunk.
CVS patchset: 4889
CVS date: 2001/06/20 05:15:46
Diffstat (limited to 'Perl-RPM')
| -rw-r--r-- | Perl-RPM/Makefile.PL | 15 | ||||
| -rw-r--r-- | Perl-RPM/RPM.h | 7 |
2 files changed, 18 insertions, 4 deletions
diff --git a/Perl-RPM/Makefile.PL b/Perl-RPM/Makefile.PL index 3c6965a2b..8d4dc10cb 100644 --- a/Perl-RPM/Makefile.PL +++ b/Perl-RPM/Makefile.PL @@ -1,6 +1,6 @@ #!/bin/perl -# $Id: Makefile.PL,v 1.23 2001/05/15 07:57:34 rjray Exp $ +# $Id: Makefile.PL,v 1.24 2001/06/20 05:15:46 rjray Exp $ use Config; use ExtUtils::MakeMaker; @@ -65,13 +65,22 @@ prior to that version. Stopped" # Starting with RPM 4.0, there are a number of subtle-but-significant changes $rpm_defines = "-DRPM_MAJOR=$rpm_version[0] -DRPM_MINOR=$rpm_version[1]" . " -DRPM_PATCH=$rpm_version[2] -DRPM_VERSION=$rpm_version"; -if ($rpm_version >= "0x040000") + +# XXX rpm-4.0.3 has an internal copy of db-3.3.4 in -lrpmdb +if ($rpm_version >= "0x040003") { - $rpm_libs = '-lrpm -lrpmio -lpopt'; + $rpm_libs = '-lrpm -lrpmdb -lrpmio -lpopt'; } else { + if ($rpm_version >= "0x040000") + { + $rpm_libs = '-lrpm -lrpmio -lpopt'; + } + else + { $rpm_libs = '-lrpm -lpopt'; + } } # Check for needed header files diff --git a/Perl-RPM/RPM.h b/Perl-RPM/RPM.h index 3f716a086..ea6c554c0 100644 --- a/Perl-RPM/RPM.h +++ b/Perl-RPM/RPM.h @@ -1,5 +1,5 @@ /* - * $Id: RPM.h,v 1.14 2001/02/27 07:34:00 rjray Exp $ + * $Id: RPM.h,v 1.15 2001/06/20 05:15:46 rjray Exp $ * * Various C-specific decls/includes/etc. for the RPM linkage */ @@ -40,6 +40,11 @@ # define newSVpvn(a,b) newSVpv(a,b) #endif +/* XXX Certain constants moved in rpm-4.0.3 to a developing CLI API */ +#if RPM_MAJOR >= 4 && RPM_MINOR >= 0 && RPM_PATCH >= 3 +#include <rpm/rpmcli.h> +#endif + #include <rpm/rpmlib.h> #if RPM_MAJOR < 4 # include <rpm/header.h> |