From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 19 Oct 2011 13:18:25 +0000 (+0000)
Subject: detect if GOST works.
X-Git-Tag: release-1.4.14rc1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28c9738062e20dcf31f31aa3afb6aca540ace879;p=thirdparty%2Funbound.git

detect if GOST works.


git-svn-id: file:///svn/unbound/trunk@2518 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 319ac1f55..be5cb79a8 100755
--- a/configure
+++ b/configure
@@ -15615,7 +15615,7 @@ $as_echo_n "checking if GOST works... " >&6; }
 if test c${cross_compiling} = cno; then
 BAKCFLAGS="$CFLAGS"
 if test -n "$ssldir"; then
-	CFLAGS="$CFLAGS -Wl,-rpath=$ssldir/lib"
+	CFLAGS="$CFLAGS -Wl,-rpath,$ssldir/lib"
 fi
 if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -15696,12 +15696,12 @@ int main(void) {
 	if(!EVP_DigestInit_ex(ctx, md, NULL)) return 3;
 	if(!EVP_DigestUpdate(ctx, str, 10)) return 4;
 	if(!EVP_DigestFinal_ex(ctx, digest, NULL)) return 5;
-	if(1) {
-		int i;
+	/* uncomment to see the hash calculated.
+		{int i;
 		for(i=0; i<32; i++)
 			printf(" %2.2x", (int)digest[i]);
-		printf("\n");
-	}
+		printf("\n");}
+	*/
 	if(memcmp(digest, check, sizeof(check)) != 0)
 		return 6;
 	return 0;
diff --git a/configure.ac b/configure.ac
index e91c62623..eab88d4e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,7 +503,7 @@ AC_MSG_CHECKING([if GOST works])
 if test c${cross_compiling} = cno; then
 BAKCFLAGS="$CFLAGS"
 if test -n "$ssldir"; then
-	CFLAGS="$CFLAGS -Wl,-rpath=$ssldir/lib"
+	CFLAGS="$CFLAGS -Wl,-rpath,$ssldir/lib"
 fi
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <string.h>
@@ -576,12 +576,12 @@ int main(void) {
 	if(!EVP_DigestInit_ex(ctx, md, NULL)) return 3;
 	if(!EVP_DigestUpdate(ctx, str, 10)) return 4;
 	if(!EVP_DigestFinal_ex(ctx, digest, NULL)) return 5;
-	if(1) {
-		int i;
+	/* uncomment to see the hash calculated.
+		{int i;
 		for(i=0; i<32; i++)
 			printf(" %2.2x", (int)digest[i]);
-		printf("\n");
-	}
+		printf("\n");}
+	*/
 	if(memcmp(digest, check, sizeof(check)) != 0)
 		return 6;
 	return 0;
diff --git a/doc/Changelog b/doc/Changelog
index a56aac151..092fecdb0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 19 October 2011: Wouter
 	- fix unbound-anchor for broken strptime on OSX lion, detected
 	  in configure.
+	- Detect if GOST really works, openssl1.0 on OSX fails.
 
 17 October 2011: Wouter
 	- better documentation for inform_super (Thanks Yang Zhe).