[cairo-commit] cairomm ChangeLog,1.41,1.42 configure.in,1.11,1.12

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm
In directory kemper:/tmp/cvs-serv13028

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-03-30  Danilo Piazzalunga  <danilopiazza at gmail.com>

	* configure.in: enable documentation even if doxygen and/or graphviz
	are missing, so the docs will be installed when building a release.
	* docs/reference/Makefile.am: don't remove html directory with `make clean`,
	so that users of the tarball releases don't destroy the pre-built
	documentation when running make clean. Change to maintainer-clean


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	30 Mar 2006 02:44:05 -0000	1.41
+++ ChangeLog	31 Mar 2006 04:00:02 -0000	1.42
@@ -1,3 +1,11 @@
+2006-03-30  Danilo Piazzalunga  <danilopiazza at gmail.com>
+
+	* configure.in: enable documentation even if doxygen and/or graphviz
+	are missing, so the docs will be installed when building a release.
+	* docs/reference/Makefile.am: don't remove html directory with `make clean`,
+	so that users of the tarball releases don't destroy the pre-built
+	documentation when running make clean. Change to maintainer-clean
+
 2006-03-29  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
 
 	* configure.in: added tests for doxygen and graphviz which displays a

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.in	30 Mar 2006 02:44:05 -0000	1.11
+++ configure.in	31 Mar 2006 04:00:02 -0000	1.12
@@ -103,19 +103,22 @@
 if test "x$enable_docs" = "xyes"; then
   dnl check if doxygen is installed
   AC_CHECK_PROGS(DOXYGEN, [doxygen], no)
-  dnl check if graphviz / dot is installed (used by doxygen)
-  AC_CHECK_PROGS(DOT, [dot], no)
-
-  if test x$DOXYGEN = xno -o x$DOT = xno; then
-    AC_MSG_WARN([Doxygen not found, documentation will not be built])
+  if test x$DOXYGEN = xno; then
+    AC_MSG_WARN([Doxygen not found, documentation will not be rebuilt])
   else
-    DOCS_SUBDIR="docs"
-    AC_CONFIG_FILES(
-                    docs/Makefile
-                    docs/reference/Makefile
-                    docs/reference/Doxyfile
-                    )
+    dnl check if graphviz / dot is installed (used by doxygen)
+    AC_CHECK_PROGS(DOT, [dot], no)
+    if test x$DOT = xno; then
+      AC_MSG_WARN([graphviz / dot not found, documentation graphs will not be rebuilt])
+    fi
   fi
+
+  DOCS_SUBDIR="docs"
+  AC_CONFIG_FILES(
+    docs/Makefile
+    docs/reference/Makefile
+    docs/reference/Doxyfile
+  )
 fi
 AC_SUBST(DOCS_SUBDIR)