Doxygen support without bugs now

Makefile.am

@@ -37,3 +37,24 @@ doc_DATA = doc/html/*.html doc/html/*.css doc/html/*.png
 sharedir = ${SHARE_PREFIX}
 share_DATA = README INSTALL AUTHORS COPYING NEWS TODO ChangeLog
 
+install-docData:
+	if test ! -z "${DOC_PREFIX}"; then \
+		cp -r ./doxygen "$(docdir)/doxygen"; \
+	else \
+		exit 0; \
+	fi
+	
+uninstall-docData:
+	if test ! -z "${DOC_PREFIX}"; then \
+		rm -rf "$(docdir)"; \
+	else \
+		exit 0; \
+	fi
+
+all:
+	if test ! -z "${DOC_PREFIX}"; then \
+		if test ! -d "./doc"; then \
+			doxygen; \
+		fi; \
+	fi
+

Makefile.in

@@ -801,6 +801,27 @@ uninstall-am: uninstall-corr_rulesDATA uninstall-docDATA \
 	uninstall-libLTLIBRARIES uninstall-shareDATA
 
 
+install-docData:
+	if test ! -z "${DOC_PREFIX}"; then \
+		cp -r ./doxygen "$(docdir)/doxygen"; \
+	else \
+		exit 0; \
+	fi
+
+uninstall-docData:
+	if test ! -z "${DOC_PREFIX}"; then \
+		rm -rf "$(docdir)"; \
+	else \
+		exit 0; \
+	fi
+
+all:
+	if test ! -z "${DOC_PREFIX}"; then \
+		if test ! -d "./doc"; then \
+			doxygen; \
+		fi; \
+	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

TODO

@@ -1,7 +1,9 @@
 - Bayesian learning among alerts in alert log
 - libgc support
 - PostgreSQL support
+- Dynamic k parameter in correlation threshold
+- Dynamic cluster_min_size algorithm
+- Regex comp cache
 
 - Managing clusters for addresses, timestamps (and more?)
-- Dynamic cluster_min_size algorithm
 

configure

@@ -10763,21 +10763,14 @@ $as_echo "#define OSF1 1" >>confdefs.h
     ;;
 # it is actually <platform>-apple-darwin1.2 or <platform>-apple-rhapsody5.x but lets stick with this for the moment
   *-apple*)
-	# Use Fink.
-	if test -f "/sw/etc/fink.conf"; then
-		LDFLAGS="${LDFLAGS} -L/sw/lib"
-    	extra_incl="-I/sw/include"
-	# Use MacPorts
-	else
-		LDFLAGS="${LDFLAGS} -L/opt/local/lib"
-    	extra_incl="-I/opt/local/include"
-	fi
 
 $as_echo "#define MACOS 1" >>confdefs.h
 
 
 $as_echo "#define BROKEN_SIOCGIFMTU 1" >>confdefs.h
 
+    LDFLAGS="${LDFLAGS} -L/sw/lib"
+    extra_incl="-I/sw/include"
 esac
 
 # Checks for programs.
@@ -11776,8 +11769,12 @@ else
 
 fi
 
+# Set extra prefixes and control if we have Doxygen
+
+if test ! -z "`which doxygen`"; then :
   DOC_PREFIX="${prefix}/doc/snort_ai_preprocessor"
 
+fi
 SHARE_PREFIX="${prefix}/share/snort_ai_preprocessor"
 
 

configure.ac

@@ -87,17 +87,10 @@ case "$host" in
     ;;
 # it is actually <platform>-apple-darwin1.2 or <platform>-apple-rhapsody5.x but lets stick with this for the moment    
   *-apple*)
-	# Use Fink.
-	if test -f "/sw/etc/fink.conf"; then
-		LDFLAGS="${LDFLAGS} -L/sw/lib"
-    	extra_incl="-I/sw/include"
-	# Use MacPorts
-	else
-		LDFLAGS="${LDFLAGS} -L/opt/local/lib"
-    	extra_incl="-I/opt/local/include"
-	fi
     AC_DEFINE([MACOS],[1],[Define if MacOS])
     AC_DEFINE([BROKEN_SIOCGIFMTU],[1],[Define if broken SIOCGIFMTU])
+    LDFLAGS="${LDFLAGS} -L/sw/lib"
+    extra_incl="-I/sw/include"
 esac
 
 # Checks for programs.
@@ -135,7 +128,9 @@ AS_IF([test "x$prefix" == x/usr],
 	[AC_SUBST([CORR_RULES_PREFIX], ["/etc/snort/corr_rules"])],
 	[AC_SUBST([CORR_RULES_PREFIX], ["${prefix}/etc/corr_rules"])])
 
-AC_SUBST([DOC_PREFIX], ["${prefix}/doc/snort_ai_preprocessor"])
+# Set extra prefixes and control if we have Doxygen
+
+AS_IF([test ! -z "`which doxygen`"], [AC_SUBST([DOC_PREFIX], ["${prefix}/doc/snort_ai_preprocessor"])], [])
 AC_SUBST([SHARE_PREFIX], ["${prefix}/share/snort_ai_preprocessor"])
 
 # Checks for header files.