diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-05-22 00:14:19 +1000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2013-05-22 10:06:40 +0200 |
| commit | 30a224367595f9e2506e41053fc9c7cb96a90928 (patch) | |
| tree | 0deb2b11be00fea6c1eead145c716e06137b036a /lib/crypto/wscript_configure | |
| parent | 27df444d0b92a8acb4d830b3b62f04835b57f0e8 (diff) | |
| download | samba-30a224367595f9e2506e41053fc9c7cb96a90928.tar.gz samba-30a224367595f9e2506e41053fc9c7cb96a90928.tar.bz2 samba-30a224367595f9e2506e41053fc9c7cb96a90928.zip | |
build: Update md5.h detection in waf and autoconf to use sys/md5.h and -lmd
This brings the two build systems in sync, without using md5.h (which is a problem name)
Tested on FreeBSD
Andrew Bartlett
Reviewed-by: Richard Sharpe <rsharpe@samba.org>
Autobuild-User(master): Richard Sharpe <sharpe@samba.org>
Autobuild-Date(master): Wed May 22 10:06:40 CEST 2013 on sn-devel-104
Diffstat (limited to 'lib/crypto/wscript_configure')
| -rw-r--r-- | lib/crypto/wscript_configure | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure index 5fc00fb22c..21ec566b6b 100644 --- a/lib/crypto/wscript_configure +++ b/lib/crypto/wscript_configure @@ -1,4 +1,8 @@ -conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', - checklibc=True) +if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', + checklibc=True): + conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', + checklibc=True) + conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h', + checklibc=True) conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', checklibc=True) |