some fixes regarding doxygen configuration

Makefile.am

@@ -17,7 +17,7 @@ if HAVE_CHECK
 	SUBS+= tests
 endif
 
-if USE_DOXYGEN
+if ENABLE_DOXYGEN
 	SUBS+= doc
 endif
 SUBDIRS = $(SUBS) examples/src	

configure.ac

@@ -69,6 +69,7 @@ AM_CONDITIONAL(COVERAGE, test x"$coverage" = x"true")
 AM_COND_IF([COVERAGE],
     AC_DEFINE([COVERAGE])) #define MULTITHREADING is accessible from pre-processor
 
+#doxygen start
 AC_ARG_ENABLE(doxygen,
 AS_HELP_STRING([--enable-doxygen],
                [enable doxygen, default: no]),
@@ -80,37 +81,15 @@ AS_HELP_STRING([--enable-doxygen],
 
 AM_CONDITIONAL(ENABLE_DOXYGEN, test x"$enabledoxygen" = x"true")
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
-AM_CONDITIONAL([HAVE_DOXYGEN],[test -n "$DOXYGEN"])
 
-AM_COND_IF([ENABLE_DOXYGEN],[AM_COND_IF([HAVE_DOXYGEN],[usedoxygen=true],[usedoxygen=false])],[usedoxygen=false])
-
-#if ENABLE_DOXYGEN;then
-   # if HAVE_DOXYGEN;then
-   #     usedoxygen = true
-   # else
-  #      usedoxygen = false
- #  fi
-#else
- #  usedoxygen = false
-#fi
-AM_CONDITIONAL([USE_DOXYGEN], test x"$usedoxygen" = x"true")
-
-AM_COND_IF([USE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
-
-
-
-
-
-    
-if test -z "$DOXYGEN";then 
-    AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
+#break if doxygen enabled but not present
+if test x"$enabledoxygen" = x"true"; then    
+	if test -z "$DOXYGEN"; then 
+    		AC_MSG_ERROR([Doxygen not found])
+	fi
 fi
-
-
-
-
-
-
+AM_COND_IF([ENABLE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
+#doxygen end
 
    
 AC_LIBTOOL_WIN32_DLL

doc/Makefile.am

@@ -1,4 +1,4 @@
-if USE_DOXYGEN
+if ENABLE_DOXYGEN
 directory = $(top_srcdir)/doc/man/man3/
 
 dist_man_MANS = $(directory)/man_page_1.3 $(directory)/man_page_2.3
@@ -14,5 +14,6 @@ CLEANFILES = doxyfile.stamp
 all-local: doxyfile.stamp
 clean-local:
 	rm -rf $(top_srcdir)/docs/man
-
+	rm -rf html
+	rm -rf latex
 endif