From e5d53933d59af492a7530958d51369a1394e7a20 Mon Sep 17 00:00:00 2001 From: Rayson Zhu Date: Fri, 21 Oct 2016 11:05:42 +0800 Subject: [PATCH] Fix missing dependencies (#894) * Add missing build dependencies to RPM spec * Fail if `asciidoc` or `xmlto` not found --- configure.ac | 6 ++++-- rpm/SPECS/shadowsocks-libev.spec.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 79aeb6a2..03cd593a 100755 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,10 @@ AC_ARG_ENABLE([documentation], AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test x$disable_documentation = xfalse]) AM_COND_IF([ENABLE_DOCUMENTATION], [ - AC_PATH_PROG([ASCIIDOC], [asciidoc], [asciidoc]) - AC_PATH_PROG([XMLTO], [xmlto], [xmlto]) + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.]) + AC_PATH_PROG([XMLTO], [xmlto]) + test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.]) AC_PATH_PROG([GZIP], [gzip], [gzip]) AC_PATH_PROG([RM], [rm], [rm]) AC_PATH_PROG([MV], [mv], [mv]) diff --git a/rpm/SPECS/shadowsocks-libev.spec.in b/rpm/SPECS/shadowsocks-libev.spec.in index d8d50284..f0a71f69 100644 --- a/rpm/SPECS/shadowsocks-libev.spec.in +++ b/rpm/SPECS/shadowsocks-libev.spec.in @@ -8,7 +8,7 @@ License: GPLv3+ URL: https://github.com/shadowsocks/%{name} Source0: %{url}/archive/v%{version}.tar.gz -BuildRequires: openssl-devel +BuildRequires: make automake gcc openssl-devel pcre-devel asciidoc xmlto Requires: openssl %if 0%{?rhel} != 6