--- acinclude.m4.orig   Sat Jan 17 09:12:15 2004
	+++ acinclude.m4        Fri Feb 23 18:32:47 2007
	@@ -2986,17 +2986,38 @@
	   dynamic_linker=no
	   ;;
	
	-freebsd*)
	-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
	+kfreebsd*-gnu)
	+  version_type=linux
	+  need_lib_prefix=no
	+  need_version=no
	+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
	+  soname_spec='${libname}${release}${shared_ext}$major'
	+  shlibpath_var=LD_LIBRARY_PATH
	+  shlibpath_overrides_runpath=no
	+  hardcode_into_libs=yes
	+  dynamic_linker='GNU ld.so'
	+  ;;
	+
	+freebsd* | dragonfly*)
	+  # DragonFly does not have aout.  When/if they implement a new
	+  # versioning mechanism, adjust this.
	+  if test -x /usr/bin/objformat; then
	+    objformat=`/usr/bin/objformat`
	+  else
	+    case $host_os in
	+    freebsd[[123]]*) objformat=aout ;;
	+    *) objformat=elf ;;
	+    esac
	+  fi
	   version_type=freebsd-$objformat
	   case $version_type in
	     freebsd-elf*)
	-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
	+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
	       need_version=no
	       need_lib_prefix=no
	       ;;
	     freebsd-*)
	-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
	+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
	       need_version=yes
	       ;;
	   esac
	@@ -3005,8 +3026,17 @@
	   freebsd2*)
	     shlibpath_overrides_runpath=yes
	     ;;
	-  *)
	+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
	+    shlibpath_overrides_runpath=yes
	+    hardcode_into_libs=yes
	+    ;;
	+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
	+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
	     shlibpath_overrides_runpath=no
	+    hardcode_into_libs=yes
	+    ;;
	+  freebsd*) # from 4.6 on
	+    shlibpath_overrides_runpath=yes
	     hardcode_into_libs=yes
	     ;;
	   esac
	--- aclocal.m4.orig     Tue Feb 24 06:44:21 2004
	+++ aclocal.m4  Fri Feb 23 18:33:12 2007
	@@ -2952,17 +2952,38 @@
	   dynamic_linker=no
	   ;;
	
	-freebsd*)
	-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
	+kfreebsd*-gnu)
	+  version_type=linux
	+  need_lib_prefix=no
	+  need_version=no
	+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
	+  soname_spec='${libname}${release}${shared_ext}$major'
	+  shlibpath_var=LD_LIBRARY_PATH
	+  shlibpath_overrides_runpath=no
	+  hardcode_into_libs=yes
	+  dynamic_linker='GNU ld.so'
	+  ;;
	+
	+freebsd* | dragonfly*)
	+  # DragonFly does not have aout.  When/if they implement a new
	+  # versioning mechanism, adjust this.
	+  if test -x /usr/bin/objformat; then
	+    objformat=`/usr/bin/objformat`
	+  else
	+    case $host_os in
	+    freebsd[[123]]*) objformat=aout ;;
	+    *) objformat=elf ;;
	+    esac
	+  fi
	   version_type=freebsd-$objformat
	   case $version_type in
	     freebsd-elf*)
	-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
	+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
	       need_version=no
	       need_lib_prefix=no
	       ;;
	     freebsd-*)
	-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
	+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
	       need_version=yes
	       ;;
	   esac
	@@ -2971,8 +2992,17 @@
	   freebsd2*)
	     shlibpath_overrides_runpath=yes
	     ;;
	-  *)
	+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
	+    shlibpath_overrides_runpath=yes
	+    hardcode_into_libs=yes
	+    ;;
	+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
	+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
	     shlibpath_overrides_runpath=no
	+    hardcode_into_libs=yes
	+    ;;
	+  freebsd*) # from 4.6 on
	+    shlibpath_overrides_runpath=yes
	     hardcode_into_libs=yes
	     ;;
	   esac