Commit 70ec5dc0afa5cb4cc0c1fafc844c01973fcde8c3
1 parent
1b3b9ca3
Add a --disable-docs to configure to allow doc build to be disabled
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
5 additions
and
4 deletions
configure
| @@ -177,7 +177,7 @@ softmmu="yes" | @@ -177,7 +177,7 @@ softmmu="yes" | ||
| 177 | linux_user="no" | 177 | linux_user="no" |
| 178 | darwin_user="no" | 178 | darwin_user="no" |
| 179 | bsd_user="no" | 179 | bsd_user="no" |
| 180 | -build_docs="no" | 180 | +build_docs="yes" |
| 181 | uname_release="" | 181 | uname_release="" |
| 182 | curses="yes" | 182 | curses="yes" |
| 183 | pthread="yes" | 183 | pthread="yes" |
| @@ -492,6 +492,8 @@ for opt do | @@ -492,6 +492,8 @@ for opt do | ||
| 492 | ;; | 492 | ;; |
| 493 | --with-pkgversion=*) pkgversion=" ($optarg)" | 493 | --with-pkgversion=*) pkgversion=" ($optarg)" |
| 494 | ;; | 494 | ;; |
| 495 | + --disable-docs) build_docs="no" | ||
| 496 | + ;; | ||
| 495 | *) echo "ERROR: unknown option $opt"; show_help="yes" | 497 | *) echo "ERROR: unknown option $opt"; show_help="yes" |
| 496 | ;; | 498 | ;; |
| 497 | esac | 499 | esac |
| @@ -1236,9 +1238,8 @@ EOF | @@ -1236,9 +1238,8 @@ EOF | ||
| 1236 | fi | 1238 | fi |
| 1237 | 1239 | ||
| 1238 | # Check if tools are available to build documentation. | 1240 | # Check if tools are available to build documentation. |
| 1239 | -if [ -x "`which texi2html 2>/dev/null`" ] && \ | ||
| 1240 | - [ -x "`which pod2man 2>/dev/null`" ]; then | ||
| 1241 | - build_docs="yes" | 1241 | +if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x "`which pod2man 2>/dev/null`" \) ; then |
| 1242 | + build_docs="no" | ||
| 1242 | fi | 1243 | fi |
| 1243 | 1244 | ||
| 1244 | ########################################## | 1245 | ########################################## |