detect if GOST works.

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

diff --git a/configure b/configure
index 319ac1f55bdf94661458f477e36040dca98d4e34..be5cb79a854671219b127b24c2dec68083a4a4ab 100755 (executable)
--- 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 e91c6262336f7225d123cace0b187072041eece2..eab88d4e04325a5dc463a87bf04e5d3f054b17be 100644 (file)
--- 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 a56aac1512ec5e6912e9120786547c94fe4ff026..092fecdb0f3a500ed274be7906e749e3d6f1871f 100644 (file)
--- 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).