also sprach Alex Riesen <raa.lkml@xxxxxxxxx> [2007.07.14.1623 +0200]: > > This should possibly go to configure.ac, but maybe *also* to Makefile to make > > Definitely. It should it least skip the test if NO_OPENSSL is already > defined. Reading this as a yes, here is the patch adding this. I'll wait for a few days before submitting a squashed patch to Junio then. If you oppose, please speak up. My autotools knowledge is limited, but I might then look at adding the fall back to configure.ac too. Btw: I've done a lot of things wrong on this mailing list already, for which I'd like to apologise. Thanks to those who told me privately off my faux pas. I hope those won't be necessary anymore. commit c8cbe9e5a44174baabe17152d575b3ee46b82c36 Author: martin f. krafft <madduck@xxxxxxxxxxx> Date: Sat Jul 14 16:44:46 2007 +0200 skip the openssl/sha.h test if NO_OPENSSL is already defined diff --git a/Makefile b/Makefile index 1676343..b0ce7f0 100644 --- a/Makefile +++ b/Makefile @@ -532,10 +532,12 @@ ifndef NO_CURL endif endif -HAS_OPENSSL := $(shell echo "\#include <openssl/sha.h>" \ - | $(CPP) -o/dev/null - 2>/dev/null || echo no) -ifeq "$(HAS_OPENSSL)" "no" - NO_OPENSSL = "openssl_sha.h_not_found" +ifndef NO_OPENSSL + HAS_OPENSSL := $(shell echo "\#include <openssl/sha.h>" \ + | $(CPP) -o/dev/null - 2>/dev/null || echo no) + ifeq "$(HAS_OPENSSL)" "no" + NO_OPENSSL = "openssl_sha.h_not_found" + endif endif ifndef NO_OPENSSL -- martin; (greetings from the heart of the sun.) \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck spamtraps: madduck.bogus@xxxxxxxxxxx "one should never do anything that one cannot talk about after dinner." -- oscar wilde
Attachment:
signature.asc
Description: Digital signature (GPG/PGP)