[cairo-commit] cairomm ChangeLog,1.40,1.41 configure.in,1.10,1.11

[Jonathon Jongsma]

Committed by: jjongsma

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-03-29  Jonathon Jongsma  <jonathon.jongsma at gmail.com>

	* configure.in: added tests for doxygen and graphviz which displays a
	warning if the user has --enable-docs set but doesn't have doxygen or
	graphviz installed.  


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	30 Mar 2006 01:26:50 -0000	1.40
+++ ChangeLog	30 Mar 2006 02:44:05 -0000	1.41
@@ -1,3 +1,9 @@
+2006-03-29  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
+
+	* configure.in: added tests for doxygen and graphviz which displays a
+	warning if the user has --enable-docs set but doesn't have doxygen or
+	graphviz installed.  
+
 2006-03-28  Danilo Piazzalunga  <danilopiazza at gmail.com>
 
 	* cairomm/enums.h: Stop using CAIRO_EXTEND_PAD, as it only exists

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.in	15 Mar 2006 01:42:52 -0000	1.10
+++ configure.in	30 Mar 2006 02:44:05 -0000	1.11
@@ -95,18 +95,27 @@
 GLIBMM_CHECK_PERL([5.6.0])
 
 
+dnl Check whether to build the documentation directory
+DOCS_SUBDIR="" dnl set DOCS_SUBDIR initially blank
 AC_ARG_ENABLE(docs, [AC_HELP_STRING([--enable-docs],
               [build the included docs [default=yes]])],,
-                        [enable_docs=yes])
+              [enable_docs=yes])
 if test "x$enable_docs" = "xyes"; then
-  DOCS_SUBDIR="docs"
-  AC_CONFIG_FILES(
-    docs/Makefile
-    docs/reference/Makefile
-    docs/reference/Doxyfile
-  )
-else
-  DOCS_SUBDIR=""
+  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])
+  else
+    DOCS_SUBDIR="docs"
+    AC_CONFIG_FILES(
+                    docs/Makefile
+                    docs/reference/Makefile
+                    docs/reference/Doxyfile
+                    )
+  fi
 fi
 AC_SUBST(DOCS_SUBDIR)