diff options
author | Christian Persch <chpe@svn.gnome.org> | 2007-01-26 13:34:38 +0000 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2007-01-26 13:34:38 +0000 |
commit | 464ab5f752fe4d1733e72aa1242476f569464786 (patch) | |
tree | 8279d368ef05b50053c451445f6455bebd31d339 | |
parent | 0295de92ded7fca5f0db7e604745ca8b561f54b1 (diff) | |
download | gnome-doc-utils-464ab5f752fe4d1733e72aa1242476f569464786.tar.gz |
Make make dist fail when gdu isn't present. Bug #400705.
2007-01-25 Christian Persch <chpe@svn.gnome.org>
* configure.in:
* tools/gnome-doc-utils.m4:
* tools/gnome-doc-utils.make: Make make dist fail when gdu isn't
present. Bug #400705.
2007-01-25 Christian Persch <chpe@svn.gnome.org>
svn path=/trunk/; revision=868
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | tools/gnome-doc-utils.m4 | 1 | ||||
-rw-r--r-- | tools/gnome-doc-utils.make | 8 |
5 files changed, 18 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2007-01-25 Christian Persch <chpe@svn.gnome.org> + * configure.in: + * tools/gnome-doc-utils.m4: + * tools/gnome-doc-utils.make: Make make dist fail when gdu isn't + present. Bug #400705. + +2007-01-25 Christian Persch <chpe@svn.gnome.org> + * configure.in: Actually remove the ALL_LINGUAS line too. 2006-04-15 Brian Pepple <bdpepple@gmail.com> @@ -25,4 +25,4 @@ export ACLOCAL_FLAGS cp $srcdir/tools/gnome-doc-utils.m4 gnome-doc-utils.m4 -REQUIRED_AUTOMAKE_VERSION=1.6 USE_GNOME2_MACROS=1 . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.in index 18229ab..bb3ce31 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,8 @@ AC_INIT([gnome-doc-utils], [0.8.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-doc-utils]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) +gdu_cv_have_gdu=yes GNOME_DOC_DEFINES AC_ARG_ENABLE([build-utils], diff --git a/tools/gnome-doc-utils.m4 b/tools/gnome-doc-utils.m4 index 5ef2167..8dfb843 100644 --- a/tools/gnome-doc-utils.m4 +++ b/tools/gnome-doc-utils.m4 @@ -26,6 +26,7 @@ AC_ARG_ENABLE([scrollkeeper], enable_scrollkeeper=yes) AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) +AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ]) # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make index ba28a07..eca7108 100644 --- a/tools/gnome-doc-utils.make +++ b/tools/gnome-doc-utils.make @@ -59,13 +59,19 @@ $(DOC_H_FILE): $(DOC_H_DOCS); done; cp $@.tmp $@ && rm -f $@.tmp +dist-check-gdu: +if !HAVE_GNOME_DOC_UTILS + @echo "*** GNOME Doc Utils must be installed in order to make dist" + @false +endif + .PHONY: dist-doc-header dist-doc-header: $(DOC_H_FILE) @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; -doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header) +doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) .PHONY: clean-doc-header _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) |