monkey-bubble r255 - trunk

[herzi svn gnome org]

Author: herzi
Date: Tue Feb  5 16:13:01 2008
New Revision: 255
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=255&view=rev

Log:
2008-02-05  Sven Herzberg  <sven imendio com>

	Finish development of the Maemo stuff wrt missing gnome-doc-utils.

	* Makefile.am: don't pass 'make dist' if gnome-doc-utils macros
	haven't been found
	* configure.in: support running autoconf and aclocal without installed
	gnome-doc-utils macros


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Feb  5 16:13:01 2008
@@ -66,3 +66,13 @@
 		 dpkg-buildpackage -rfakeroot || \
 		 true
 	-rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
+
+dist-local:
+	@break_dist@ echo "FATAL:" 2>&1 > /dev/null
+	@break_dist@ echo "FATAL: Trying to create broken tarball:" 2>&1 > /dev/null
+	@break_dist@ echo "FATAL: ================================" 2>&1 > /dev/null
+	@break_dist@ echo "FATAL: Some serious build-dependency (like gnome-doc-utils) is missing." 2>&1 > /dev/null
+	@break_dist@ echo "FATAL: Refusing to 'make dist'" 2>&1 > /dev/null
+	@break_dist@ echo "FATAL:" 2>&1 > /dev/null
+	@break_dist@ false
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb  5 16:13:01 2008
@@ -35,8 +35,10 @@
 dnl | documentation |---------------------------------------------------------
 dnl  ---------------
 
-GNOME_DOC_INIT([],[have_gdu=1],[have_gdu=0])
+broke_dist=#
+ifdef([GNOME_DOC_INIT],[GNOME_DOC_INIT([],[have_gdu=1],[have_gdu=0])],[broke_dist=""])
 AM_CONDITIONAL(WITH_GNOME_DOC_UTILS,test "x$have_gdu" = "x1")
+AC_SUBST(broke_dist)
 
 dnl  ------------------
 dnl | platform support |------------------------------------------------------