chiark
/
gitweb
/
~mdw
/
distorted-backup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
99248ed
)
configure.ac: Escape plan for old Nettle without pkg-config dropping.
author
Mark Wooding
<mdw@distorted.org.uk>
Sun, 18 Dec 2011 20:54:00 +0000
(20:54 +0000)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sun, 18 Dec 2011 20:54:00 +0000
(20:54 +0000)
configure.ac
patch
|
blob
|
blame
|
history
diff --git
a/configure.ac
b/configure.ac
index 66d3dfc367e7c89a6752281ad4e80eb768d8d07c..6c76e24f6ae975a7a0782da7010ef2f72093a8f5 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-37,7
+37,16
@@
dnl--------------------------------------------------------------------------
dnl C programming environment.
PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
dnl C programming environment.
PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
-PKG_CHECK_MODULES([nettle], [nettle >= 2.4])
+PKG_CHECK_MODULES([nettle], [nettle >= 2.4], [], [
+ ## That didn't work; unfortunately older Nettle packages don't have a
+ ## pkg-config dropping. Let's see whether it will work anyway.
+ nettlep=t
+ AC_CHECK_HEADER([nettle/sha.h], [], [nettlep=nil])
+ AC_CHECK_LIB([nettle], [nettle_sha256_init], [], [nettlep=nil])
+ case $nettlep in
+ nil) AC_MSG_ERROR([Failed to find Nettle library.]) ;;
+ esac
+ NETTLE_CFLAGS= NETTLE_LIBS=-lnettle])
dnl--------------------------------------------------------------------------
dnl Perl programming environment.
dnl--------------------------------------------------------------------------
dnl Perl programming environment.