 @@ -1,18 +1,19 @@
-$NetBSD: manual-libtool.m4,v 1.50 2022/08/03 13:06:32 jperkin Exp $
+$NetBSD: manual-libtool.m4,v 1.51 2022/08/04 12:23:21 jperkin Exp $
 Support Minix.
 Handle pkgsrc wrappers.
 Fixup output on various OS.
 Remove hardcoding of build-time compiler objects on SunOS.
 --- m4/libtool.m4.orig	2022-03-17 02:43:39.000000000 +0000
 +++ m4/libtool.m4
 @@ -118,7 +118,10 @@ func_cc_basename ()
          *) break;;
        esac
      done
 -    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +    # Return the actual command name, not our pkgsrc wrapper name because several
 +    # decisions are made only based on compiler names
 +    if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
 +    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
 @@ -95,27 +96,27 @@ Fixup output on various OS.
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
 @@ -2907,19 +2916,25 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    dynamic_linker='GNU/Linux ld.so'
    ;;
 +minix*)
 +  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'
 +  dynamic_linker='Minix ld.elf_so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -149,27 +150,27 @@ Fixup output on various OS.
 +  version_type=linux
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 @@ -2953,7 +2968,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
 -  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  library_names_spec='$libname$release$shared_ext$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 @@ -3566,12 +3581,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    lt_cv_deplibs_check_method=pass_all
    ;;
 -netbsd*)
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 -    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
 -  else
 -    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
 -  fi
 +netbsd* | minix*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
    ;;
 @@ -326,59 +327,91 @@ Fixup output on various OS.
      openbsd* | bitrig*)
 @@ -6309,9 +6348,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_DECL_EGREP])dnl
  m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 -if test -n "$CXX" && ( test no != "$CXX" &&
 -    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test g++ != "$CXX"))); then
 +if test -n "$CXX" && test "X$CXX" != "Xno" ; then
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
 @@ -7115,16 +7152,14 @@ if test yes != "$_lt_caught_CXX_error";
  	esac
  	;;
 -      netbsd*)
 -        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
 -	  wlarc=
 -	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 -	  _LT_TAGVAR(hardcode_direct, $1)=yes
 -	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 -	fi
 -	# Workaround some broken pre-1.5 toolchains
 -	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +      netbsd* | minix*)
 +	_LT_TAGVAR(ld_shlibs, $1)=yes
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	output_verbose_link_cmd=func_echo_all
  	;;
        *nto* | *qnx*)
-@@ -7298,7 +7333,7 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7298,35 +7333,12 @@ if test yes != "$_lt_caught_CXX_error";
  	    # GNU C++ compiler with Solaris linker
  	    if test yes,no = "$GXX,$with_gnu_ld"; then
  	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 -	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	      if true; then
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
                    $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-@@ -7557,8 +7592,9 @@ if AC_TRY_EVAL(ac_compile); then
+-	        # Commands to make compiler produce verbose output that lists
 -	        # what "hidden" libraries, object files and flags are used when
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      else
 -	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 -	        # platform.
 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 -	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 -                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+-
 -	        # Commands to make compiler produce verbose output that lists
 -	        # what "hidden" libraries, object files and flags are used when
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      fi
+-
 +	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h $wl$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 +                $CC -shared $pic_flag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	      output_verbose_link_cmd=func_echo_all
  	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
 -	      case $host_os in
 -		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 -		*)
 -		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 -		  ;;
 -	      esac
 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
  	    fi
  	    ;;
          esac
@@ -7557,8 +7569,9 @@ if AC_TRY_EVAL(ac_compile); then
      -L* | -R* | -l*)
         # Some compilers place space between "-{L,R}" and the path.
         # Remove the space.
 -       if test x-L = "$p" ||
 -          test x-R = "$p"; then
 +       if test x-L = x"$p" ||
 +          test x-l = x"$p" ||
 +          test x-R = x"$p"; then
  	 prev=$p
  	 continue
         fi

 @@ -1,19 +1,19 @@
-$NetBSD: patch-configure,v 1.5 2022/08/03 13:06:32 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2022/08/04 12:23:21 jperkin Exp $
 Automatically generated using manual-* patches and bootstrap.
 DO NOT MODIFY THIS PATCH MANUALLY!  YOUR CHANGES WILL BE LOST!
---- configure.orig	2022-08-03 12:14:26.894800127 +0000
+--- configure.orig	2022-08-04 11:35:59.000000000 +0000
 +++ configure
 @@ -748,6 +748,9 @@ AM_BACKSLASH
  AM_DEFAULT_VERBOSITY
  AM_DEFAULT_V
  AM_V
 +CSCOPE
 +ETAGS
 +CTAGS
  am__untar
  am__tar
  AMTAR
 @@ -799,7 +802,6 @@ infodir
  docdir
 @@ -54,27 +54,27 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
 -		libdir localedir mandir runstatedir
 +		libdir localedir mandir
  do
    eval ac_val=\$$ac_var
    # Remove trailing slashes.
 @@ -1445,7 +1437,6 @@ Fine tuning of the installation director
    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
 -  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    --libdir=DIR            object code libraries [EPREFIX/lib]
    --includedir=DIR        C header files [PREFIX/include]
    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
 @@ -3342,6 +3333,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
 +# Variables for tags utilities; see am/tags.am
 +if test -z "$CTAGS"; then
 +  CTAGS=ctags
 +fi
++
 +if test -z "$ETAGS"; then
 +  ETAGS=etags
 +fi
++
 +if test -z "$CSCOPE"; then
 @@ -94,27 +94,27 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
      # 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`
 @@ -6108,6 +6113,9 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 +unset CP
 +unset MV
 +unset RM
  : ${CP="cp -f"}
  : ${MV="mv -f"}
  : ${RM="rm -f"}
 @@ -6574,12 +6582,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    lt_cv_deplibs_check_method=pass_all
    ;;
 -netbsd*)
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 -    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 -  else
 -    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
 -  fi
 +netbsd* | minix*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
    ;;
 @@ -410,135 +410,167 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
 -	# Workaround some broken pre-1.5 toolchains
 -	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +      netbsd* | minix*)
 +	ld_shlibs_CXX=yes
 +	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 +	hardcode_direct_CXX=yes
 +	hardcode_shlibpath_var_CXX=no
 +	output_verbose_link_cmd=func_echo_all
  	;;
        *nto* | *qnx*)
-@@ -16196,7 +16227,7 @@ fi
+@@ -16196,35 +16227,12 @@ fi
  	    # GNU C++ compiler with Solaris linker
  	    if test yes,no = "$GXX,$with_gnu_ld"; then
  	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
 -	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	      if true; then
+-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
- 	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
                    $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-@@ -16360,8 +16391,9 @@ if { { eval echo "\"\$as_me\":${as_linen
+-	        # Commands to make compiler produce verbose output that lists
 -	        # what "hidden" libraries, object files and flags are used when
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      else
 -	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 -	        # platform.
 -	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 -	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 -                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+-
 -	        # Commands to make compiler produce verbose output that lists
 -	        # what "hidden" libraries, object files and flags are used when
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      fi
+-
 +	      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h $wl$soname -o $lib'
 +	      archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 +                $CC -shared $pic_flag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	      output_verbose_link_cmd=func_echo_all
  	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
 -	      case $host_os in
 -		solaris2.[0-5] | solaris2.[0-5].*) ;;
 -		*)
 -		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 -		  ;;
 -	      esac
 +	      whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
  	    fi
  	    ;;
          esac
@@ -16360,8 +16368,9 @@ if { { eval echo "\"\$as_me\":${as_linen
      -L* | -R* | -l*)
         # Some compilers place space between "-{L,R}" and the path.
         # Remove the space.
 -       if test x-L = "$p" ||
 -          test x-R = "$p"; then
 +       if test x-L = x"$p" ||
 +          test x-l = x"$p" ||
 +          test x-R = x"$p"; then
  	 prev=$p
  	 continue
         fi
-@@ -16541,9 +16573,15 @@ lt_prog_compiler_static_CXX=
+@@ -16541,9 +16550,15 @@ lt_prog_compiler_static_CXX=
        esac
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
 +      lt_prog_compiler_static_CXX=''
 +      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_CXX=
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -16621,6 +16659,9 @@ lt_prog_compiler_static_CXX=
+@@ -16621,6 +16636,9 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
 +      mint*)
 +	# FreeMiNT uses GNU C++
 +	;;
        freebsd* | dragonfly* | midnightbsd*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -16728,7 +16769,7 @@ lt_prog_compiler_static_CXX=
+@@ -16728,7 +16746,7 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
 -      netbsd*)
 +      netbsd* | minix*)
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -16818,6 +16859,9 @@ lt_prog_compiler_static_CXX=
+@@ -16818,6 +16836,9 @@ lt_prog_compiler_static_CXX=
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_CXX=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -17545,7 +17589,7 @@ dgux*)
+@@ -17545,7 +17566,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
 -freebsd* | dragonfly* | midnightbsd*)
 +freebsd* | midnightbsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -17590,6 +17634,17 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -17590,6 +17611,17 @@ freebsd* | dragonfly* | midnightbsd*)
    esac
    ;;
 +dragonfly*)
 +  version_type=linux
 +  need_version=no
 +  need_lib_prefix=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
 +  ;;
++
  haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -17667,12 +17722,7 @@ interix[3-9]*)
+@@ -17667,12 +17699,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17796,19 +17846,25 @@ fi
+@@ -17796,19 +17823,25 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
 +minix*)
 +  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'
 +  dynamic_linker='Minix ld.elf_so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -554,192 +586,192 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
 -    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 -    dynamic_linker='NetBSD (a.out) ld.so'
 -  else
 -    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 -    soname_spec='$libname$release$shared_ext$major'
 -    dynamic_linker='NetBSD ld.elf_so'
 -  fi
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='NetBSD ld.elf_so'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -17834,7 +17890,7 @@ newsos6)
+@@ -17834,7 +17867,7 @@ newsos6)
    ;;
  openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-@@ -17842,7 +17898,7 @@ openbsd* | bitrig*)
+@@ -17842,7 +17875,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
 -  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  library_names_spec='$libname$release$shared_ext$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
-@@ -18533,9 +18589,16 @@ lt_prog_compiler_static_F77=
+@@ -18533,9 +18566,16 @@ lt_prog_compiler_static_F77=
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
 +      lt_prog_compiler_static_F77=''
 +      ;;
++
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_F77=
        ;;
      haiku*)
-@@ -18563,6 +18626,13 @@ lt_prog_compiler_static_F77=
+@@ -18563,6 +18603,13 @@ lt_prog_compiler_static_F77=
        # Instead, we relocate shared libraries at runtime.
        ;;
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      lt_prog_compiler_can_build_shared_F77=no
 +      enable_shared=no
 +      ;;
++
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18815,6 +18885,9 @@ lt_prog_compiler_static_F77=
+@@ -18815,6 +18862,9 @@ lt_prog_compiler_static_F77=
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_F77=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -19379,14 +19452,13 @@ _LT_EOF
+@@ -19379,14 +19429,13 @@ _LT_EOF
        fi
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 -	wlarc=
 -      else
 -	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 +    netbsd* | minix*)
 +      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +      hardcode_direct_F77=yes
 +      hardcode_shlibpath_var_F77=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      solaris*)
-@@ -19836,7 +19908,7 @@ fi
+@@ -19836,7 +19885,7 @@ fi
    allow_undefined_flag_F77=$_lt_dar_allow_undefined
    case $cc_basename in
       ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -20020,15 +20092,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -20020,15 +20069,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 -      else
 -	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 -      fi
 -      hardcode_libdir_flag_spec_F77='-R$libdir'
 +    netbsd* | minix*)
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      newsos6)
-@@ -20040,6 +20110,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -20040,6 +20087,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
      *nto* | *qnx*)
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_F77='-R$libdir'
 +      hardcode_direct_F77=yes
 +      hardcode_shlibpath_var_F77=no
        ;;
      openbsd* | bitrig*)
-@@ -20713,7 +20788,7 @@ dgux*)
+@@ -20713,7 +20765,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
 -freebsd* | dragonfly* | midnightbsd*)
 +freebsd* | midnightbsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -20758,6 +20833,17 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -20758,6 +20810,17 @@ freebsd* | dragonfly* | midnightbsd*)
    esac
    ;;
 +dragonfly*)
 +  version_type=linux
 +  need_version=no
 +  need_lib_prefix=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
 +  ;;
++
  haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -20835,12 +20921,7 @@ interix[3-9]*)
+@@ -20835,12 +20898,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -20958,19 +21039,25 @@ fi
+@@ -20958,19 +21016,25 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
 +minix*)
 +  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'
 +  dynamic_linker='Minix ld.elf_so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -755,204 +787,204 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
 -    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 -    dynamic_linker='NetBSD (a.out) ld.so'
 -  else
 -    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 -    soname_spec='$libname$release$shared_ext$major'
 -    dynamic_linker='NetBSD ld.elf_so'
 -  fi
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='NetBSD ld.elf_so'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -20996,7 +21083,7 @@ newsos6)
+@@ -20996,7 +21060,7 @@ newsos6)
    ;;
  openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-@@ -21004,7 +21091,7 @@ openbsd* | bitrig*)
+@@ -21004,7 +21068,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
 -  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  library_names_spec='$libname$release$shared_ext$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
-@@ -21681,8 +21768,9 @@ if { { eval echo "\"\$as_me\":${as_linen
+@@ -21681,8 +21745,9 @@ if { { eval echo "\"\$as_me\":${as_linen
      -L* | -R* | -l*)
         # Some compilers place space between "-{L,R}" and the path.
         # Remove the space.
 -       if test x-L = "$p" ||
 -          test x-R = "$p"; then
 +       if test x-L = x"$p" ||
 +          test x-l = x"$p" ||
 +          test x-R = x"$p"; then
  	 prev=$p
  	 continue
         fi
-@@ -21836,9 +21924,16 @@ lt_prog_compiler_static_FC=
+@@ -21836,9 +21901,16 @@ lt_prog_compiler_static_FC=
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_FC='-fno-common'
 +      lt_prog_compiler_static_FC=''
 +      ;;
++
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_FC=
        ;;
      haiku*)
-@@ -21866,6 +21961,13 @@ lt_prog_compiler_static_FC=
+@@ -21866,6 +21938,13 @@ lt_prog_compiler_static_FC=
        # Instead, we relocate shared libraries at runtime.
        ;;
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      lt_prog_compiler_can_build_shared_FC=no
 +      enable_shared=no
 +      ;;
++
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -22118,6 +22220,9 @@ lt_prog_compiler_static_FC=
+@@ -22118,6 +22197,9 @@ lt_prog_compiler_static_FC=
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_FC=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -22682,14 +22787,13 @@ _LT_EOF
+@@ -22682,14 +22764,13 @@ _LT_EOF
        fi
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 -	wlarc=
 -      else
 -	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 +    netbsd* | minix*)
 +      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
 +      hardcode_direct_FC=yes
 +      hardcode_shlibpath_var_FC=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      solaris*)
-@@ -23139,7 +23243,7 @@ fi
+@@ -23139,7 +23220,7 @@ fi
    allow_undefined_flag_FC=$_lt_dar_allow_undefined
    case $cc_basename in
       ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -23323,15 +23427,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -23323,15 +23404,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 -      else
 -	archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 -      fi
 -      hardcode_libdir_flag_spec_FC='-R$libdir'
 +    netbsd* | minix*)
 +      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
        hardcode_direct_FC=yes
        hardcode_shlibpath_var_FC=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      newsos6)
-@@ -23343,6 +23445,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -23343,6 +23422,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
      *nto* | *qnx*)
 +      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_FC='-R$libdir'
 +      hardcode_direct_FC=yes
 +      hardcode_shlibpath_var_FC=no
        ;;
      openbsd* | bitrig*)
-@@ -24016,7 +24123,7 @@ dgux*)
+@@ -24016,7 +24100,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
 -freebsd* | dragonfly* | midnightbsd*)
 +freebsd* | midnightbsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -24061,6 +24168,17 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -24061,6 +24145,17 @@ freebsd* | dragonfly* | midnightbsd*)
    esac
    ;;
 +dragonfly*)
 +  version_type=linux
 +  need_version=no
 +  need_lib_prefix=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
 +  ;;
++
  haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -24138,12 +24256,7 @@ interix[3-9]*)
+@@ -24138,12 +24233,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -24261,19 +24374,25 @@ fi
+@@ -24261,19 +24351,25 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
 +minix*)
 +  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'
 +  dynamic_linker='Minix ld.elf_so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -968,255 +1000,255 @@ DO NOT MODIFY THIS PATCH MANUALLY!  YOUR
 -    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 -    dynamic_linker='NetBSD (a.out) ld.so'
 -  else
 -    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 -    soname_spec='$libname$release$shared_ext$major'
 -    dynamic_linker='NetBSD ld.elf_so'
 -  fi
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='NetBSD ld.elf_so'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -24299,7 +24418,7 @@ newsos6)
+@@ -24299,7 +24395,7 @@ newsos6)
    ;;
  openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-@@ -24307,7 +24426,7 @@ openbsd* | bitrig*)
+@@ -24307,7 +24403,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
 -  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  library_names_spec='$libname$release$shared_ext$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
-@@ -24858,9 +24977,16 @@ lt_prog_compiler_static_GO=
+@@ -24858,9 +24954,16 @@ lt_prog_compiler_static_GO=
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GO='-fno-common'
 +      lt_prog_compiler_static_GO=''
 +      ;;
++
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_GO=
        ;;
      haiku*)
-@@ -24888,6 +25014,13 @@ lt_prog_compiler_static_GO=
+@@ -24888,6 +24991,13 @@ lt_prog_compiler_static_GO=
        # Instead, we relocate shared libraries at runtime.
        ;;
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      lt_prog_compiler_can_build_shared_GO=no
 +      enable_shared=no
 +      ;;
++
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -25140,6 +25273,9 @@ lt_prog_compiler_static_GO=
+@@ -25140,6 +25250,9 @@ lt_prog_compiler_static_GO=
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_GO=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_GO=
      ;;
-@@ -25704,14 +25840,13 @@ _LT_EOF
+@@ -25704,14 +25817,13 @@ _LT_EOF
        fi
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_GO='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 -	wlarc=
 -      else
 -	archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 +    netbsd* | minix*)
 +      archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
 +      hardcode_direct_GO=yes
 +      hardcode_shlibpath_var_GO=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      solaris*)
-@@ -26173,7 +26308,7 @@ fi
+@@ -26173,7 +26285,7 @@ fi
    allow_undefined_flag_GO=$_lt_dar_allow_undefined
    case $cc_basename in
       ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -26356,15 +26491,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26356,15 +26468,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_GO='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 -      else
 -	archive_cmds_GO='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 -      fi
 -      hardcode_libdir_flag_spec_GO='-R$libdir'
 +    netbsd* | minix*)
 +      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
        hardcode_direct_GO=yes
        hardcode_shlibpath_var_GO=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      newsos6)
-@@ -26376,6 +26509,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26376,6 +26486,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
      *nto* | *qnx*)
 +      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GO='-R$libdir'
 +      hardcode_direct_GO=yes
 +      hardcode_shlibpath_var_GO=no
        ;;
      openbsd* | bitrig*)
-@@ -27087,9 +27225,16 @@ lt_prog_compiler_static_GCJ=
+@@ -27087,9 +27202,16 @@ lt_prog_compiler_static_GCJ=
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
 +      lt_prog_compiler_static_GCJ=''
 +      ;;
++
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_GCJ=
        ;;
      haiku*)
-@@ -27117,6 +27262,13 @@ lt_prog_compiler_static_GCJ=
+@@ -27117,6 +27239,13 @@ lt_prog_compiler_static_GCJ=
        # Instead, we relocate shared libraries at runtime.
        ;;
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      lt_prog_compiler_can_build_shared_GCJ=no
 +      enable_shared=no
 +      ;;
++
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -27369,6 +27521,9 @@ lt_prog_compiler_static_GCJ=
+@@ -27369,6 +27498,9 @@ lt_prog_compiler_static_GCJ=
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_GCJ=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -27933,14 +28088,13 @@ _LT_EOF
+@@ -27933,14 +28065,13 @@ _LT_EOF
        fi
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 -	wlarc=
 -      else
 -	archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 +    netbsd* | minix*)
 +      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      solaris*)
-@@ -28402,7 +28556,7 @@ fi
+@@ -28402,7 +28533,7 @@ fi
    allow_undefined_flag_GCJ=$_lt_dar_allow_undefined
    case $cc_basename in
       ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -28585,15 +28739,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -28585,15 +28716,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 -      else
 -	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 -      fi
 -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +    netbsd* | minix*)
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
 +      output_verbose_link_cmd=func_echo_all
        ;;
      newsos6)
-@@ -28605,6 +28757,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -28605,6 +28734,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
      *nto* | *qnx*)
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
        ;;
      openbsd* | bitrig*)
-@@ -32371,7 +32528,10 @@ func_cc_basename ()
+@@ -32371,7 +32505,10 @@ func_cc_basename ()
          *) break;;
        esac
      done
 -    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +    # Return the actual command name, not our pkgsrc wrapper name because several
 +    # decisions are made only based on compiler names
 +    if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
 +    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.109 2022/08/03 13:06:31 jperkin Exp $
+$NetBSD: distinfo,v 1.110 2022/08/04 12:23:21 jperkin Exp $
 BLAKE2s (libtool-2.4.7.tar.gz) = ae08c74a0da41b3ae252b207ff642d594648edc9c1af41b0191b899d844fecf7
 SHA512 (libtool-2.4.7.tar.gz) = 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385
 Size (libtool-2.4.7.tar.gz) = 1938886 bytes
 SHA1 (patch-Makefile.in) = 0adb634335acd5fb280c99b5d43ae568018ca0af
 SHA1 (patch-build-aux_depcomp) = ae6f93ad4fac1df648cfcb62601c72f9ebb30233
-SHA1 (patch-build-aux_ltmain.sh) = 455f1ea72a60e76295d62adb2b2a307df54d9095
+SHA1 (patch-build-aux_ltmain.sh) = ecb677b383caaaf8efb75a01cc17d49e5599c53c
-SHA1 (patch-configure) = 22adf967ecbd2e77294d34f5a5f662526a0d3509
+SHA1 (patch-configure) = 5c2718a6ca14a1f99e1f965d0636d86eb74ec017
-SHA1 (patch-libltdl_configure) = a4ec3706e249e2f0c014513a7be70f0619b0562a
+SHA1 (patch-libltdl_configure) = 58211bf63b3f3ed5ebac583c179af7f69d955fba

 @@ -1,19 +1,19 @@
-$NetBSD: patch-build-aux_ltmain.sh,v 1.4 2022/08/03 13:06:32 jperkin Exp $
+$NetBSD: patch-build-aux_ltmain.sh,v 1.5 2022/08/04 12:23:21 jperkin Exp $
 Automatically generated using manual-* patches and bootstrap.
 DO NOT MODIFY THIS PATCH MANUALLY!  YOUR CHANGES WILL BE LOST!
---- build-aux/ltmain.sh.orig	2022-08-03 12:14:26.878811652 +0000
+--- build-aux/ltmain.sh.orig	2022-08-04 11:35:59.000000000 +0000
 +++ build-aux/ltmain.sh
 @@ -323,6 +323,9 @@ test -z "$GREP" && {
  # uses them if a suitable command of that name is not already available
  # in the command search PATH.
 +unset CP
 +unset MV
 +unset RM
  : ${CP="cp -f"}
  : ${ECHO="printf %s\n"}
  : ${EGREP="$GREP -E"}
 @@ -2311,7 +2314,7 @@ include the following information:
         autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`