--- configure.orig	2013-06-12 07:13:59 UTC
+++ configure
@@ -127,6 +127,10 @@ searchbin()
 {
     if test "x$1" = "x"; then return 0; fi
     echo_n "binary $1: "
+    if test -x "$1"; then
+        echo "found"
+        return 1
+    fi
     IFS=':'
     for i in $PATH
     do
@@ -258,7 +262,7 @@ searchbin ocamlfind
 if test $? -eq 1 -a $ocamlfind != "no"; then 
     instmeth='findlib'
     if test "$installdir" = "auto"
-    then installdir=`ocamlfind printconf destdir`; fi
+    then installdir=`ocamlfind printconf destdir | sed 's/:.*//'`; fi
 else
     searchbin install
     if test $? -eq 1; then instmeth='install'
@@ -304,6 +308,14 @@ case $host in
             arch='i686'
         fi
 	;;
+    i386-*freebsd* | i386-*dragonfly*)
+        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
+        arch='i686'
+        ;;
+    amd64-*freebsd* | x86_64-*dragonfly*)
+        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
+        arch='x86_64'
+        ;;
     i386-*darwin* | x86_64-*darwin*)
         ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef"
         if test "x$wordsize" = "x64"; then
@@ -401,7 +413,7 @@ CFLAGS=$ccinc $ccdef $ccopt
 ASFLAGS=$ccdef $asopt
 LIBS=$cclib
 ARCH=$arch
-INSTALLDIR=$installdir
+INSTALLDIR=${DESTDIR}$installdir
 AR=$ar
 INSTALL=install
 OCAMLFIND=ocamlfind