--- configure.orig	2020-04-30 04:11:44.000000000 +1000
+++ configure	2020-07-30 22:38:39.152577000 +1000
@@ -2789,7 +2789,7 @@
       RPATHFLAG=-R
     fi
     ;;
-  linux*|freebsd*)	RPATHFLAG="-Wl,-rpath," ;;
+  linux*|bsdsunix*|freebsd*)	RPATHFLAG="-Wl,-rpath," ;;
   *)			RPATHFLAG="" ;;
 esac
 
@@ -6443,9 +6443,15 @@
 	    && libdir='${exec_prefix}/'"lib${ABI}"
 	fi
 	;;
-      # On freebsd, it seems 32-bit libraries are in lib32,
+      # On freebsd & BSDSUniX, it seems 32-bit libraries are in lib32,
       # and 64-bit in lib. Don't know about "kfreebsd", does
       # it follow the Linux fhs conventions?
+      *:bsdsunix*:32)
+	libdir='${exec_prefix}/lib32'
+	;;
+      *:bsdsunix*:64)
+	libdir='${exec_prefix}/lib'
+	;;
       *:freebsd*:32)
 	libdir='${exec_prefix}/lib32'
 	;;
@@ -6720,6 +6726,7 @@
 	darwin*)	CCPIC="-fPIC" ;;
         irix*)		CCPIC="-share" ;;
 	hpux*)		CCPIC="+z"; ;;
+	*bsdsunix*)	CCPIC="-fpic" ;;
 	*freebsd*)	CCPIC="-fpic" ;;
 	sco*|sysv4.*)	CCPIC="-KPIC -dy -Bdynamic" ;;
 	solaris*)	CCPIC="-KPIC -Bdynamic" ;;