Merge remote branch 'origin/fastpath'

* origin/fastpath:
  Fix CheckTypes.cmake from generating different config.h's between CMake runs.

CHANGES

@@ -1,3 +1,21 @@
+1.6-dev.94 Thu Apr 21 19:51:38 PDT 2011
+
+- Fixing generation of config.h. (Jon Siwek)
+    
+- Updates and tests for NetBIOS name BiF. (Seth Hall)
+  
+- Fixing do_split bug(), and adding a test. (Seth Hall)
+    
+- When Bro is given a PRNG seed, it now uses its own internal random
+  number generator that produces consistent results across sytems.
+  Note that this internal generator isn't very good, so it should only
+  be used for testing purpses. (Robin Sommer)
+    
+- The BTest configuration now sets the environemnt variables TZ=UTC
+  and LANG=C to ensure consistent results. (Robin Sommer)
+    
+- Logging fixes. (Robin Sommer)
+    
 1.6-dev.88 Wed Apr 20 20:43:48 PDT 2011
 
 - Implementation of Bro's new logging framework. We will document this

VERSION

@@ -1 +1 @@
-1.6-dev.88
+1.6-dev.94

cmake/CheckTypes.cmake

@@ -7,12 +7,15 @@ check_type_size("void *" SIZEOF_VOID_P)
 # checks existence of ${_type}, and if it does not, sets CMake variable ${_var}
 # to alternative type, ${_alt_type}
 macro(CheckType _type _alt_type _var)
-    check_type_size(${_type} ${_var})
+    # don't perform check if we have a result from a previous CMake run
-    if (NOT ${_var})
+    if (NOT HAVE_${_var})
-        set(${_var} ${_alt_type})
+        check_type_size(${_type} ${_var})
-    else ()
+        if (NOT ${_var})
-        unset(${_var})
+            set(${_var} ${_alt_type})
-        unset(${_var} CACHE)
+        else ()
+            unset(${_var})
+            unset(${_var} CACHE)
+        endif ()
     endif ()
 endmacro(CheckType _type _alt_type _var)