From a26307b28192e61bc06b5f5ef42f0fb51858d822 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 17:39:19 +0100 Subject: [PATCH] Fix build --- configure.ac | 6 +++--- perl/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 753436911..aa57543e5 100644 --- a/configure.ac +++ b/configure.ac @@ -216,9 +216,9 @@ AC_SUBST(storedir) # Look for OpenSSL, an optional dependency. -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]) +AC_PATH_PROG(openssl, openssl, openssl) # if not found, call openssl in $PATH +AC_SUBST(openssl) +AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl"], [Path of the OpenSSL binary]) PKG_CHECK_MODULES([OPENSSL], [libcrypto], [AC_DEFINE([HAVE_OPENSSL], [1], [Whether to use OpenSSL.]) diff --git a/perl/Makefile b/perl/Makefile index 8171d1945..cd07631ca 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -5,7 +5,8 @@ nix_perl_sources := \ $(d)/lib/Nix/SSH.pm \ $(d)/lib/Nix/CopyClosure.pm \ $(d)/lib/Nix/Config.pm.in \ - $(d)/lib/Nix/Utils.pm + $(d)/lib/Nix/Utils.pm \ + $(d)/lib/Nix/Crypto.pm nix_perl_modules := $(nix_perl_sources:.in=)