Index: /branches/rel8/psModules/Makefile.am
===================================================================
--- /branches/rel8/psModules/Makefile.am	(revision 5356)
+++ /branches/rel8/psModules/Makefile.am	(revision 5357)
@@ -8,6 +8,8 @@
 EXTRA_DIST = Doxyfile.in psmodule-config.in psmodule.pc.in
 
+if DOXYGEN
+
 docs: Doxyfile $(prefix)/docs/psmodule $(mandir)/man3
-	$(DOXYGEN)
+	doxygen Doxyfile
 	mv -f $(prefix)/docs/psmodule/man/man3/* $(mandir)/man3
 	rm -rf $(prefix)/docs/psmodule/man
@@ -24,3 +26,5 @@
 CLEANFILES = $(prefix)/docs/psmodule/*
 
+endif
+
 test: check
Index: /branches/rel8/psModules/configure.ac
===================================================================
--- /branches/rel8/psModules/configure.ac	(revision 5356)
+++ /branches/rel8/psModules/configure.ac	(revision 5357)
@@ -47,14 +47,6 @@
 dnl doxygen -------------------------------------------------------------------
 
-AC_PATH_PROG([DOXYGEN], [doxygen], [missing])
-if test "$DOXYGEN" = "missing" ; then
-  AC_MSG_ERROR([doxygen is required])
-fi
-
-dnl needed by doxygen
-AC_PATH_PROG([PERL], [perl], [missing])
-if test "$PERL" = "missing" ; then
-  AC_MSG_ERROR([perl is required])
-fi
+AC_CHECK_PROG([doxygen], [doxygen], [true], [false])
+AM_CONDITIONAL(DOXYGEN, test x$doxygen = xtrue)
 
 dnl pslib ---------------------------------------------------------------------