Merge branch 'maint'

* maint:
  libelf: Try to always set needed .so vars on *BSD*.

lib/libelf/aclocal.m4

@@ -235,7 +235,7 @@ AC_DEFUN(mr_ENABLE_SHARED, [
     AC_REQUIRE([AC_PROG_CC])
     AC_PATH_PROG(LD, ld, ld)
     case "$host" in
-      *-linux*|*-gnu*)
+      *-linux*|*-gnu*|*bsd*|*BSD*)
 	if test "$GCC" = yes; then
 	  mr_TARGET_ELF
 	  if test "$mr_cv_target_elf" = yes; then

lib/libelf/configure

@@ -5742,7 +5742,7 @@ fi
 
 
     case "$host" in
-      *-linux*|*-gnu*)
+      *-linux*|*-gnu*|*bsd*|*BSD*)
 	if test "$GCC" = yes; then