oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

do a better job at matching headers to libraries

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11526 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-10-25 18:37:42 +00:00
parent 2aa3e297e9
commit c1f77c3cd6
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cf/crypto.m4
View File

@@ -13,6 +13,7 @@ m4_define([test_headers], [
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/rc4.h> #include <openssl/rc4.h>
#include <openssl/rand.h>
#else #else
#include <md4.h> #include <md4.h>
#include <md5.h> #include <md5.h>
@@ -44,6 +45,9 @@ m4_define([test_body], [
MD4_Init(&md4); MD4_Init(&md4);
MD5_Init(&md5); MD5_Init(&md5);
SHA1_Init(&sha1); SHA1_Init(&sha1);
#ifdef HAVE_OPENSSL
RAND_status();
#endif
des_cbc_encrypt(0, 0, 0, schedule, 0, 0); des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
RC4(0, 0, 0, 0);]) RC4(0, 0, 0, 0);])
@@ -75,23 +79,31 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
ires= ires=
for i in $INCLUDE_krb4; do for i in $INCLUDE_krb4; do
CFLAGS="-DHAVE_OPENSSL $i $save_CFLAGS" CFLAGS="-DHAVE_OPENSSL $i $save_CFLAGS"
AC_TRY_COMPILE(test_headers, test_body, for j in $cdirs; do
openssl=yes ires="$i"; break) for k in $clibs; do
LIBS="$j $k $save_LIBS"
AC_TRY_LINK(test_headers, test_body,
openssl=yes ires="$i" lres="$j $k"; break 3)
done
done
CFLAGS="$i $save_CFLAGS" CFLAGS="$i $save_CFLAGS"
AC_TRY_COMPILE(test_headers, test_body, for j in $cdirs; do
openssl=no ires="$i"; break) for k in $clibs; do
CFLAGS="-DOLD_HASH_NAMES $i $save_CFLAGS" LIBS="$j $k $save_LIBS"
AC_TRY_COMPILE(test_headers, test_body, AC_TRY_LINK(test_headers, test_body,
openssl=no ires="$i" old_hash=yes; break) openssl=no ires="$i" lres="$j $k"; break 3)
done done
lres= done
for i in $cdirs; do CFLAGS="-DHAVE_OLD_HASH_NAMES $i $save_CFLAGS"
for j in $clibs; do for j in $cdirs; do
LIBS="$i $j $save_LIBS" for k in $clibs; do
AC_TRY_LINK(test_headers, test_body, LIBS="$j $k $save_LIBS"
lres="$i $j"; break 2) AC_TRY_LINK(test_headers, test_body,
openssl=no ires="$i" lres="$j $k"; break 3)
done
done done
done done
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test "$ires" -a "$lres"; then if test "$ires" -a "$lres"; then