From: Benno Schulenberg Date: Wed, 2 Apr 2014 20:37:30 +0000 (+0000) Subject: Trying to build info only when 'makeinfo' is available. X-Git-Tag: v2.3.3~225 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b29ea107b6c5e72eacfd18cd0b33a21499d41588;p=nano.git Trying to build info only when 'makeinfo' is available. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4705 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index fcda1ad5..0ec8dc94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-04-02 Benno Schulenberg + * configure.ac, doc/Makefile.am: Try to build the info documentation + only when 'makeinfo' is available. Patch partly by Mike Frysinger. + 2014-04-02 Mike Frysinger * doc/man/{,fr}/Makefile.am: Simplify the man rules still further. * .gitignore: Add 'config.cache', created by './configure -C'. diff --git a/configure.ac b/configure.ac index 49fdf858..cf344be4 100644 --- a/configure.ac +++ b/configure.ac @@ -617,7 +617,7 @@ AS_IF([test "x$enable_libmagic" != "xno"], [ AC_CHECK_LIB(magic, magic_open) ]) -# Check for groff html support +# Check for groff html support. AC_MSG_CHECKING([for HTML support in groff]) groff -t -mandoc -Thtml /dev/null if test $? -ne 0 ; then @@ -631,6 +631,10 @@ else fi AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes) +# Check for the availability of makeinfo. +AC_CHECK_PROG(haveit, makeinfo, yes, no) +AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes) + AC_CONFIG_FILES([ Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 24f80951..c197ceb0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,11 @@ +SUBDIRS = man + +if HAVE_MAKEINFO +SUBDIRS += texinfo +endif + if USE_COLOR -SUBDIRS = man syntax texinfo -else -SUBDIRS = man texinfo +SUBDIRS += syntax endif dist_html_DATA = faq.html