gegl r2000 - in trunk: . docs

[neo svn gnome org]

Author: neo
Date: Mon Feb 11 08:12:49 2008
New Revision: 2000
URL: http://svn.gnome.org/viewvc/gegl?rev=2000&view=rev

Log:
2008-02-11  Sven Neumann  <sven gimp org>

	* configure.ac: added check for asciidoc.

	* docs/Makefile.am: only build index.html when asciidoc is 
available.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/docs/   (props changed)
   trunk/docs/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 11 08:12:49 2008
@@ -501,6 +501,7 @@
 AC_SUBST(RSVG_CFLAGS) 
 AC_SUBST(RSVG_LIBS) 
 
+
 ###################
 # Check for OpenEXR
 ###################
@@ -535,6 +536,7 @@
 AC_SUBST(SDL_CFLAGS)
 AC_SUBST(SDL_LIBS)
 
+
 ####################
 # Check for graphviz
 ####################
@@ -567,6 +569,20 @@
 AC_SUBST(HAVE_ENSCRIPT)
 
 
+####################
+# Check for asciidoc
+####################
+ 
+AC_PATH_PROG(ASCIIDOC, asciidoc, no)
+if test "$ASCIIDOC" = "no"; then
+  have_asciidoc="no  (asciidoc not found)"
+  AC_MSG_RESULT([*** Check for asciidoc failed.])
+else
+  have_asciidoc="yes"
+fi
+AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
+
+
 ##########################################
 # Check for avcodec and avformat libraries
 ##########################################
@@ -667,6 +683,7 @@
 Optional features:
   GEGL docs:      $enable_docs
   Build workshop: $enable_workshop
+  Build website:  $have_asciidoc
 
 Optional dependencies:
   GTK+:           $have_gtk

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Mon Feb 11 08:12:49 2008
@@ -6,8 +6,8 @@
 #	
 #
 #
+
 HTML_FILES = index-static.txt 	\
-	index.html		\
 	operations.html		\
 	class-hierarchy.html	\
 	gegl.h.html		\
@@ -15,6 +15,10 @@
 	gegl-operation.h.html	\
 	gegl-plugin.h.html
 
+if HAVE_ASCIIDOC
+HTML_FILES += index.html
+endif
+
 EXTRA_DIST= 			\
 	ChangeLog		\
 	gegl.css  		\
@@ -73,9 +77,14 @@
 	    $(top_builddir)/bin/gegl		 \
 	    Makefile.am				 \
 	    $(srcdir)/hello-world.c
+if HAVE_ASCIIDOC
 	@echo "HTML: $@"
 	cp $< $@ 
-	asciidoc --unsafe  -o $@ -a stylesdir=`pwd` -a toc -a theme=gegl $<
+	$(ASCIIDOC) --unsafe  -o $@ -a stylesdir=`pwd` -a toc -a theme=gegl $<
+else
+	@echo "*** asciidoc must be available in order to make dist"
+	@false
+endif
 
 distclean-local:
 	if test $(srcdir) = .; then :; else 	\
@@ -97,3 +106,15 @@
 
 hello-world-video: hello-world-video.c
 	$(CC) $< -o $@ `pkg-config --cflags --libs gegl`
+
+
+# require asciidoc when making dist
+#
+dist-check-asciidoc:
+if HAVE_ASCIIDOC
+else
+	@echo "*** asciidoc must be available in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-asciidoc