diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2008-03-01 12:33:17 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2008-03-01 12:33:17 +0000 |
| commit | 6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5 (patch) | |
| tree | 4c44858e3d976af0b741ac7b67961fa4bf65ecc8 | |
| parent | a2290efbb395b35330377e0a9acef9b92dab9aeb (diff) | |
| download | perl-URPM-6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5.tar perl-URPM-6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5.tar.gz perl-URPM-6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5.tar.bz2 perl-URPM-6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5.tar.xz perl-URPM-6c14a9b66694bc2ef9d6a61bdf98b3ed02659fe5.zip | |
define WITH_DB in rpm5compat.h in stead of in Makefile
drop useless conditionals for headers as they're already conditional in themself ;)
| -rw-r--r-- | Makefile.PL | 2 | ||||
| -rw-r--r-- | rpm5compat.h | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.PL b/Makefile.PL index 6ab4b17..f760e93 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -60,7 +60,7 @@ if ($pversion ge v4.4.90 && $pversion lt v4.5) { push @rpmflags, '-DRPM_450'; } if ($pversion ge v5.0) { - push @rpmflags, '-DRPM_500 -DWITH_DB'; + push @rpmflags, '-DRPM_500'; } } my $ccflags = join(' ', '-Wall -fno-strict-aliasing', @rpmflags); diff --git a/rpm5compat.h b/rpm5compat.h index fcdb327..76cc1bf 100644 --- a/rpm5compat.h +++ b/rpm5compat.h @@ -10,24 +10,13 @@ #define RPM_INT16_TYPE RPM_UINT16_TYPE #define RPM_INT32_TYPE RPM_UINT32_TYPE -#ifndef H_RPMEVR +#define WITH_DB #include <rpm/rpmevr.h> -#endif -#ifndef H_RPMIO #include <rpm/rpmio.h> -#endif -#ifndef _H_PKGIO #include <rpm/pkgio.h> -#endif -#ifndef H_RPMCB #include <rpm/rpmcb.h> -#endif -#ifndef H_RPMTS #include <rpm/rpmts.h> -#endif -#ifndef _H_MACRO_ #include <rpm/rpmmacro.h> -#endif enum hMagic { HEADER_MAGIC_NO = 0, |