diff options
| author | David King <amigadave@amigadave.com> | 2015-01-20 14:24:55 +0000 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2015-01-23 21:53:45 +0000 |
| commit | 9498561cf61a4f6fa2f2a9b618307ef2198e11d1 (patch) | |
| tree | ab5a91d8cac3bcbed81577d2ba7c55cb1e6e2433 | |
| parent | 2b6c02e814a0323faa4fa76e4904c28d7b9ce792 (diff) | |
| download | gnome-contacts-9498561cf61a4f6fa2f2a9b618307ef2198e11d1.tar.gz | |
Fix man page configure check
Default to enabling the man page generation.
https://bugzilla.gnome.org/show_bug.cgi?id=743255
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index c249e9d..6593eb0 100644 --- a/configure.ac +++ b/configure.ac @@ -88,17 +88,22 @@ AC_SUBST(GLIB_COMPILE_RESOURCES) # Documentation # ################# -AC_ARG_ENABLE(man-pages, - AC_HELP_STRING([--enable-man-pages], - [build man pages]),, - enable_documentation=yes) -if test x$enable_man_pages = xyes; then - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test x$XSLTPROC = x; then - AC_MSG_ERROR([xsltproc is required to build man pages]) - fi -fi -AM_CONDITIONAL(BUILD_MAN_PAGES, test x$enable_man_pages = xyes) +AC_ARG_ENABLE([man-pages], + [AS_HELP_STRING([--disable-man-pages], + [disable building man pages])]) +AS_IF([test "x$enable_man_pages" != "xno"], + [AC_PATH_PROG([XSLTPROC], [xsltproc]) + AS_IF([test "xac_cv_path_XSLTPROC" = "x"], [have_xsltproc=no], + [have_xsltproc=yes]) +dnl TODO: Also check for the required stylesheets. + AS_IF([test "x$have_xsltproc" = "xyes"], + [have_manutils=yes], + [AS_IF([test "x$enable_man_pages" = "xyes"], + [AC_MSG_ERROR([man page requested but required utilities were not found])]) + have_manutils=no])], + [have_manutils=no]) + +AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$have_manutils" = "xyes"]) dnl libgd |