Index: configure.in
===================================================================
--- configure.in	(revision 6738)
+++ configure.in	(working copy)
@@ -254,10 +254,14 @@
         VG_OS="aix5"
         ;;       
 
-     *freebsd*)
+     *freebsd6.*)
         AC_MSG_RESULT([ok (${host_os})])
-        VG_OS="freebsd"
+        VG_OS="freebsd6"
         ;;
+     *freebsd7.*)
+        AC_MSG_RESULT([ok (${host_os})])
+        VG_OS="freebsd7"
+        ;;
 
      *) 
 	AC_MSG_RESULT([no (${host_os})])
@@ -354,6 +358,42 @@
 	fi
         AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
 	;;
+     x86-freebsd6)
+	VG_PLATFORM_PRI="X86_FREEBSD6"
+	VG_PLATFORM_SEC=""
+        AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
+	;;
+     amd64-freebsd6)
+	if test x$vg_cv_only64bit = xyes; then
+	   VG_PLATFORM_PRI="AMD64_FREEBSD6"
+	   VG_PLATFORM_SEC=""
+	elif test x$vg_cv_only32bit = xyes; then
+	   VG_PLATFORM_PRI="X86_FREEBSD6"
+	   VG_PLATFORM_SEC=""
+	else
+	   VG_PLATFORM_PRI="AMD64_FREEBSD6"
+	   VG_PLATFORM_SEC="X86_FREEBSD6"
+	fi
+        AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
+	;;
+     x86-freebsd7)
+	VG_PLATFORM_PRI="X86_FREEBSD7"
+	VG_PLATFORM_SEC=""
+        AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
+	;;
+     amd64-freebsd7)
+	if test x$vg_cv_only64bit = xyes; then
+	   VG_PLATFORM_PRI="AMD64_FREEBSD7"
+	   VG_PLATFORM_SEC=""
+	elif test x$vg_cv_only32bit = xyes; then
+	   VG_PLATFORM_PRI="X86_FREEBSD7"
+	   VG_PLATFORM_SEC=""
+	else
+	   VG_PLATFORM_PRI="AMD64_FREEBSD7"
+	   VG_PLATFORM_SEC="X86_FREEBSD7"
+	fi
+        AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
+	;;
     *)
 	VG_PLATFORM_PRI="unknown"
 	VG_PLATFORM_SEC="unknown"
@@ -379,6 +419,16 @@
                  -o x$VG_PLATFORM_SEC = xPPC32_AIX5)
 AM_CONDITIONAL(VGP_PPC64_AIX5, 
                test x$VG_PLATFORM_PRI = xPPC64_AIX5)
+AM_CONDITIONAL(VGP_X86_FREEBSD6,
+	       test x$VG_PLATFORM_PRI = xX86_FREEBSD6 \
+	         -o x$VG_PLATFORM_SEC = xX86_FREEBSD6)
+AM_CONDITIONAL(VGP_AMD64_FREEBSD6,
+	       test x$VG_PLATFORM_PRI = xAMD64_FREEBSD6)
+AM_CONDITIONAL(VGP_X86_FREEBSD7,
+	       test x$VG_PLATFORM_PRI = xX86_FREEBSD7 \
+	         -o x$VG_PLATFORM_SEC = xX86_FREEBSD7)
+AM_CONDITIONAL(VGP_AMD64_FREEBSD7,
+	       test x$VG_PLATFORM_PRI = xAMD64_FREEBSD7)
 
 # Similarly, set up VGO_<os>.  Exactly one of these becomes defined.
 # Relies on the assumption that the primary and secondary targets are 
@@ -392,6 +442,12 @@
 AM_CONDITIONAL(VGO_AIX5,
                test x$VG_PLATFORM_PRI = xPPC32_AIX5 \
                  -o x$VG_PLATFORM_PRI = xPPC64_AIX5)
+AM_CONDITIONAL(VGO_FREEBSD6,
+	       test x$VG_PLATFORM_PRI = xX86_FREEBSD6 \
+	         -o x$VG_PLATFORM_PRI = xAMD64_FREEBSD6)
+AM_CONDITIONAL(VGO_FREEBSD7,
+	       test x$VG_PLATFORM_PRI = xX86_FREEBSD7 \
+	         -o x$VG_PLATFORM_PRI = xAMD64_FREEBSD7)
 
 
 # Sometimes, in the Makefile.am-s, it's useful to know
@@ -457,6 +513,26 @@
 ],
 libc="aix5")
 
+AC_EGREP_CPP([FREEBSD6_LIBC], [
+#include <osreldate.h>
+#if defined(__FreeBSD_version)
+ #if (__FreeBSD_version >= 600000 && __FreeBSD_version < 700000)
+  FREEBSD6_LIBC
+ #endif
+#endif
+],
+libc="freebsd6")
+
+AC_EGREP_CPP([FREEBSD7_LIBC], [
+#include <osreldate.h>
+#if defined(__FreeBSD_version)
+ #if (__FreeBSD_version >= 700000)
+  FREEBSD7_LIBC
+ #endif
+#endif
+],
+libc="freebsd7")
+
 AC_MSG_CHECKING([the libc version])
 
 case "${libc}" in
@@ -490,6 +566,18 @@
 	DEFAULT_SUPP="aix5libc.supp ${DEFAULT_SUPP}"
 	;;
 
+     freebsd6)
+        AC_MSG_RESULT(FreeBSD 6.x family)
+	AC_DEFINE([FREEBSD6_LIBC], 1, [Define to 1 if you're using FreeBSD 6.x])
+	DEFAULT_SUPP="freebsd6libc.supp ${DEFAULT_SUPP}"
+	;;
+
+     freebsd7)
+        AC_MSG_RESULT(FreeBSD 7.x family)
+	AC_DEFINE([FREEBSD6_LIBC], 1, [Define to 1 if you're using FreeBSD 7.x])
+	DEFAULT_SUPP="freebsd7libc.supp ${DEFAULT_SUPP}"
+	;;
+
      *)
 	AC_MSG_RESULT(unsupported version)
 	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])