philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Look for the openssl program at compile time. If not found, call

Browse source 
openssl through $PATH at runtime.
This commit is contained in:
Eelco Dolstra 2007-03-01 13:30:46 +00:00
parent b4a040e52b
commit db1973d012
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -126,6 +126,10 @@ NEED_PROG(perl, perl)
NEED_PROG(tar, tar) NEED_PROG(tar, tar)
AC_PATH_PROG(dot, dot) AC_PATH_PROG(dot, dot)
AC_PATH_PROG(openssl_prog, openssl, openssl) # if not found, call openssl in $PATH
AC_SUBST(openssl_prog)
AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl_prog"], [Path of the OpenSSL binary])
# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). # Test that Perl has the open/fork feature (Perl 5.8.0 and beyond).
AC_MSG_CHECKING([whether Perl is recent enough]) AC_MSG_CHECKING([whether Perl is recent enough])
if ! $perl -e 'open(FOO, "-|", "true"); while (<FOO>) { print; }; close FOO or die;'; then if ! $perl -e 'open(FOO, "-|", "true"); while (<FOO>) { print; }; close FOO or die;'; then

4
src/libstore/local-store.cc
View file

@ -776,7 +776,7 @@ void LocalStore::exportPath(const Path & path, bool sign,
args.push_back(secretKey); args.push_back(secretKey);
args.push_back("-in"); args.push_back("-in");
args.push_back(hashFile); args.push_back(hashFile);
string signature = runProgram("openssl", true, args); string signature = runProgram(OPENSSL_PATH, true, args);
writeString(signature, hashAndWriteSink); writeString(signature, hashAndWriteSink);
@ -852,7 +852,7 @@ Path LocalStore::importPath(bool requireSignature, Source & source)
args.push_back("-pubin"); args.push_back("-pubin");
args.push_back("-in"); args.push_back("-in");
args.push_back(sigFile); args.push_back(sigFile);
string hash2 = runProgram("openssl", true, args); string hash2 = runProgram(OPENSSL_PATH, true, args);
/* Note: runProgram() throws an exception if the signature /* Note: runProgram() throws an exception if the signature
is invalid. */ is invalid. */