monkey-bubble r254 - trunk

[herzi svn gnome org]

Author: herzi
Date: Tue Feb  5 15:34:49 2008
New Revision: 254
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=254&view=rev

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

	Conditionalize gnome-doc-utils usage

	* Makefile.am: build help only if we have gnome-doc-utils
	* configure.in: also pass if there are no gnome-doc-utils (but then,
	don't build help)


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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Feb  5 15:34:49 2008
@@ -1,12 +1,24 @@
 NULL=
 
-SUBDIRS = 	\
+always_subdirs=\
 	data	\
 	pixmaps	\
 	sounds 	\
         src     \
         po      \
-        help    \
+	$(NULL)
+
+SUBDIRS=\
+	$(always_subdirs) \
+	$(NULL)
+
+if WITH_GNOME_DOC_UTILS
+SUBDIRS+=help
+endif
+
+DIST_SUBDIRS=\
+	$(always_subdirs) \
+	help \
 	$(NULL)
 
 applications_in_in_files = monkey-bubble.desktop.in.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb  5 15:34:49 2008
@@ -35,7 +35,8 @@
 dnl | documentation |---------------------------------------------------------
 dnl  ---------------
 
-GNOME_DOC_INIT
+GNOME_DOC_INIT([],[have_gdu=1],[have_gdu=0])
+AM_CONDITIONAL(WITH_GNOME_DOC_UTILS,test "x$have_gdu" = "x1")
 
 dnl  ------------------
 dnl | platform support |------------------------------------------------------