RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Olivier Thauvin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-May-2007 02:38:04
Branch: rpm-4_5 Handle: 2007052901380200
Modified files: (Branch: rpm-4_5)
rpm configure.ac
rpm/python Makefile.am
rpm/rpmio md2.c md2.h md4.c md4.h rmd128.c rmd128.h rmd160.c
rmd160.h rmd256.c rmd256.h rmd320.c rmd320.h
rpmdav.c rpmio_internal.h salsa10.c salsa10.h
salsa20.c salsa20.h tiger.c tiger.h
Log:
- fix search path of python, beecrypt, neon, when they are installed
in different prefix than the one passe to configure
Summary:
Revision Changes Path
2.70.2.3 +25 -68 rpm/configure.ac
1.66.2.1 +1 -1 rpm/python/Makefile.am
1.2.2.1 +6 -0 rpm/rpmio/md2.c
1.2.2.1 +4 -0 rpm/rpmio/md2.h
1.2.2.1 +5 -0 rpm/rpmio/md4.c
1.2.2.1 +4 -0 rpm/rpmio/md4.h
1.2.2.1 +5 -0 rpm/rpmio/rmd128.c
1.2.2.1 +4 -0 rpm/rpmio/rmd128.h
1.2.2.1 +5 -0 rpm/rpmio/rmd160.c
1.2.2.1 +4 -0 rpm/rpmio/rmd160.h
1.2.2.1 +5 -0 rpm/rpmio/rmd256.c
1.2.2.1 +4 -0 rpm/rpmio/rmd256.h
1.2.2.1 +5 -0 rpm/rpmio/rmd320.c
1.2.2.1 +4 -0 rpm/rpmio/rmd320.h
2.32.2.1 +16 -0 rpm/rpmio/rpmdav.c
2.73.2.1 +25 -0 rpm/rpmio/rpmio_internal.h
1.2.2.1 +5 -0 rpm/rpmio/salsa10.c
1.2.2.1 +4 -0 rpm/rpmio/salsa10.h
1.2.2.1 +5 -0 rpm/rpmio/salsa20.c
1.2.2.1 +4 -0 rpm/rpmio/salsa20.h
1.2.2.1 +5 -0 rpm/rpmio/tiger.c
1.2.2.1 +4 -0 rpm/rpmio/tiger.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.70.2.2 -r2.70.2.3 configure.ac
--- rpm/configure.ac 25 May 2007 19:55:03 -0000 2.70.2.2
+++ rpm/configure.ac 29 May 2007 00:38:02 -0000 2.70.2.3
@@ -561,7 +561,6 @@
AC_CHECK_HEADER([beecrypt/api.h], [
AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the
<beecrypt/api.h> header file.])
])
- WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt"
WITH_BEECRYPT_LIB="-lbeecrypt"
])
],[
@@ -570,6 +569,7 @@
WITH_BEECRYPT_SUBDIR=beecrypt
WITH_BEECRYPT_INCLUDE="-I\${top_srcdir}/${WITH_BEECRYPT_SUBDIR}"
WITH_BEECRYPT_LIB="\${top_builddir}/${WITH_BEECRYPT_SUBDIR}/libbeecrypt.la"
+ AC_DEFINE(USE_INTERNAL_BEECRYPT, 1, [Define to 1 when using internal
beecrypt instead system one.])
fi
])
AC_SUBST(WITH_BEECRYPT_SUBDIR)
@@ -601,6 +601,7 @@
WITH_NEON_SUBDIR=neon
WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
+ AC_DEFINE(USE_INTERNAL_NEON, 1, [Define to 1 when using internal neon
instead system one.])
fi
])
AC_SUBST(WITH_NEON_SUBDIR)
@@ -1041,77 +1042,33 @@
withval=auto
AC_ARG_WITH(python, [ --with-python build rpm python bindings ])
-WITH_PYTHON_VERSION=$withval
+python_version=$withval
if test $withval = auto ; then
-
-AC_MSG_CHECKING(for python 2.5)
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <python2.5/Python.h>
-main() {
- exit(strncmp("2.5", PY_VERSION, 3));
-} ]])],[withval=yes],[withval=no],[withval=yes])
- AC_MSG_RESULT($withval)
- if test $withval = yes ; then
- WITH_PYTHON_VERSION="2.5"
- else
-
- AC_MSG_CHECKING(for python 2.4)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <python2.4/Python.h>
- main() {
- exit(strncmp("2.4", PY_VERSION, 3));
- } ]])],[withval=yes],[withval=no],[withval=yes])
- AC_MSG_RESULT($withval)
- if test $withval = yes ; then
- WITH_PYTHON_VERSION="2.4"
- else
-
- AC_MSG_CHECKING(for python 2.3)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <python2.3/Python.h>
- main() {
- exit(strncmp("2.3", PY_VERSION, 3));
- } ]])],[withval=yes],[withval=no],[withval=yes])
- AC_MSG_RESULT($withval)
- if test $withval = yes ; then
- WITH_PYTHON_VERSION="2.3"
- else
-
- AC_MSG_CHECKING(for python 2.2)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <python2.2/Python.h>
- main() {
- exit(strncmp("2.2", PY_VERSION, 3));
- } ]])],[withval=yes],[withval=no],[withval=yes])
- AC_MSG_RESULT($withval)
- if test $withval = yes ; then
- WITH_PYTHON_VERSION="2.2"
- else
-
- AC_MSG_CHECKING(for python 1.5.2)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <python1.5/Python.h>
- main() {
- exit(strcmp("1.5.2", PY_VERSION));
- } ]])],[withval=yes],[withval=no],[withval=yes])
- AC_MSG_RESULT($withval)
- if test $withval = yes ; then
- WITH_PYTHON_VERSION="1.5"
- fi
- fi
- fi
- fi
- fi
+ python_version=`python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d"."`
fi
-
-if test "$WITH_PYTHON_VERSION" != no ; then
- WITH_PYTHON_SUBDIR=python
- WITH_PYTHON_SUBPACKAGE=1
-else
- WITH_PYTHON_SUBDIR=
- WITH_PYTHON_SUBPACKAGE=0
+dnl assume no python by default
+WITH_PYTHON_VERSION=no
+WITH_PYTHON_SUBDIR=
+WITH_PYTHON_SUBPACKAGE=0
+if test -n "$WITH_PYTHON_VERSION"; then
+ AC_MSG_CHECKING(for python ${python_version})
+ for dir in /usr/include /usr/local/include ${prefix}/include; do
+ AC_CHECK_HEADER(
+ [${dir}/python${python_version}/Python.h],
+ [ python_dir=${dir} ],
+ [ python_dir="" ]
+ )
+ if test -n "${python_dir}" ; then
+ PYTHON_INC_DIR=${python_dir}/python${python_version}
+ WITH_PYTHON_SUBDIR=python
+ WITH_PYTHON_SUBPACKAGE=1
+ WITH_PYTHON_VERSION=${python_ver}
+ break
+ fi
+ done
fi
+AC_SUBST(PYTHON_INC_DIR)
AC_SUBST(WITH_PYTHON_SUBDIR)
AC_SUBST(WITH_PYTHON_SUBPACKAGE)
AC_SUBST(WITH_PYTHON_VERSION)
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.66 -r1.66.2.1 Makefile.am
--- rpm/python/Makefile.am 25 May 2007 17:36:31 -0000 1.66
+++ rpm/python/Makefile.am 29 May 2007 00:38:02 -0000 1.66.2.1
@@ -5,7 +5,7 @@
LINT = splint
pylibdir = ${prefix}/[EMAIL PROTECTED]@/[EMAIL PROTECTED]@
-pyincdir = $(prefix)/include/[EMAIL PROTECTED]@
+pyincdir = $(PYTHON_INC_DIR)
SUBDIRS = rpm
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md2.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 md2.c
--- rpm/rpmio/md2.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/md2.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -12,8 +12,14 @@
#include "system.h"
#include "md2.h"
+
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md2.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 md2.h
--- rpm/rpmio/md2.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/md2.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -6,7 +6,11 @@
#ifndef _MD2_H
#define _MD2_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the MD2 algorithm.
* \ingroup HASH_md2_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md4.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 md4.c
--- rpm/rpmio/md4.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/md4.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -15,8 +15,13 @@
#endif
#include "md4.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md4.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 md4.h
--- rpm/rpmio/md4.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/md4.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -6,7 +6,11 @@
#ifndef _MD4_H
#define _MD4_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the MD4 algorithm.
* \ingroup HASH_md4_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd128.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd128.c
--- rpm/rpmio/rmd128.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd128.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -44,8 +44,13 @@
#include "system.h"
#include "rmd128.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd128.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd128.h
--- rpm/rpmio/rmd128.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd128.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -49,7 +49,11 @@
#ifndef _RMD128_H
#define _RMD128_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the RIPEMD-128 algorithm.
* \ingroup HASH_rmd128_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd160.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd160.c
--- rpm/rpmio/rmd160.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd160.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -42,8 +42,13 @@
#include "system.h"
#include "rmd160.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd160.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd160.h
--- rpm/rpmio/rmd160.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd160.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -47,7 +47,11 @@
#ifndef _RMD160_H
#define _RMD160_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the RIPEMD-160 algorithm.
* \ingroup HASH_rmd160_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd256.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd256.c
--- rpm/rpmio/rmd256.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd256.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -44,8 +44,13 @@
#include "system.h"
#include "rmd256.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd256.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd256.h
--- rpm/rpmio/rmd256.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd256.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -49,7 +49,11 @@
#ifndef _RMD256_H
#define _RMD256_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the RIPEMD-256 algorithm.
* \ingroup HASH_rmd256_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd320.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd320.c
--- rpm/rpmio/rmd320.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd320.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -42,8 +42,13 @@
#include "system.h"
#include "rmd320.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rmd320.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rmd320.h
--- rpm/rpmio/rmd320.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/rmd320.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -47,7 +47,11 @@
#ifndef _RMD320_H
#define _RMD320_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the RIPEMD-320 algorithm.
* \ingroup HASH_rmd320_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.32 -r2.32.2.1 rpmdav.c
--- rpm/rpmio/rpmdav.c 25 May 2007 17:36:36 -0000 2.32
+++ rpm/rpmio/rpmdav.c 29 May 2007 00:38:02 -0000 2.32.2.1
@@ -9,11 +9,19 @@
#include <pthread.h>
#endif
+#if #USE_INTERNAL_NEON
#include "ne_alloc.h"
#include "ne_auth.h"
#include "ne_basic.h"
#include "ne_dates.h"
#include "ne_locks.h"
+#else
+#include "neon/ne_alloc.h"
+#include "neon/ne_auth.h"
+#include "neon/ne_basic.h"
+#include "neon/ne_dates.h"
+#include "neon/ne_locks.h"
+#endif
#define NEONBLOWSCHUNKS
#ifndef NEONBLOWSCHUNKS
@@ -21,11 +29,19 @@
#include "../neon/src/ne_private.h"
#endif
+#if #USE_INTERNAL_NEON
#include "ne_props.h"
#include "ne_request.h"
#include "ne_socket.h"
#include "ne_string.h"
#include "ne_utils.h"
+#else
+#include "neon/ne_props.h"
+#include "neon/ne_request.h"
+#include "neon/ne_socket.h"
+#include "neon/ne_string.h"
+#include "neon/ne_utils.h"
+#endif
/* XXX API changes for neon-0.26.0 */
#if !defined(NE_FREE)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio_internal.h
============================================================================
$ cvs diff -u -r2.73 -r2.73.2.1 rpmio_internal.h
--- rpm/rpmio/rpmio_internal.h 25 May 2007 17:36:36 -0000 2.73
+++ rpm/rpmio/rpmio_internal.h 29 May 2007 00:38:02 -0000 2.73.2.1
@@ -9,16 +9,25 @@
#include <rpmio.h>
#include <rpmurl.h>
+#if USE_INTERNAL_BEECRYPT
#if HAVE_BEECRYPT_API_H
#include <api.h>
#else
#include <beecrypt.api.h>
#endif
+#else /* use system beecrypt */
+#if HAVE_BEECRYPT_API_H
+#include <beecrypt/api.h>
+#else
+#include <beecrypt/beecrypt.api.h>
+#endif
+#endif
#include <rpmpgp.h>
#include <rpmsw.h>
/* Drag in the beecrypt includes. */
+#if USE_INTERNAL_BEECRYPT
#include <beecrypt.h>
#include <base64.h>
#include <dsa.h>
@@ -33,6 +42,22 @@
#include <sha384.h>
#include <sha512.h>
#endif
+#else /* use system beecrypt */
+#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>
+#if HAVE_BEECRYPT_API_H
+#include <beecrypt/sha256.h>
+#include <beecrypt/sha384.h>
+#include <beecrypt/sha512.h>
+#endif
+#endif
/** \ingroup rpmio
* Values parsed from OpenPGP signature/pubkey packet(s).
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa10.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 salsa10.c
--- rpm/rpmio/salsa10.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/salsa10.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -1,8 +1,13 @@
#include "system.h"
#include "salsa10.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa10.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 salsa10.h
--- rpm/rpmio/salsa10.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/salsa10.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -6,7 +6,11 @@
#ifndef _SALSA10_H
#define _SALSA10_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the SALSA-10 algorithm.
* \ingroup HASH_salsa10_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa20.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 salsa20.c
--- rpm/rpmio/salsa20.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/salsa20.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -1,8 +1,13 @@
#include "system.h"
#include "salsa20.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa20.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 salsa20.h
--- rpm/rpmio/salsa20.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/salsa20.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -6,7 +6,11 @@
#ifndef _SALSA20_H
#define _SALSA20_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the SALSA-20 algorithm.
* \ingroup HASH_salsa20_h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tiger.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 tiger.c
--- rpm/rpmio/tiger.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/tiger.c 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -5,8 +5,13 @@
#endif
#include "tiger.h"
+#if USE_INTERNAL_BEECRYPT
#include "mp.h"
#include "endianness.h"
+#else
+#include "beecrypt/mp.h"
+#include "beecrypt/endianness.h"
+#endif
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tiger.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 tiger.h
--- rpm/rpmio/tiger.h 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/tiger.h 29 May 2007 00:38:02 -0000 1.2.2.1
@@ -6,7 +6,11 @@
#ifndef _TIGER_H
#define _TIGER_H
+#if USE_INTERNAL_BEECRYPT
#include "beecrypt.h"
+#else
+#include <beecrypt/beecrypt.h>
+#endif
/*!\brief Holds all the parameters necessary for the TIGER algorithm.
* \ingroup HASH_tiger_h
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
