From b0d0be4c49bc4c055dd604cb4c51693702d9ced1 Mon Sep 17 00:00:00 2001 From: bdean Date: Thu, 10 Feb 2005 14:54:57 +0000 Subject: [PATCH] Patch to disable the doc build by default; the tools needed to build doc are either not available on all systems or are at best inconvenient to build and install. The doc can still be built, one just needs to specify --enable-doc at configure time. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@445 81a1dc3b-b13d-400b-aceb-764788c761c2 --- Makefile.am | 7 +++++-- configure.ac | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1ee990aa..ad7643b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,8 +34,11 @@ CLEANFILES = \ config_gram.h \ lexer.c -SUBDIRS = doc @WINDOWS_DIRS@ -DIST_SUBDIRS = doc windows +#SUBDIRS = doc @WINDOWS_DIRS@ +#DIST_SUBDIRS = doc windows + +SUBDIRS = @SUBDIRS_AC@ +DIST_SUBDIRS = @DIST_SUBDIRS_AC@ AM_YFLAGS = -d diff --git a/configure.ac b/configure.ac index 4526e17d..c4e17b8d 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,32 @@ else DOC_INST_DIR='$(DESTDIR)$(datadir)/doc/avrdude' fi +AC_ARG_ENABLE( + [doc], + AC_HELP_STRING( + [--enable-doc], + [Enable building documents(default)]), + [case "${enableval}" in + yes) enabled_doc=yes ;; + no) enabled_doc=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for disable-doc option) ;; + esac], + [enabled_doc=no]) + +if test "$enabled_doc" = "yes"; then + +SUBDIRS_AC='doc @WINDOWS_DIRS@' +DIST_SUBDIRS_AC='doc windows' +else + +SUBDIRS_AC='@WINDOWS_DIRS@' +DIST_SUBDIRS_AC='windows' +fi + AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR) +AC_SUBST(SUBDIRS_AC, $SUBDIRS_AC) +AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC) + # Find the parallel serial device files based on target system # If a system doesn't have a PC style parallel, mark it as unknown. @@ -140,4 +165,6 @@ AC_CONFIG_FILES([ avrdude.conf Makefile ]) + AC_OUTPUT +