Hello,

As I pointed out in [0], the Debian Project has voted GFDL documents
with Invariant Sections not free according to the DFSG. I will shortly
be removing the documentation from the package in main and moving it
to non-free. Just stripping the doc directory from the tarball doesn't
leave it in a very nice state however. So attached is a patch to allow
automake to build cleanly with the doc directory removed. It also
provides a configure switch to disable building of the
documentation. I believe it to be it to generic enough to be
applicable outside Debian. I hope you agree. 

[0] http://lists.gnu.org/archive/html/automake/2006-03/msg00063.html

-- 
Eric Dorland <[EMAIL PROTECTED]>
ICQ: #61138586, Jabber: [EMAIL PROTECTED]
1024D/16D970C6 097C 4861 9934 27A0 8E1C  2B0A 61E9 8ECF 16D9 70C6

Index: configure.ac
===================================================================
--- configure.ac        (revision 46977)
+++ configure.ac        (working copy)
@@ -145,9 +145,31 @@
 AC_PROG_EGREP
 AC_PROG_FGREP
 
+AC_ARG_ENABLE([documentation], AS_HELP_STRING([--disable-documentation],
+                               [Disble building of the documentation]),
+                               [case "${enableval}" in
+                                yes) cond_doc=true ;;
+                                no)  cond_doc=false ;;
+                                *) AC_MSG_ERROR(bad value ${enableval} 
+                                               for --enable-documentation) ;;
+                                esac], [cond_doc=unset])
+if test ! -d doc ; then
+   if test "$cond_doc" = 'true' ; then
+      AC_MSG_ERROR([--enable-documentation specified, but doc dir does not 
exist])
+   fi
+else
+   if test "$cond_doc" = 'unset' ; then
+      cond_doc='yes'
+   fi
+fi
+AM_CONDITIONAL([DOC], [test "$cond_doc" = 'true'])
+
+if test "$cond_doc" = 'true' ; then
+   AC_CONFIG_FILES([doc/Makefile])
+fi
+
 AC_CONFIG_FILES([
   Makefile
-  doc/Makefile
   lib/Automake/Makefile
   lib/Automake/tests/Makefile
   lib/Makefile
Index: Makefile.am
===================================================================
--- Makefile.am (revision 46977)
+++ Makefile.am (working copy)
@@ -20,9 +20,13 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 
+if DOC
+       MAYBE_DOC = doc
+endif
+
 ## We need `.' in SUBDIRS because we want `check' to build `.' before
 ## tests.
-SUBDIRS = . doc m4 lib tests
+SUBDIRS = . m4 lib tests $(MAYBE_DOC)
 
 bin_SCRIPTS = automake aclocal
 

Attachment: signature.asc
Description: Digital signature

Reply via email to