From 3ca02757368e09c798e7412034ee3b26bcc9e3c8 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Thu, 17 Sep 2009 23:47:45 +0200
Subject: [PATCH] Upstream tarball 9811

---
 .svn-revision  |  2 +-
 configure      | 17 +++++++++--------
 m4/cryptopp.m4 | 17 +++++++++--------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 7973af0a..fd80cd75 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9809
+9811
diff --git a/configure b/configure
index 36e5ea25..ad7a40ae 100755
--- a/configure
+++ b/configure
@@ -8098,31 +8098,32 @@ echo $ECHO_N "checking for crypto++ version >= 5.1... $ECHO_C" >&6
 
 	if test -n "$with_crypto_prefix"; then
 
+		CRYPTOPP_PREFIX="$with_crypto_prefix"
 		# Find the Cryptopp header in the user-provided location
-		if test -f $with_crypto_prefix/$cryptopp_file_with_version; then
+		if test -f $CRYPTOPP_PREFIX/$cryptopp_file_with_version; then
 
 			CRYPTOPP_STYLE="sources"
 			CRYPTOPP_LIB_NAME="cryptopp"
 			cryptopp_includedir=
-			CRYPTOPP_INCLUDE_PREFIX="$with_crypto_prefix"
+			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_PREFIX"
 			cryptopp_libdir=
 
-elif test -f $with_crypto_prefix/include/cryptopp/$cryptopp_file_with_version; then
+elif test -f $CRYPTOPP_PREFIX/include/cryptopp/$cryptopp_file_with_version; then
 
 			CRYPTOPP_STYLE="installed"
 			CRYPTOPP_LIB_NAME="cryptopp"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 
-elif test -f $with_crypto_prefix/include/crypto++/$cryptopp_file_with_version; then
+elif test -f $CRYPTOPP_PREFIX/include/crypto++/$cryptopp_file_with_version; then
 
 			# Debian uses libcrypto++5.1 - it's not my fault, please soda patch the package
 			CRYPTOPP_STYLE="gentoo_debian"
 			CRYPTOPP_LIB_NAME="crypto++"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 
 fi
 
diff --git a/m4/cryptopp.m4 b/m4/cryptopp.m4
index e652ae56..98fa6e1c 100644
--- a/m4/cryptopp.m4
+++ b/m4/cryptopp.m4
@@ -77,26 +77,27 @@ m4_define([MIN_CRYPTO_VERSION], [m4_ifval([$1], [$1], [5.1])])dnl
 	cryptopp_libdir="unknown"
 
 	AS_IF([test -n "$with_crypto_prefix"], [
+		CRYPTOPP_PREFIX="$with_crypto_prefix"
 		# Find the Cryptopp header in the user-provided location
-		MULE_IF([test -f $with_crypto_prefix/$cryptopp_file_with_version], [
+		MULE_IF([test -f $CRYPTOPP_PREFIX/$cryptopp_file_with_version], [
 			CRYPTOPP_STYLE="sources"
 			CRYPTOPP_LIB_NAME="cryptopp"
 			cryptopp_includedir=
-			CRYPTOPP_INCLUDE_PREFIX="$with_crypto_prefix"
+			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_PREFIX"
 			cryptopp_libdir=
-		], [test -f $with_crypto_prefix/include/cryptopp/$cryptopp_file_with_version], [
+		], [test -f $CRYPTOPP_PREFIX/include/cryptopp/$cryptopp_file_with_version], [
 			CRYPTOPP_STYLE="installed"
 			CRYPTOPP_LIB_NAME="cryptopp"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
-		], [test -f $with_crypto_prefix/include/crypto++/$cryptopp_file_with_version], [
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
+		], [test -f $CRYPTOPP_PREFIX/include/crypto++/$cryptopp_file_with_version], [
 			# Debian uses libcrypto++5.1 - it's not my fault, please soda patch the package
 			CRYPTOPP_STYLE="gentoo_debian"
 			CRYPTOPP_LIB_NAME="crypto++"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 		])
 	], [
 		for CRYPTOPP_PREFIX in /usr /usr/local /opt /opt/local /usr/pkg /mingw ; do
-- 
2.11.4.GIT