From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 4 Feb 2016 16:41:40 +0000 (-0700)
Subject: admin/build-doc: depend on zlib1g-dev and graphviz
X-Git-Tag: v10.0.4~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7522%2Fhead;p=ceph.git

admin/build-doc: depend on zlib1g-dev and graphviz

The docs currently require zlib1g-dev (on Ubuntu) and graphviz (on RHEL
and Ubuntu) in order to build.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/admin/build-doc b/admin/build-doc
index a69d4eb2c441..37cb8c90767c 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -7,7 +7,7 @@ TOPDIR=`pwd`
 install -d -m0755 build-doc
 
 if command -v dpkg >/dev/null; then
-    for package in python-dev python-pip python-virtualenv doxygen ditaa ant libxml2-dev libxslt1-dev cython; do
+    for package in python-dev python-pip python-virtualenv doxygen ditaa ant libxml2-dev libxslt1-dev zlib1g-dev cython graphviz; do
 	if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then
             # add a space after old values
 	    missing="${missing:+$missing }$package"
@@ -19,7 +19,7 @@ if command -v dpkg >/dev/null; then
 	exit 1
     fi
 elif command -v yum >/dev/null; then
-    for package in python-devel python-pip python-virtualenv doxygen ditaa ant libxml-devel libxslt-devel Cython; do
+    for package in python-devel python-pip python-virtualenv doxygen ditaa ant libxml-devel libxslt-devel Cython graphviz; do
 	if ! rpm -q $package >/dev/null ; then
 		missing="${missing:+$missing }$package"
 	fi