--- configure.orig	2020-11-11 02:25:27.000000000 +1000
+++ configure	2021-12-03 00:22:04.282135000 +1000
@@ -677,6 +677,8 @@
 OS_SOLARIS_TRUE
 OS_QNX_FALSE
 OS_QNX_TRUE
+OS_BSDSUNIX_FALSE
+OS_BSDSUNIX_TRUE
 OS_FREEBSD_FALSE
 OS_FREEBSD_TRUE
 OS_HPUX_FALSE
@@ -5978,7 +5980,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | bsdsunix* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6389,13 +6391,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+bsdsunix* | freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (BSDSUniX|FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -10916,7 +10918,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    bsdsunix* | freebsd* | dragonfly*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -11962,6 +11964,17 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+bsdsunix*)
+  version_type=bsdsunix-elf
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  need_version=no
+  need_lib_prefix=no
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -14068,11 +14081,11 @@
         ld_shlibs_CXX=no
         ;;
 
-      freebsd-elf*)
+      bsdsunix-elf*|freebsd-elf*)
         archive_cmds_need_lc_CXX=no
         ;;
 
-      freebsd* | dragonfly*)
+      bsdsunix* | freebsd* | dragonfly*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         ld_shlibs_CXX=yes
@@ -15012,7 +15025,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      bsdsunix* | freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -15939,6 +15952,17 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+bsdsunix*)
+  version_type=bsdsunix-elf
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  need_version=no
+  need_lib_prefix=no
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -17777,6 +17801,14 @@
   OS_HPUX_FALSE=
 fi
 
+ if expr x$target_os : xbsdsunix >/dev/null; then
+  OS_BSDSUNIX_TRUE=
+  OS_BSDSUNIX_FALSE='#'
+else
+  OS_BSDSUNIX_TRUE='#'
+  OS_BSDSUNIX_FALSE=
+fi
+
  if expr x$target_os : xfreebsd >/dev/null; then
   OS_FREEBSD_TRUE=
   OS_FREEBSD_FALSE='#'
@@ -17856,13 +17888,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_dwarf" >&5
 $as_echo "$use_dwarf" >&6; }
 
-if test x$target_arch = xppc64; then
-        libdir='${exec_prefix}/lib64'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: PowerPC64 detected, lib will be installed ${libdir}" >&5
-$as_echo "$as_me: PowerPC64 detected, lib will be installed ${libdir}" >&6;};
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to restrict build to remote support" >&5
 $as_echo_n "checking whether to restrict build to remote support... " >&6; }
 if test x$target_arch != x$host_arch; then
@@ -18778,6 +18803,10 @@
 fi
 if test -z "${OS_HPUX_TRUE}" && test -z "${OS_HPUX_FALSE}"; then
   as_fn_error $? "conditional \"OS_HPUX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${OS_BSDSUNIX_TRUE}" && test -z "${OS_BSDSUNIX_FALSE}"; then
+  as_fn_error $? "conditional \"OS_BSDSUNIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${OS_FREEBSD_TRUE}" && test -z "${OS_FREEBSD_FALSE}"; then