Browse Source

Fix missing dependencies (#894)

* Add missing build dependencies to RPM spec

* Fail if `asciidoc` or `xmlto` not found
pull/896/head
Rayson Zhu 8 years ago
committed by Max Lv
parent
commit
e5d53933d5
2 changed files with 5 additions and 3 deletions
  1. 6
      configure.ac
  2. 2
      rpm/SPECS/shadowsocks-libev.spec.in

6
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])

2
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

Loading…
Cancel
Save