diff --git a/arpack-ng/arpack-ng-configure.patch b/arpack-ng/arpack-ng-configure.patch
index 79f248d874b..c38a283c48e 100644
--- a/arpack-ng/arpack-ng-configure.patch
+++ b/arpack-ng/arpack-ng-configure.patch
@@ -1,11 +1,11 @@
-diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/BAND/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/BAND/Makefile.in	2023-02-12 10:13:44.832182378 +0000
-@@ -0,0 +1,1575 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/BAND/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/BAND/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/BAND/Makefile.in	2023-11-11 16:51:21.006933396 +0900
+@@ -0,0 +1,1592 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -83,8 +93,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_7)
 +subdir = EXAMPLES/BAND
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -95,6 +103,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -587,6 +596,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -647,6 +658,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -732,6 +744,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -810,14 +823,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/BAND/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/BAND/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -1069,7 +1081,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -1159,7 +1171,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1419,7 +1431,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -1573,18 +1588,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/BAND/Makefile.in arpack-ng-3.9.0-patch/EXAMPL
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/COMPLEX/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/COMPLEX/Makefile.in	2023-02-12 10:13:44.918182726 +0000
-@@ -0,0 +1,1106 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/COMPLEX/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/COMPLEX/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/COMPLEX/Makefile.in	2023-11-11 16:51:21.052933574 +0900
+@@ -0,0 +1,1123 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -1597,7 +1614,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -1662,8 +1689,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_3)
 +subdir = EXAMPLES/COMPLEX
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -1674,6 +1699,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -1997,6 +2023,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -2057,6 +2085,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -2142,6 +2171,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -2184,14 +2214,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/COMPLEX/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/COMPLEX/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -2347,7 +2376,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -2437,7 +2466,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -2529,7 +2558,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -2683,18 +2715,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/COMPLEX/Makefile.in arpack-ng-3.9.0-patch/EXA
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/MATRIX_MARKET/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/MATRIX_MARKET/Makefile.in	2023-02-12 10:13:45.005183079 +0000
-@@ -0,0 +1,1030 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/MATRIX_MARKET/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/MATRIX_MARKET/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/MATRIX_MARKET/Makefile.in	2023-11-11 16:51:21.093933732 +0900
+@@ -0,0 +1,1070 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -2708,7 +2742,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -2754,7 +2798,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 +pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -2773,12 +2816,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +host_triplet = @host@
 +check_PROGRAMS = arpackmm$(EXEEXT)
 +subdir = EXAMPLES/MATRIX_MARKET
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(srcdir)/An.mtx $(srcdir)/As.mtx $(srcdir)/Az.mtx \
-+	$(srcdir)/B.mtx $(srcdir)/Bz.mtx $(dist_check_SCRIPTS) \
-+	$(top_srcdir)/build-aux/depcomp $(dist_check_DATA) \
-+	$(am__pkginclude_HEADERS_DIST) \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -2789,9 +2826,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \
++	$(dist_check_DATA) $(am__pkginclude_HEADERS_DIST) \
++	$(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES = An.mtx As.mtx Az.mtx B.mtx Bz.mtx
++CONFIG_CLEAN_VPATH_FILES = An.mtx As.mtx Az.mtx B.mtx Bz.mtx \
++	issue215.mtx issue401.mtx
 +am_arpackmm_OBJECTS = arpackmm.$(OBJEXT)
 +arpackmm_OBJECTS = $(am_arpackmm_OBJECTS)
 +arpackmm_LDADD = $(LDADD)
@@ -2815,7 +2856,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +am__v_at_1 = 
 +DEFAULT_INCLUDES = -I.@am__isrc@
 +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-+am__depfiles_maybe = depfiles
++am__maybe_remake_depfiles = depfiles
++am__depfiles_remade = ./$(DEPDIR)/arpackmm.Po
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -3068,7 +3110,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/An.mtx $(srcdir)/As.mtx $(srcdir)/Az.mtx \
++	$(srcdir)/B.mtx $(srcdir)/Bz.mtx $(srcdir)/Makefile.in \
++	$(srcdir)/issue215.mtx $(srcdir)/issue401.mtx \
++	$(top_srcdir)/build-aux/depcomp \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -3128,6 +3176,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -3213,6 +3262,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -3224,11 +3274,11 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +LDADD = $(top_builddir)/SRC/libarpack$(LIBSUFFIX)$(ITF64SUFFIX).la
 +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/ICB $(EIGEN3_CFLAGS)
 +EXTRA_DIST = README
-+dist_check_SCRIPTS = arpackmm.sh
-+dist_check_DATA = An.mtx As.mtx Az.mtx B.mtx Bz.mtx
-+TESTS = arpackmm.sh
++dist_check_SCRIPTS = arpackmm.sh issue401.sh issue215.sh
++dist_check_DATA = An.mtx As.mtx Az.mtx B.mtx Bz.mtx issue401.mtx issue215.mtx
++TESTS = arpackmm.sh issue401.sh issue215.sh
 +arpackmm_SOURCES = arpackmm.cpp
-+@ICBEXMM_TRUE@pkginclude_HEADERS = arpackSolver.hpp
++@EIGEN_TRUE@pkginclude_HEADERS = arpackSolver.hpp
 +CLEANFILES = \
 +	arpackmm.run.log \
 +	arpackmm.resid.out \
@@ -3252,14 +3302,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/MATRIX_MARKET/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/MATRIX_MARKET/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -3290,7 +3339,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +distclean-compile:
 +	-rm -f *.tab.c
 +
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arpackmm.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arpackmm.Po@am__quote@ # am--include-marker
++
++$(am__depfiles_remade):
++	@$(MKDIR_P) $(@D)
++	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
++
++am--depfiles: $(am__depfiles_remade)
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -3422,7 +3477,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -3512,7 +3567,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS) $(dist_check_DATA)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -3540,6 +3595,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	--log-file $$b.log --trs-file $$b.trs \
 +	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 +	"$$tst" $(AM_TESTS_FD_REDIRECT)
++issue401.sh.log: issue401.sh
++	@p='issue401.sh'; \
++	b='issue401.sh'; \
++	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
++	--log-file $$b.log --trs-file $$b.trs \
++	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
++	"$$tst" $(AM_TESTS_FD_REDIRECT)
++issue215.sh.log: issue215.sh
++	@p='issue215.sh'; \
++	b='issue215.sh'; \
++	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
++	--log-file $$b.log --trs-file $$b.trs \
++	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
++	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +.test.log:
 +	@p='$<'; \
 +	$(am__set_b); \
@@ -3555,7 +3624,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -3635,7 +3707,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +	mostlyclean-am
 +
 +distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/arpackmm.Po
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-tags
@@ -3681,7 +3753,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/arpackmm.Po
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
@@ -3702,33 +3774,35 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/MATRIX_MARKET/Makefile.in arpack-ng-3.9.0-pat
 +
 +.MAKE: check-am install-am install-strip
 +
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
-+	ctags ctags-am distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-pkgincludeHEADERS install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
-+	uninstall-am uninstall-pkgincludeHEADERS
++.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
++	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
++	cscopelist-am ctags ctags-am distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-tags distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-pkgincludeHEADERS install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
++	uninstall uninstall-am uninstall-pkgincludeHEADERS
++
++.PRECIOUS: Makefile
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/Makefile.in	2023-02-12 10:13:45.059183297 +0000
-@@ -0,0 +1,644 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/Makefile.in	2023-11-11 16:51:21.118933829 +0900
+@@ -0,0 +1,661 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -3741,7 +3815,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -3804,9 +3888,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
-+@ICBEXMM_TRUE@am__append_1 = MATRIX_MARKET
++@EIGEN_TRUE@am__append_1 = MATRIX_MARKET
 +subdir = EXAMPLES
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -3817,6 +3900,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -3854,7 +3938,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +  $(RECURSIVE_CLEAN_TARGETS) \
 +  $(am__extra_recursive_targets)
 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-+	distdir
++	distdir distdir-am
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
@@ -3875,6 +3959,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +ETAGS = etags
 +CTAGS = ctags
 +DIST_SUBDIRS = BAND COMPLEX NONSYM SIMPLE SVD SYM MATRIX_MARKET
++am__DIST_COMMON = $(srcdir)/Makefile.in README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +am__relativize = \
 +  dir0=`pwd`; \
@@ -3960,6 +4045,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -4045,6 +4131,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -4070,14 +4157,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -4194,7 +4280,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -4365,18 +4454,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/Ma
 +	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 +	ps ps-am tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/NONSYM/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/NONSYM/Makefile.in	2023-02-12 10:13:45.177183776 +0000
-@@ -0,0 +1,1180 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/NONSYM/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/NONSYM/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/NONSYM/Makefile.in	2023-11-11 16:51:21.160933991 +0900
+@@ -0,0 +1,1197 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -4389,7 +4480,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -4454,8 +4555,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_3)
 +subdir = EXAMPLES/NONSYM
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -4466,6 +4565,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -4815,6 +4915,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -4875,6 +4977,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -4960,6 +5063,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -5006,14 +5110,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/NONSYM/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/NONSYM/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -5185,7 +5288,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -5275,7 +5378,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -5395,7 +5498,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -5549,18 +5655,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/NONSYM/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/SIMPLE/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/SIMPLE/Makefile.in	2023-02-12 10:13:45.265184132 +0000
-@@ -0,0 +1,1059 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/SIMPLE/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/SIMPLE/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/SIMPLE/Makefile.in	2023-11-11 16:51:21.194934122 +0900
+@@ -0,0 +1,1076 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -5573,7 +5681,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -5638,8 +5756,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_1)
 +subdir = EXAMPLES/SIMPLE
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -5650,6 +5766,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -5956,6 +6073,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -6016,6 +6135,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -6101,6 +6221,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -6135,14 +6256,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/SIMPLE/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/SIMPLE/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -6290,7 +6410,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -6380,7 +6500,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -6458,7 +6578,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -6612,18 +6735,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SIMPLE/Makefile.in arpack-ng-3.9.0-patch/EXAM
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/SVD/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/SVD/Makefile.in	2023-02-12 10:13:45.341184440 +0000
-@@ -0,0 +1,984 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/SVD/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/SVD/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/SVD/Makefile.in	2023-11-11 16:51:21.225934242 +0900
+@@ -0,0 +1,1001 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -6636,7 +6761,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -6701,8 +6836,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_1)
 +subdir = EXAMPLES/SVD
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -6713,6 +6846,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -6992,6 +7126,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -7052,6 +7188,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -7137,6 +7274,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -7167,14 +7305,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/SVD/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/SVD/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -7306,7 +7443,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -7396,7 +7533,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -7446,7 +7583,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -7600,18 +7740,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SVD/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLES/SYM/Makefile.in
---- arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/EXAMPLES/SYM/Makefile.in	2023-02-12 10:13:45.448184874 +0000
-@@ -0,0 +1,1180 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.1-patch/EXAMPLES/SYM/Makefile.in
+--- arpack-ng-3.9.1/EXAMPLES/SYM/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/EXAMPLES/SYM/Makefile.in	2023-11-11 16:51:21.267934404 +0900
+@@ -0,0 +1,1197 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -7624,7 +7766,17 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -7689,8 +7841,6 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +host_triplet = @host@
 +check_PROGRAMS = $(am__EXEEXT_3)
 +subdir = EXAMPLES/SYM
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver README
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -7701,6 +7851,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -8050,6 +8201,8 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -8110,6 +8263,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -8195,6 +8349,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -8241,14 +8396,13 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign EXAMPLES/SYM/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign EXAMPLES/SYM/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -8420,7 +8574,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -8510,7 +8664,7 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -8630,7 +8784,10 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -8784,18 +8941,20 @@ diff -ruN arpack-ng-3.9.0/EXAMPLES/SYM/Makefile.in arpack-ng-3.9.0-patch/EXAMPLE
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
---- arpack-ng-3.9.0/ICB/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/ICB/Makefile.in	2023-02-12 10:13:45.512185133 +0000
-@@ -0,0 +1,659 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/ICB/Makefile.in arpack-ng-3.9.1-patch/ICB/Makefile.in
+--- arpack-ng-3.9.1/ICB/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/ICB/Makefile.in	2023-11-11 16:51:21.292934501 +0900
+@@ -0,0 +1,676 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -8810,7 +8969,17 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -8856,7 +9025,6 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 +pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -8875,8 +9043,6 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +host_triplet = @host@
 +@MPI_TRUE@am__append_1 = parpack.h parpack.hpp
 +subdir = ICB
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(am__pkginclude_HEADERS_DIST)
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -8887,6 +9053,8 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__pkginclude_HEADERS_DIST) \
++	$(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -8989,7 +9157,9 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -9049,6 +9219,7 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -9134,6 +9305,7 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -9164,14 +9336,13 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ICB/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign ICB/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -9294,7 +9465,10 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -9447,18 +9621,20 @@ diff -ruN arpack-ng-3.9.0/ICB/Makefile.in arpack-ng-3.9.0-patch/ICB/Makefile.in
 +	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 +	uninstall-pkgincludeHEADERS
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
---- arpack-ng-3.9.0/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/Makefile.in	2023-02-12 10:13:45.572185376 +0000
-@@ -0,0 +1,929 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/Makefile.in arpack-ng-3.9.1-patch/Makefile.in
+--- arpack-ng-3.9.1/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/Makefile.in	2023-11-11 16:51:21.311934574 +0900
+@@ -0,0 +1,953 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -9473,7 +9649,17 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -9538,25 +9724,10 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +@MPI_TRUE@am__append_1 = --enable-mpi
 +@ICB_TRUE@am__append_2 = --enable-icb
 +@ICB_TRUE@am__append_3 = arpackicb.h
-+@ICBEXMM_TRUE@am__append_4 = --enable-icb-exmm
++@EIGEN_TRUE@am__append_4 = --enable-eigen
 +@ICB_TRUE@am__append_5 = ICB
 +@MPI_TRUE@am__append_6 = PARPACK
 +subdir = .
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/configure $(am__configure_deps) \
-+	$(top_srcdir)/pkg-config/arpack.pc.in \
-+	$(top_srcdir)/pkg-config/parpack.pc.in \
-+	$(top_srcdir)/pkg-config/arpackSolver.pc.in \
-+	$(top_srcdir)/pkg-config/tstAutotoolsInstall.sh.in \
-+	$(srcdir)/arpackdef.h.in $(srcdir)/arpackicb.h.in \
-+	$(am__pkginclude_HEADERS_DIST) COPYING TODO \
-+	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
-+	build-aux/install-sh build-aux/missing build-aux/ltmain.sh \
-+	$(top_srcdir)/build-aux/config.guess \
-+	$(top_srcdir)/build-aux/config.sub \
-+	$(top_srcdir)/build-aux/install-sh \
-+	$(top_srcdir)/build-aux/ltmain.sh \
-+	$(top_srcdir)/build-aux/missing
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -9567,6 +9738,9 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
++	$(am__configure_deps) $(am__pkginclude_HEADERS_DIST) \
++	$(am__DIST_COMMON)
 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 + configure.lineno config.status.lineno
 +mkinstalldirs = $(install_sh) -d
@@ -9639,7 +9813,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +  $(RECURSIVE_CLEAN_TARGETS) \
 +  $(am__extra_recursive_targets)
 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-+	cscope distdir dist dist-all distcheck
++	cscope distdir distdir-am dist dist-all distcheck
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
@@ -9661,6 +9835,19 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +CTAGS = ctags
 +CSCOPE = cscope
 +DIST_SUBDIRS = . ICB UTIL SRC TESTS EXAMPLES PARPACK
++am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/arpackdef.h.in \
++	$(srcdir)/arpackicb.h.in $(top_srcdir)/build-aux/compile \
++	$(top_srcdir)/build-aux/config.guess \
++	$(top_srcdir)/build-aux/config.sub \
++	$(top_srcdir)/build-aux/install-sh \
++	$(top_srcdir)/build-aux/ltmain.sh \
++	$(top_srcdir)/build-aux/missing \
++	$(top_srcdir)/pkg-config/arpack.pc.in \
++	$(top_srcdir)/pkg-config/parpack.pc.in \
++	$(top_srcdir)/pkg-config/tstAutotoolsInstall.sh.in COPYING \
++	TODO build-aux/compile build-aux/config.guess \
++	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
++	build-aux/ltmain.sh build-aux/missing
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +distdir = $(PACKAGE)-$(VERSION)
 +top_distdir = $(distdir)
@@ -9703,7 +9890,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 +  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 +distcleancheck_listfiles = find . -type f -print
-+pkgincludedir = $(includedir)/arpack-ng@ITF64SUFFIX@
++pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -9763,6 +9950,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -9848,6 +10036,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -9865,10 +10054,10 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +EXTRA_DIST = README.md PARPACK_CHANGES CHANGES DOCUMENTS VISUAL_STUDIO \
 +detect_arpack_bug.m4 CMakeLists.txt
 +
-+pkgconfig_DATA = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
++pkgconfig_DATA = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc
 +
 +# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file:
-+DISTCLEANFILES = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
++DISTCLEANFILES = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -9887,15 +10076,14 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    echo ' $(SHELL) ./config.status'; \
 +	    $(SHELL) ./config.status;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -10070,7 +10258,10 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	$(am__remove_distdir)
 +	test -d "$(distdir)" || mkdir "$(distdir)"
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -10135,7 +10326,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 +	|| chmod -R a+r "$(distdir)"
 +dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 +	$(am__post_remove_distdir)
 +
 +dist-bzip2: distdir
@@ -10151,11 +10342,17 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	$(am__post_remove_distdir)
 +
 +dist-tarZ: distdir
++	@echo WARNING: "Support for distribution archives compressed with" \
++		       "legacy program 'compress' is deprecated." >&2
++	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 +	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 +	$(am__post_remove_distdir)
 +
 +dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++	@echo WARNING: "Support for shar distribution archives is" \
++	               "deprecated." >&2
++	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
++	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 +	$(am__post_remove_distdir)
 +
 +dist-zip: distdir
@@ -10173,7 +10370,7 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +distcheck: dist
 +	case '$(DIST_ARCHIVES)' in \
 +	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
++	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 +	*.tar.bz2*) \
 +	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 +	*.tar.lz*) \
@@ -10183,22 +10380,23 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	*.tar.Z*) \
 +	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 +	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
++	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 +	*.zip*) \
 +	  unzip $(distdir).zip ;;\
 +	esac
 +	chmod -R a-w $(distdir)
 +	chmod u+w $(distdir)
-+	mkdir $(distdir)/_build $(distdir)/_inst
++	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 +	chmod a-w $(distdir)
 +	test -d $(distdir)/_build || exit 0; \
 +	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 +	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 +	  && am__cwd=`pwd` \
-+	  && $(am__cd) $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	  && $(am__cd) $(distdir)/_build/sub \
++	  && ../../configure \
 +	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 +	    $(DISTCHECK_CONFIGURE_FLAGS) \
++	    --srcdir=../.. --prefix="$$dc_install_base" \
 +	  && $(MAKE) $(AM_MAKEFLAGS) \
 +	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 +	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -10380,18 +10578,20 @@ diff -ruN arpack-ng-3.9.0/Makefile.in arpack-ng-3.9.0-patch/Makefile.in
 +	ps ps-am tags tags-am uninstall uninstall-am \
 +	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-patch/PARPACK/EXAMPLES/BLACS/Makefile.in
---- arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/EXAMPLES/BLACS/Makefile.in	2023-02-12 10:13:45.674185790 +0000
-@@ -0,0 +1,1152 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.1-patch/PARPACK/EXAMPLES/BLACS/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/EXAMPLES/BLACS/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/EXAMPLES/BLACS/Makefile.in	2023-11-11 16:51:21.351934728 +0900
+@@ -0,0 +1,1169 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -10404,7 +10604,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -10471,8 +10681,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
 +	$(am__EXEEXT_7)
 +subdir = PARPACK/EXAMPLES/BLACS
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -10483,6 +10691,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -10812,6 +11021,8 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -10872,6 +11083,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -10957,6 +11169,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -11015,14 +11228,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/EXAMPLES/BLACS/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/EXAMPLES/BLACS/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -11186,7 +11398,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -11276,7 +11488,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -11382,7 +11594,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -11536,18 +11751,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/BLACS/Makefile.in arpack-ng-3.9.0-pat
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch/PARPACK/EXAMPLES/MPI/Makefile.in
---- arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/EXAMPLES/MPI/Makefile.in	2023-02-12 10:13:45.770186179 +0000
-@@ -0,0 +1,1115 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.1-patch/PARPACK/EXAMPLES/MPI/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/EXAMPLES/MPI/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/EXAMPLES/MPI/Makefile.in	2023-11-11 16:51:21.390934879 +0900
+@@ -0,0 +1,1132 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -11560,7 +11777,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -11626,8 +11853,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 +	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
 +subdir = PARPACK/EXAMPLES/MPI
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/test-driver
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -11638,6 +11863,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -11954,6 +12180,8 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/test-driver
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -12014,6 +12242,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -12099,6 +12328,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -12156,14 +12386,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/EXAMPLES/MPI/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/EXAMPLES/MPI/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -12319,7 +12548,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -12409,7 +12638,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -12501,7 +12730,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -12655,18 +12887,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/EXAMPLES/MPI/Makefile.in arpack-ng-3.9.0-patch
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Makefile.in
---- arpack-ng-3.9.0/PARPACK/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/Makefile.in	2023-02-12 10:13:45.816186365 +0000
-@@ -0,0 +1,644 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/Makefile.in arpack-ng-3.9.1-patch/PARPACK/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/Makefile.in	2023-11-11 16:51:21.406934941 +0900
+@@ -0,0 +1,661 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -12679,7 +12913,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -12743,7 +12987,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +build_triplet = @build@
 +host_triplet = @host@
 +subdir = PARPACK
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -12754,6 +12997,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -12791,7 +13035,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +  $(RECURSIVE_CLEAN_TARGETS) \
 +  $(am__extra_recursive_targets)
 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-+	distdir
++	distdir distdir-am
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
@@ -12813,6 +13057,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +CTAGS = ctags
 +DIST_SUBDIRS = UTIL/BLACS SRC/BLACS . EXAMPLES/BLACS UTIL/MPI SRC/MPI \
 +	TESTS/MPI EXAMPLES/MPI
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +am__relativize = \
 +  dir0=`pwd`; \
@@ -12898,6 +13143,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -12983,6 +13229,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -13008,14 +13255,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -13132,7 +13378,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -13303,18 +13552,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/Makefile.in arpack-ng-3.9.0-patch/PARPACK/Make
 +	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 +	ps ps-am tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PARPACK/SRC/BLACS/Makefile.in
---- arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/SRC/BLACS/Makefile.in	2023-02-12 10:13:45.875186604 +0000
-@@ -0,0 +1,621 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.1-patch/PARPACK/SRC/BLACS/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/SRC/BLACS/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/SRC/BLACS/Makefile.in	2023-11-11 16:51:21.427935022 +0900
+@@ -0,0 +1,638 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -13328,7 +13579,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -13392,7 +13653,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +build_triplet = @build@
 +host_triplet = @host@
 +subdir = PARPACK/SRC/BLACS
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -13403,6 +13663,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -13501,6 +13762,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -13561,6 +13823,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -13646,6 +13909,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -13693,14 +13957,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/SRC/BLACS/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/SRC/BLACS/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -13777,7 +14040,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +cscope cscopelist:
 +
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -13928,18 +14194,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/BLACS/Makefile.in arpack-ng-3.9.0-patch/PA
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARPACK/SRC/MPI/Makefile.in
---- arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/SRC/MPI/Makefile.in	2023-02-12 10:13:46.115187577 +0000
-@@ -0,0 +1,995 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.1-patch/PARPACK/SRC/MPI/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/SRC/MPI/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/SRC/MPI/Makefile.in	2023-11-11 16:51:21.518935373 +0900
+@@ -0,0 +1,1012 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -13953,7 +14221,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -14022,7 +14300,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +@ICB_TRUE@am__append_4 = icbpzn.F90
 +@ICB_TRUE@am__append_5 = $(top_builddir)/ICB/libdbgicb.la $(top_builddir)/ICB/libstaicb.la
 +subdir = PARPACK/SRC/MPI
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -14033,6 +14310,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -14256,6 +14534,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -14316,6 +14595,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -14401,6 +14681,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -14457,14 +14738,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/SRC/MPI/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/SRC/MPI/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -14774,7 +15054,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +cscope cscopelist:
 +
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -14927,18 +15210,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/SRC/MPI/Makefile.in arpack-ng-3.9.0-patch/PARP
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PARPACK/TESTS/MPI/Makefile.in
---- arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/TESTS/MPI/Makefile.in	2023-02-12 10:13:46.221188006 +0000
-@@ -0,0 +1,1129 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.1-patch/PARPACK/TESTS/MPI/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/TESTS/MPI/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/TESTS/MPI/Makefile.in	2023-11-11 16:51:21.562935543 +0900
+@@ -0,0 +1,1156 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -14951,7 +15236,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -15017,9 +15312,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 +@ICB_TRUE@am__append_1 = icb_parpack_c icb_parpack_cpp
 +subdir = PARPACK/TESTS/MPI
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/build-aux/depcomp \
-+	$(top_srcdir)/build-aux/test-driver
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -15030,6 +15322,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -15072,7 +15365,9 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +am__v_at_1 = 
 +DEFAULT_INCLUDES = -I.@am__isrc@
 +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-+am__depfiles_maybe = depfiles
++am__maybe_remake_depfiles = depfiles
++am__depfiles_remade = ./$(DEPDIR)/icb_parpack_c-icb_parpack_c.Po \
++	./$(DEPDIR)/icb_parpack_cpp-icb_parpack_cpp.Po
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -15357,6 +15652,9 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/depcomp \
++	$(top_srcdir)/build-aux/test-driver
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -15417,6 +15715,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -15502,6 +15801,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -15541,14 +15841,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/TESTS/MPI/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/TESTS/MPI/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -15587,22 +15886,28 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +distclean-compile:
 +	-rm -f *.tab.c
 +
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_parpack_c-icb_parpack_c.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_parpack_cpp-icb_parpack_cpp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_parpack_c-icb_parpack_c.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_parpack_cpp-icb_parpack_cpp.Po@am__quote@ # am--include-marker
++
++$(am__depfiles_remade):
++	@$(MKDIR_P) $(@D)
++	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
++
++am--depfiles: $(am__depfiles_remade)
 +
 +.c.o:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -15757,7 +16062,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -15847,7 +16152,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -15904,7 +16209,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -15979,7 +16287,8 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +	mostlyclean-am
 +
 +distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/icb_parpack_c-icb_parpack_c.Po
++	-rm -f ./$(DEPDIR)/icb_parpack_cpp-icb_parpack_cpp.Po
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-tags
@@ -16025,7 +16334,8 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/icb_parpack_c-icb_parpack_c.Po
++	-rm -f ./$(DEPDIR)/icb_parpack_cpp-icb_parpack_cpp.Po
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
@@ -16046,32 +16356,34 @@ diff -ruN arpack-ng-3.9.0/PARPACK/TESTS/MPI/Makefile.in arpack-ng-3.9.0-patch/PA
 +
 +.MAKE: check-am install-am install-strip
 +
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
-+	ctags ctags-am distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
++.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
++	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
++	cscopelist-am ctags ctags-am distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-tags distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/PARPACK/UTIL/BLACS/Makefile.in
---- arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/UTIL/BLACS/Makefile.in	2023-02-12 10:13:46.278188237 +0000
-@@ -0,0 +1,598 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.1-patch/PARPACK/UTIL/BLACS/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/UTIL/BLACS/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/UTIL/BLACS/Makefile.in	2023-11-11 16:51:21.584935628 +0900
+@@ -0,0 +1,615 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -16085,7 +16397,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -16149,7 +16471,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +build_triplet = @build@
 +host_triplet = @host@
 +subdir = PARPACK/UTIL/BLACS
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -16160,6 +16481,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -16231,6 +16553,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -16291,6 +16614,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -16376,6 +16700,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -16407,14 +16732,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/UTIL/BLACS/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/UTIL/BLACS/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -16513,7 +16837,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -16662,18 +16989,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/BLACS/Makefile.in arpack-ng-3.9.0-patch/P
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PARPACK/UTIL/MPI/Makefile.in
---- arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/PARPACK/UTIL/MPI/Makefile.in	2023-02-12 10:13:46.335188468 +0000
-@@ -0,0 +1,598 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.1-patch/PARPACK/UTIL/MPI/Makefile.in
+--- arpack-ng-3.9.1/PARPACK/UTIL/MPI/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/PARPACK/UTIL/MPI/Makefile.in	2023-11-11 16:51:21.605935709 +0900
+@@ -0,0 +1,615 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -16687,7 +17016,17 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -16751,7 +17090,6 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +build_triplet = @build@
 +host_triplet = @host@
 +subdir = PARPACK/UTIL/MPI
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -16762,6 +17100,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -16833,6 +17172,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -16893,6 +17233,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -16978,6 +17319,7 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -17009,14 +17351,13 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign PARPACK/UTIL/MPI/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign PARPACK/UTIL/MPI/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -17115,7 +17456,10 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -17264,18 +17608,20 @@ diff -ruN arpack-ng-3.9.0/PARPACK/UTIL/MPI/Makefile.in arpack-ng-3.9.0-patch/PAR
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
---- arpack-ng-3.9.0/SRC/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/SRC/Makefile.in	2023-02-12 10:13:46.425188833 +0000
-@@ -0,0 +1,732 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/SRC/Makefile.in arpack-ng-3.9.1-patch/SRC/Makefile.in
+--- arpack-ng-3.9.1/SRC/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/SRC/Makefile.in	2023-11-11 16:51:21.640935844 +0900
+@@ -0,0 +1,749 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -17289,7 +17635,17 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -17358,7 +17714,6 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +@ICB_TRUE@am__append_4 = icbazn.F90
 +@ICB_TRUE@am__append_5 = $(top_builddir)/ICB/libdbgicb.la $(top_builddir)/ICB/libstaicb.la
 +subdir = SRC
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -17369,6 +17724,7 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -17532,6 +17888,7 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -17592,6 +17949,7 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -17677,6 +18035,7 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -17723,14 +18082,13 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SRC/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign SRC/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -17847,7 +18205,10 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +cscope cscopelist:
 +
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -18000,18 +18361,20 @@ diff -ruN arpack-ng-3.9.0/SRC/Makefile.in arpack-ng-3.9.0-patch/SRC/Makefile.in
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile.in
---- arpack-ng-3.9.0/TESTS/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/TESTS/Makefile.in	2023-02-12 10:13:46.557189368 +0000
-@@ -0,0 +1,1290 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/TESTS/Makefile.in arpack-ng-3.9.1-patch/TESTS/Makefile.in
+--- arpack-ng-3.9.1/TESTS/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/TESTS/Makefile.in	2023-11-11 16:51:21.695936057 +0900
+@@ -0,0 +1,1324 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -18024,7 +18387,17 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +
 +@SET_MAKE@
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -18093,9 +18466,6 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +@ICB_TRUE@am__append_1 = icb_arpack_c icb_arpack_cpp bug_1315_single \
 +@ICB_TRUE@	bug_1315_double
 +subdir = TESTS
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(srcdir)/testA.mtx $(top_srcdir)/build-aux/depcomp \
-+	$(dist_check_DATA) $(top_srcdir)/build-aux/test-driver
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -18106,6 +18476,8 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_DATA) \
++	$(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES = testA.mtx
@@ -18186,7 +18558,11 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +am__v_at_1 = 
 +DEFAULT_INCLUDES = -I.@am__isrc@
 +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-+am__depfiles_maybe = depfiles
++am__maybe_remake_depfiles = depfiles
++am__depfiles_remade = ./$(DEPDIR)/bug_1315_double-bug_1315_double.Po \
++	./$(DEPDIR)/bug_1315_single-bug_1315_single.Po \
++	./$(DEPDIR)/icb_arpack_c-icb_arpack_c.Po \
++	./$(DEPDIR)/icb_arpack_cpp-icb_arpack_cpp.Po
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -18478,6 +18854,9 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 +	$(TEST_LOG_FLAGS)
++am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/testA.mtx \
++	$(top_srcdir)/build-aux/depcomp \
++	$(top_srcdir)/build-aux/test-driver
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -18538,6 +18917,7 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -18623,6 +19003,7 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -18668,14 +19049,13 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign TESTS/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign TESTS/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -18742,24 +19122,30 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +distclean-compile:
 +	-rm -f *.tab.c
 +
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug_1315_double-bug_1315_double.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug_1315_single-bug_1315_single.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_arpack_c-icb_arpack_c.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_arpack_cpp-icb_arpack_cpp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug_1315_double-bug_1315_double.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug_1315_single-bug_1315_single.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_arpack_c-icb_arpack_c.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb_arpack_cpp-icb_arpack_cpp.Po@am__quote@ # am--include-marker
++
++$(am__depfiles_remade):
++	@$(MKDIR_P) $(@D)
++	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
++
++am--depfiles: $(am__depfiles_remade)
 +
 +.c.o:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -18942,7 +19328,7 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +	if test -n "$$am__remaking_logs"; then \
 +	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 +	       "recursion detected" >&2; \
-+	else \
++	elif test -n "$$redo_logs"; then \
 +	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 +	fi; \
 +	if $(am__make_dryrun); then :; else \
@@ -19032,7 +19418,7 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +	fi;								\
 +	$$success || exit 1
 +
-+check-TESTS:
++check-TESTS: $(check_PROGRAMS) $(dist_check_DATA)
 +	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 +	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 +	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -19138,7 +19524,10 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 +@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -19213,7 +19602,10 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +	mostlyclean-am
 +
 +distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/bug_1315_double-bug_1315_double.Po
++	-rm -f ./$(DEPDIR)/bug_1315_single-bug_1315_single.Po
++	-rm -f ./$(DEPDIR)/icb_arpack_c-icb_arpack_c.Po
++	-rm -f ./$(DEPDIR)/icb_arpack_cpp-icb_arpack_cpp.Po
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-tags
@@ -19259,7 +19651,10 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/bug_1315_double-bug_1315_double.Po
++	-rm -f ./$(DEPDIR)/bug_1315_single-bug_1315_single.Po
++	-rm -f ./$(DEPDIR)/icb_arpack_c-icb_arpack_c.Po
++	-rm -f ./$(DEPDIR)/icb_arpack_cpp-icb_arpack_cpp.Po
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
@@ -19280,32 +19675,34 @@ diff -ruN arpack-ng-3.9.0/TESTS/Makefile.in arpack-ng-3.9.0-patch/TESTS/Makefile
 +
 +.MAKE: check-am install-am install-strip
 +
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
-+	ctags ctags-am distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
++.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
++	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
++	cscopelist-am ctags ctags-am distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-tags distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	recheck tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.in
---- arpack-ng-3.9.0/UTIL/Makefile.in	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/UTIL/Makefile.in	2023-02-12 10:13:46.616189607 +0000
-@@ -0,0 +1,600 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+diff -ruN arpack-ng-3.9.1/UTIL/Makefile.in arpack-ng-3.9.1-patch/UTIL/Makefile.in
+--- arpack-ng-3.9.1/UTIL/Makefile.in	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/UTIL/Makefile.in	2023-11-11 16:51:21.717936142 +0900
+@@ -0,0 +1,617 @@
++# Makefile.in generated by automake 1.16.1 from Makefile.am.
 +# @configure_input@
 +
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -19319,7 +19716,17 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +@SET_MAKE@
 +
 +VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
@@ -19383,7 +19790,6 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +build_triplet = @build@
 +host_triplet = @host@
 +subdir = UTIL
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \
 +	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -19394,6 +19800,7 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -19466,6 +19873,7 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
++am__DIST_COMMON = $(srcdir)/Makefile.in
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
@@ -19526,6 +19934,7 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -19611,6 +20020,7 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
@@ -19643,14 +20053,13 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign UTIL/Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign UTIL/Makefile
-+.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -19749,7 +20158,10 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
-+distdir: $(DISTFILES)
++distdir: $(BUILT_SOURCES)
++	$(MAKE) $(AM_MAKEFLAGS) distdir-am
++
++distdir-am: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
@@ -19898,17 +20310,19 @@ diff -ruN arpack-ng-3.9.0/UTIL/Makefile.in arpack-ng-3.9.0-patch/UTIL/Makefile.i
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags tags-am uninstall uninstall-am
 +
++.PRECIOUS: Makefile
++
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
---- arpack-ng-3.9.0/aclocal.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/aclocal.m4	2023-02-12 10:13:42.735173880 +0000
-@@ -0,0 +1,1285 @@
-+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+diff -ruN arpack-ng-3.9.1/aclocal.m4 arpack-ng-3.9.1-patch/aclocal.m4
+--- arpack-ng-3.9.1/aclocal.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/aclocal.m4	2023-11-11 16:51:19.540927735 +0900
+@@ -0,0 +1,1457 @@
++# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 +
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -19928,32 +20342,63 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +If you have problems, you may need to regenerate the build system entirely.
 +To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 +
-+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-+# serial 1 (pkg-config-0.24)
-+# 
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
++dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
++dnl serial 11 (pkg-config-0.29.1)
++dnl
++dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
++dnl
++dnl This program is free software; you can redistribute it and/or modify
++dnl it under the terms of the GNU General Public License as published by
++dnl the Free Software Foundation; either version 2 of the License, or
++dnl (at your option) any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++dnl General Public License for more details.
++dnl
++dnl You should have received a copy of the GNU General Public License
++dnl along with this program; if not, write to the Free Software
++dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++dnl 02111-1307, USA.
++dnl
++dnl As a special exception to the GNU General Public License, if you
++dnl distribute this file as part of a program that contains a
++dnl configuration script generated by Autoconf, you may include it under
++dnl the same distribution terms that you use for the rest of that
++dnl program.
++
++dnl PKG_PREREQ(MIN-VERSION)
++dnl -----------------------
++dnl Since: 0.29
++dnl
++dnl Verify that the version of the pkg-config macros are at least
++dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
++dnl installed version of pkg-config, this checks the developer's version
++dnl of pkg.m4 when generating configure.
++dnl
++dnl To ensure that this macro is defined, also add:
++dnl m4_ifndef([PKG_PREREQ],
++dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
++dnl
++dnl See the "Since" comment for each macro you use to see what version
++dnl of the macros you require.
++m4_defun([PKG_PREREQ],
++[m4_define([PKG_MACROS_VERSION], [0.29.1])
++m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
++    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
++])dnl PKG_PREREQ
++
++dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
++dnl ----------------------------------
++dnl Since: 0.16
++dnl
++dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
++dnl first found in the path. Checks that the version of pkg-config found
++dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
++dnl used since that's the first version where most current features of
++dnl pkg-config existed.
 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -19975,18 +20420,19 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +		PKG_CONFIG=""
 +	fi
 +fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
++])dnl PKG_PROG_PKG_CONFIG
 +
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists.  Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+# only at the first occurence in configure.ac, so if the first place
-+# it's called might be skipped (such as if it is within an "if", you
-+# have to call PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
++dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++dnl -------------------------------------------------------------------
++dnl Since: 0.18
++dnl
++dnl Check to see whether a particular set of modules exists. Similar to
++dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
++dnl
++dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++dnl only at the first occurence in configure.ac, so if the first place
++dnl it's called might be skipped (such as if it is within an "if", you
++dnl have to call PKG_CHECK_EXISTS manually
 +AC_DEFUN([PKG_CHECK_EXISTS],
 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 +if test -n "$PKG_CONFIG" && \
@@ -19996,8 +20442,10 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +  $3])dnl
 +fi])
 +
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
++dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++dnl ---------------------------------------------
++dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
++dnl pkg_failed based on the result.
 +m4_define([_PKG_CONFIG],
 +[if test -n "$$1"; then
 +    pkg_cv_[]$1="$$1"
@@ -20009,10 +20457,11 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 + else
 +    pkg_failed=untried
 +fi[]dnl
-+])# _PKG_CONFIG
++])dnl _PKG_CONFIG
 +
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
++dnl _PKG_SHORT_ERRORS_SUPPORTED
++dnl ---------------------------
++dnl Internal check to see if pkg-config supports short errors.
 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -20020,19 +20469,17 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +else
 +        _pkg_short_errors_supported=no
 +fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
++])dnl _PKG_SHORT_ERRORS_SUPPORTED
 +
 +
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
++dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++dnl   [ACTION-IF-NOT-FOUND])
++dnl --------------------------------------------------------------
++dnl Since: 0.4.0
++dnl
++dnl Note that if there is a possibility the first call to
++dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
++dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 +AC_DEFUN([PKG_CHECK_MODULES],
 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -20086,16 +20533,40 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +        AC_MSG_RESULT([yes])
 +	$3
 +fi[]dnl
-+])# PKG_CHECK_MODULES
++])dnl PKG_CHECK_MODULES
 +
 +
-+# PKG_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable pkgconfigdir as the location where a module
-+# should install pkg-config .pc files. By default the directory is
-+# $libdir/pkgconfig, but the default can be changed by passing
-+# DIRECTORY. The user can override through the --with-pkgconfigdir
-+# parameter.
++dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++dnl   [ACTION-IF-NOT-FOUND])
++dnl ---------------------------------------------------------------------
++dnl Since: 0.29
++dnl
++dnl Checks for existence of MODULES and gathers its build flags with
++dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
++dnl and VARIABLE-PREFIX_LIBS from --libs.
++dnl
++dnl Note that if there is a possibility the first call to
++dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
++dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
++dnl configure.ac.
++AC_DEFUN([PKG_CHECK_MODULES_STATIC],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++_save_PKG_CONFIG=$PKG_CONFIG
++PKG_CONFIG="$PKG_CONFIG --static"
++PKG_CHECK_MODULES($@)
++PKG_CONFIG=$_save_PKG_CONFIG[]dnl
++])dnl PKG_CHECK_MODULES_STATIC
++
++
++dnl PKG_INSTALLDIR([DIRECTORY])
++dnl -------------------------
++dnl Since: 0.27
++dnl
++dnl Substitutes the variable pkgconfigdir as the location where a module
++dnl should install pkg-config .pc files. By default the directory is
++dnl $libdir/pkgconfig, but the default can be changed by passing
++dnl DIRECTORY. The user can override through the --with-pkgconfigdir
++dnl parameter.
 +AC_DEFUN([PKG_INSTALLDIR],
 +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 +m4_pushdef([pkg_description],
@@ -20106,16 +20577,18 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 +m4_popdef([pkg_default])
 +m4_popdef([pkg_description])
-+]) dnl PKG_INSTALLDIR
++])dnl PKG_INSTALLDIR
 +
 +
-+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable noarch_pkgconfigdir as the location where a
-+# module should install arch-independent pkg-config .pc files. By
-+# default the directory is $datadir/pkgconfig, but the default can be
-+# changed by passing DIRECTORY. The user can override through the
-+# --with-noarch-pkgconfigdir parameter.
++dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
++dnl --------------------------------
++dnl Since: 0.27
++dnl
++dnl Substitutes the variable noarch_pkgconfigdir as the location where a
++dnl module should install arch-independent pkg-config .pc files. By
++dnl default the directory is $datadir/pkgconfig, but the default can be
++dnl changed by passing DIRECTORY. The user can override through the
++dnl --with-noarch-pkgconfigdir parameter.
 +AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 +m4_pushdef([pkg_description],
@@ -20126,9 +20599,26 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 +m4_popdef([pkg_default])
 +m4_popdef([pkg_description])
-+]) dnl PKG_NOARCH_INSTALLDIR
++])dnl PKG_NOARCH_INSTALLDIR
++
++
++dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
++dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++dnl -------------------------------------------
++dnl Since: 0.28
++dnl
++dnl Retrieves the value of the pkg-config variable for the given module.
++AC_DEFUN([PKG_CHECK_VAR],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
 +
-+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
++_PKG_CONFIG([$1], [variable="][$3]["], [$2])
++AS_VAR_COPY([$1], [pkg_cv_][$1])
++
++AS_VAR_IF([$1], [""], [$5], [$4])dnl
++])dnl PKG_CHECK_VAR
++
++# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20140,10 +20630,10 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# generated from the m4 files accompanying Automake X.Y.
 +# (This private macro should not be called outside this file.)
 +AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.13'
++[am__api_version='1.16'
 +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 +dnl require some minimum version.  Point them to the right macro.
-+m4_if([$1], [1.13.4], [],
++m4_if([$1], [1.16.1], [],
 +      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 +])
 +
@@ -20159,14 +20649,14 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.13.4])dnl
++[AM_AUTOMAKE_VERSION([1.16.1])dnl
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 +
 +# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 +
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20211,15 +20701,14 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# configured tree to be moved without reconfiguration.
 +
 +AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
++[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
++# Expand $ac_aux_dir to an absolute path.
++am_aux_dir=`cd "$ac_aux_dir" && pwd`
 +])
 +
 +# AM_CONDITIONAL                                            -*- Autoconf -*-
 +
-+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
++# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20250,7 +20739,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +Usually this means the macro was only invoked conditionally.]])
 +fi])])
 +
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20441,13 +20930,12 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +
 +# Generate code to set up dependency tracking.              -*- Autoconf -*-
 +
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
-+
 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
 +# ------------------------------
 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -20455,49 +20943,41 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +  # Older Autoconf quotes --file arguments for eval, but not when files
 +  # are listed without --file.  Let's play safe and only enable the eval
 +  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
++  # TODO: see whether this extra hack can be removed once we start
++  # requiring Autoconf 2.70 or later.
++  AS_CASE([$CONFIG_FILES],
++          [*\'*], [eval set x "$CONFIG_FILES"],
++          [*], [set x $CONFIG_FILES])
 +  shift
-+  for mf
++  # Used to flag and report bootstrapping failures.
++  am_rc=0
++  for am_mf
 +  do
 +    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named 'Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
++    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
++    # Check whether this is an Automake generated Makefile which includes
++    # dependency-tracking related rules and includes.
++    # Grep'ing the whole file directly is not great: AIX grep has a line
 +    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running 'make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "$am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
++    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
++      || continue
++    am_dirpart=`AS_DIRNAME(["$am_mf"])`
++    am_filepart=`AS_BASENAME(["$am_mf"])`
++    AM_RUN_LOG([cd "$am_dirpart" \
++      && sed -e '/# am--include-marker/d' "$am_filepart" \
++        | $MAKE -f - am--depfiles]) || am_rc=$?
 +  done
++  if test $am_rc -ne 0; then
++    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
++    for automatic dependency tracking.  Try re-running configure with the
++    '--disable-dependency-tracking' option to at least be able to build
++    the package (albeit without support for automatic dependency tracking).])
++  fi
++  AS_UNSET([am_dirpart])
++  AS_UNSET([am_filepart])
++  AS_UNSET([am_mf])
++  AS_UNSET([am_rc])
++  rm -f conftest-deps.mk
 +}
 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 +
@@ -20506,18 +20986,17 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# -----------------------------
 +# This macro should only be invoked once -- use via AC_REQUIRE.
 +#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each '.P' file that we will
-+# need in order to bootstrap the dependency handling code.
++# This code is only required when automatic dependency tracking is enabled.
++# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
++# order to bootstrap the dependency handling code.
 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 +[AC_CONFIG_COMMANDS([depfiles],
 +     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
++     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 +
 +# Do all the work for Automake.                             -*- Autoconf -*-
 +
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20526,6 +21005,12 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# This macro actually does too much.  Some checks are only needed if
 +# your package does certain things.  But this isn't really a big deal.
 +
++dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
++m4_define([AC_PROG_CC],
++m4_defn([AC_PROG_CC])
++[_AM_PROG_CC_C_O
++])
++
 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 +# AM_INIT_AUTOMAKE([OPTIONS])
 +# -----------------------------------------------
@@ -20598,11 +21083,11 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 +# For better backward compatibility.  To be removed once Automake 1.9.x
 +# dies out for good.  For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 +AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
++# We need awk for the "check" target (and possibly the TAP driver).  The
++# system "awk" is bad on some platforms.
 +AC_REQUIRE([AC_PROG_AWK])dnl
 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 +AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -20634,6 +21119,51 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +AC_CONFIG_COMMANDS_PRE(dnl
 +[m4_provide_if([_AM_COMPILER_EXEEXT],
 +  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
++
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make that assumption in our Makefile
++# recipes.  So use an aggressive probe to check that the usage we want is
++# actually supported "in the wild" to an acceptable degree.
++# See automake bug#10828.
++# To make any issue more visible, cause the running configure to be aborted
++# by default if the 'rm' program in use doesn't match our expectations; the
++# user can still override this though.
++if rm -f && rm -fr && rm -rf; then : OK; else
++  cat >&2 <<'END'
++Oops!
++
++Your 'rm' program seems unable to run without file operands specified
++on the command line, even when the '-f' option is present.  This is contrary
++to the behaviour of most rm programs out there, and not conforming with
++the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake@gnu.org about your system, including the value
++of your $PATH and any error possibly output before this message.  This
++can help us improve future automake versions.
++
++END
++  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
++    echo 'Configuration will proceed anyway, since you have set the' >&2
++    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
++    echo >&2
++  else
++    cat >&2 <<'END'
++Aborting the configuration process, to ensure you take notice of the issue.
++
++You can download and install GNU coreutils to get an 'rm' implementation
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
++
++If you want to complete the configuration process using your problematic
++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
++to "yes", and re-run configure.
++
++END
++    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
++  fi
++fi
++dnl The trailing newline in this macro's definition is deliberate, for
++dnl backward compatibility and to allow trailing 'dnl'-style comments
++dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 +])
 +
 +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -20642,7 +21172,6 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +m4_define([_AC_COMPILER_EXEEXT],
 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 +
-+
 +# When config.status generates a header, we must update the stamp-h file.
 +# This file resides in the same directory as the config header
 +# that is generated.  The stamp files are numbered to have different names.
@@ -20664,7 +21193,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +done
 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 +
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20675,7 +21204,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# Define $install_sh.
 +AC_DEFUN([AM_PROG_INSTALL_SH],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
++if test x"${install_sh+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -20685,7 +21214,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +fi
 +AC_SUBST([install_sh])])
 +
-+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
++# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20707,7 +21236,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 +# From Jim Meyering
 +
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20742,7 +21271,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +
 +# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 +
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20750,49 +21279,42 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +
 +# AM_MAKE_INCLUDE()
 +# -----------------
-+# Check to see how make treats includes.
++# Check whether make has an 'include' directive that can support all
++# the idioms we need for our automatic dependency tracking code.
 +AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
++[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
++cat > confinc.mk << 'END'
 +am__doit:
-+	@echo this is the am__doit target
++	@echo this is the am__doit target >confinc.out
 +.PHONY: am__doit
 +END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
 +am__include="#"
 +am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from 'make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
++# BSD make does it like this.
++echo '.include "confinc.mk" # ignored' > confmf.BSD
++# Other make implementations (GNU, Solaris 10, AIX) do it like this.
++echo 'include confinc.mk # ignored' > confmf.GNU
++_am_result=no
++for s in GNU BSD; do
++  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
++  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
++      ['0:this is the am__doit target'],
++      [AS_CASE([$s],
++          [BSD], [am__include='.include' am__quote='"'],
++          [am__include='include' am__quote=''])])
++  if test "$am__include" != "#"; then
++    _am_result="yes ($s style)"
++    break
++  fi
++done
++rm -f confinc.* confmf.*
++AC_MSG_RESULT([${_am_result}])
++AC_SUBST([am__include])])
++AC_SUBST([am__quote])])
 +
 +# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 +
-+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
++# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20831,7 +21353,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +
 +# Helper functions for option handling.                     -*- Autoconf -*-
 +
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20860,9 +21382,73 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +AC_DEFUN([_AM_IF_OPTION],
 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 +
++# Copyright (C) 1999-2018 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_PROG_CC_C_O
++# ---------------
++# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
++# to automatically call this.
++AC_DEFUN([_AM_PROG_CC_C_O],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++AC_LANG_PUSH([C])dnl
++AC_CACHE_CHECK(
++  [whether $CC understands -c and -o together],
++  [am_cv_prog_cc_c_o],
++  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
++  # Make sure it works both with $CC and with simple cc.
++  # Following AC_PROG_CC_C_O, we do the test twice because some
++  # compilers refuse to overwrite an existing .o file with -o,
++  # though they will create one.
++  am_cv_prog_cc_c_o=yes
++  for am_i in 1 2; do
++    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
++         && test -f conftest2.$ac_objext; then
++      : OK
++    else
++      am_cv_prog_cc_c_o=no
++      break
++    fi
++  done
++  rm -f core conftest*
++  unset am_i])
++if test "$am_cv_prog_cc_c_o" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++AC_LANG_POP([C])])
++
++# For backward compatibility.
++AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
++
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_RUN_LOG(COMMAND)
++# -------------------
++# Run COMMAND, save the exit status in ac_status, and log it.
++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
++AC_DEFUN([AM_RUN_LOG],
++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   (exit $ac_status); }])
++
 +# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 +
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -20943,7 +21529,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +rm -f conftest.file
 +])
 +
-+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
++# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -21003,7 +21589,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 +])
 +
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
++# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -21031,7 +21617,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
 +
-+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
++# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -21050,7 +21636,7 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +
 +# Check how to create a tarball.                            -*- Autoconf -*-
 +
-+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
++# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
@@ -21191,15 +21777,367 @@ diff -ruN arpack-ng-3.9.0/aclocal.m4 arpack-ng-3.9.0-patch/aclocal.m4
 +m4_include([m4/ltsugar.m4])
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
-diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux/config.guess
---- arpack-ng-3.9.0/build-aux/config.guess	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/config.guess	2023-02-12 10:13:44.637181587 +0000
-@@ -0,0 +1,1558 @@
+diff -ruN arpack-ng-3.9.1/build-aux/compile arpack-ng-3.9.1-patch/build-aux/compile
+--- arpack-ng-3.9.1/build-aux/compile	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/compile	2023-11-11 16:51:20.860932833 +0900
+@@ -0,0 +1,348 @@
++#! /bin/sh
++# Wrapper for compilers which do not understand '-c -o'.
++
++scriptversion=2018-03-07.03; # UTC
++
++# Copyright (C) 1999-2018 Free Software Foundation, Inc.
++# Written by Tom Tromey <tromey@cygnus.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++nl='
++'
++
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent tools from complaining about whitespace usage.
++IFS=" ""	$nl"
++
++file_conv=
++
++# func_file_conv build_file lazy
++# Convert a $build file to $host form and store it in $file
++# Currently only supports Windows hosts. If the determined conversion
++# type is listed in (the comma separated) LAZY, no conversion will
++# take place.
++func_file_conv ()
++{
++  file=$1
++  case $file in
++    / | /[!/]*) # absolute file, and not a UNC file
++      if test -z "$file_conv"; then
++	# lazily determine how to convert abs files
++	case `uname -s` in
++	  MINGW*)
++	    file_conv=mingw
++	    ;;
++	  CYGWIN*)
++	    file_conv=cygwin
++	    ;;
++	  *)
++	    file_conv=wine
++	    ;;
++	esac
++      fi
++      case $file_conv/,$2, in
++	*,$file_conv,*)
++	  ;;
++	mingw/*)
++	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
++	  ;;
++	cygwin/*)
++	  file=`cygpath -m "$file" || echo "$file"`
++	  ;;
++	wine/*)
++	  file=`winepath -w "$file" || echo "$file"`
++	  ;;
++      esac
++      ;;
++  esac
++}
++
++# func_cl_dashL linkdir
++# Make cl look for libraries in LINKDIR
++func_cl_dashL ()
++{
++  func_file_conv "$1"
++  if test -z "$lib_path"; then
++    lib_path=$file
++  else
++    lib_path="$lib_path;$file"
++  fi
++  linker_opts="$linker_opts -LIBPATH:$file"
++}
++
++# func_cl_dashl library
++# Do a library search-path lookup for cl
++func_cl_dashl ()
++{
++  lib=$1
++  found=no
++  save_IFS=$IFS
++  IFS=';'
++  for dir in $lib_path $LIB
++  do
++    IFS=$save_IFS
++    if $shared && test -f "$dir/$lib.dll.lib"; then
++      found=yes
++      lib=$dir/$lib.dll.lib
++      break
++    fi
++    if test -f "$dir/$lib.lib"; then
++      found=yes
++      lib=$dir/$lib.lib
++      break
++    fi
++    if test -f "$dir/lib$lib.a"; then
++      found=yes
++      lib=$dir/lib$lib.a
++      break
++    fi
++  done
++  IFS=$save_IFS
++
++  if test "$found" != yes; then
++    lib=$lib.lib
++  fi
++}
++
++# func_cl_wrapper cl arg...
++# Adjust compile command to suit cl
++func_cl_wrapper ()
++{
++  # Assume a capable shell
++  lib_path=
++  shared=:
++  linker_opts=
++  for arg
++  do
++    if test -n "$eat"; then
++      eat=
++    else
++      case $1 in
++	-o)
++	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
++	  eat=1
++	  case $2 in
++	    *.o | *.[oO][bB][jJ])
++	      func_file_conv "$2"
++	      set x "$@" -Fo"$file"
++	      shift
++	      ;;
++	    *)
++	      func_file_conv "$2"
++	      set x "$@" -Fe"$file"
++	      shift
++	      ;;
++	  esac
++	  ;;
++	-I)
++	  eat=1
++	  func_file_conv "$2" mingw
++	  set x "$@" -I"$file"
++	  shift
++	  ;;
++	-I*)
++	  func_file_conv "${1#-I}" mingw
++	  set x "$@" -I"$file"
++	  shift
++	  ;;
++	-l)
++	  eat=1
++	  func_cl_dashl "$2"
++	  set x "$@" "$lib"
++	  shift
++	  ;;
++	-l*)
++	  func_cl_dashl "${1#-l}"
++	  set x "$@" "$lib"
++	  shift
++	  ;;
++	-L)
++	  eat=1
++	  func_cl_dashL "$2"
++	  ;;
++	-L*)
++	  func_cl_dashL "${1#-L}"
++	  ;;
++	-static)
++	  shared=false
++	  ;;
++	-Wl,*)
++	  arg=${1#-Wl,}
++	  save_ifs="$IFS"; IFS=','
++	  for flag in $arg; do
++	    IFS="$save_ifs"
++	    linker_opts="$linker_opts $flag"
++	  done
++	  IFS="$save_ifs"
++	  ;;
++	-Xlinker)
++	  eat=1
++	  linker_opts="$linker_opts $2"
++	  ;;
++	-*)
++	  set x "$@" "$1"
++	  shift
++	  ;;
++	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
++	  func_file_conv "$1"
++	  set x "$@" -Tp"$file"
++	  shift
++	  ;;
++	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
++	  func_file_conv "$1" mingw
++	  set x "$@" "$file"
++	  shift
++	  ;;
++	*)
++	  set x "$@" "$1"
++	  shift
++	  ;;
++      esac
++    fi
++    shift
++  done
++  if test -n "$linker_opts"; then
++    linker_opts="-link$linker_opts"
++  fi
++  exec "$@" $linker_opts
++  exit 1
++}
++
++eat=
++
++case $1 in
++  '')
++     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
++  -h | --h*)
++    cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand '-c -o'.
++Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file 'INSTALL'.
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++    exit $?
++    ;;
++  -v | --v*)
++    echo "compile $scriptversion"
++    exit $?
++    ;;
++  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
++  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
++    func_cl_wrapper "$@"      # Doesn't return...
++    ;;
++esac
++
++ofile=
++cfile=
++
++for arg
++do
++  if test -n "$eat"; then
++    eat=
++  else
++    case $1 in
++      -o)
++	# configure might choose to run compile as 'compile cc -o foo foo.c'.
++	# So we strip '-o arg' only if arg is an object.
++	eat=1
++	case $2 in
++	  *.o | *.obj)
++	    ofile=$2
++	    ;;
++	  *)
++	    set x "$@" -o "$2"
++	    shift
++	    ;;
++	esac
++	;;
++      *.c)
++	cfile=$1
++	set x "$@" "$1"
++	shift
++	;;
++      *)
++	set x "$@" "$1"
++	shift
++	;;
++    esac
++  fi
++  shift
++done
++
++if test -z "$ofile" || test -z "$cfile"; then
++  # If no '-o' option was seen then we might have been invoked from a
++  # pattern rule where we don't need one.  That is ok -- this is a
++  # normal compilation that the losing compiler can handle.  If no
++  # '.c' file was seen then we are probably linking.  That is also
++  # ok.
++  exec "$@"
++fi
++
++# Name of file we expect compiler to create.
++cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
++
++# Create the lock directory.
++# Note: use '[/\\:.-]' here to ensure that we don't use the same name
++# that we are using for the .o file.  Also, base the name on the expected
++# object file name, since that is what matters with a parallel build.
++lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
++while true; do
++  if mkdir "$lockdir" >/dev/null 2>&1; then
++    break
++  fi
++  sleep 1
++done
++# FIXME: race condition here if user kills between mkdir and trap.
++trap "rmdir '$lockdir'; exit 1" 1 2 15
++
++# Run the compile.
++"$@"
++ret=$?
++
++if test -f "$cofile"; then
++  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
++fi
++
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'before-save-hook 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC0"
++# time-stamp-end: "; # UTC"
++# End:
+diff -ruN arpack-ng-3.9.1/build-aux/config.guess arpack-ng-3.9.1-patch/build-aux/config.guess
+--- arpack-ng-3.9.1/build-aux/config.guess	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/config.guess	2023-11-11 16:51:20.867932859 +0900
+@@ -0,0 +1,1480 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
-+#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
 +
-+timestamp='2013-06-10'
++timestamp='2018-02-24'
 +
 +# This file is free software; you can redistribute it and/or modify it
 +# under the terms of the GNU General Public License as published by
@@ -21212,7 +22150,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -21221,12 +22159,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +# program.  This Exception is an additional permission under section 7
 +# of the GNU General Public License, version 3 ("GPLv3").
 +#
-+# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 +#
 +# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 +#
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
 +
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
@@ -21236,7 +22174,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +
 +Output the configuration name of the system \`$me' is run on.
 +
-+Operation modes:
++Options:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
@@ -21247,7 +22185,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +GNU config.guess ($timestamp)
 +
 +Originally written by Per Bothner.
-+Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2018 Free Software Foundation, Inc.
 +
 +This is free software; see the source for copying conditions.  There is NO
 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -21304,9 +22242,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +dummy=$tmp/dummy ;
 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 +case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
++ ,,)    echo "int x;" > "$dummy.c" ;
 +	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 +	     CC_FOR_BUILD="$c"; break ;
 +	  fi ;
 +	done ;
@@ -21329,14 +22267,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 +
-+case "${UNAME_SYSTEM}" in
++case "$UNAME_SYSTEM" in
 +Linux|GNU|GNU/*)
 +	# If the system lacks a compiler, then just pick glibc.
 +	# We could probably try harder.
 +	LIBC=gnu
 +
-+	eval $set_cc_for_build
-+	cat <<-EOF > $dummy.c
++	eval "$set_cc_for_build"
++	cat <<-EOF > "$dummy.c"
 +	#include <features.h>
 +	#if defined(__UCLIBC__)
 +	LIBC=uclibc
@@ -21346,13 +22284,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	LIBC=gnu
 +	#endif
 +	EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++
++	# If ldd exists, use it to detect musl libc.
++	if command -v ldd >/dev/null && \
++		ldd --version 2>&1 | grep -q ^musl
++	then
++	    LIBC=musl
++	fi
 +	;;
 +esac
 +
 +# Note: order is significant - the case branches are not exclusive.
 +
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 +    *:NetBSD:*:*)
 +	# NetBSD (nbsd) targets should (where applicable) match one or
 +	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -21365,21 +22310,31 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	# Note: NetBSD doesn't particularly care about the vendor
 +	# portion of the name.  We always set it to "unknown".
 +	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
++	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++	    "/sbin/$sysctl" 2>/dev/null || \
++	    "/usr/sbin/$sysctl" 2>/dev/null || \
++	    echo unknown)`
++	case "$UNAME_MACHINE_ARCH" in
 +	    armeb) machine=armeb-unknown ;;
 +	    arm*) machine=arm-unknown ;;
 +	    sh3el) machine=shl-unknown ;;
 +	    sh3eb) machine=sh-unknown ;;
 +	    sh5el) machine=sh5le-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	    earmv*)
++		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine="${arch}${endian}"-unknown
++		;;
++	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
 +	esac
 +	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
++	# to ELF recently (or will in the future) and ABI.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		os=netbsdelf
++		;;
 +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
++		eval "$set_cc_for_build"
 +		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +			| grep -q __ELF__
 +		then
@@ -21394,44 +22349,67 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +		os=netbsd
 +		;;
 +	esac
++	# Determine ABI tags.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++		;;
++	esac
 +	# The OS release
 +	# Debian GNU/NetBSD machines have a different userland, and
 +	# thus, need a distinct triplet. However, they do not need
 +	# kernel version information, so it can be replaced with a
 +	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
++	case "$UNAME_VERSION" in
 +	    Debian*)
 +		release='-gnu'
 +		;;
 +	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
 +		;;
 +	esac
 +	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 +	# contains redundant information, the shorter form:
 +	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
++	echo "$machine-${os}${release}${abi}"
 +	exit ;;
 +    *:Bitrig:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
 +	exit ;;
 +    *:OpenBSD:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
++	exit ;;
++    *:LibertyBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
++	exit ;;
++    *:MidnightBSD:*:*)
++	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
 +	exit ;;
 +    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
 +	exit ;;
 +    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
 +	exit ;;
 +    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
 +	exit ;;
 +    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
++	exit ;;
++    *:Sortix:*:*)
++	echo "$UNAME_MACHINE"-unknown-sortix
++	exit ;;
++    *:Redox:*:*)
++	echo "$UNAME_MACHINE"-unknown-redox
 +	exit ;;
++    mips:OSF1:*.*)
++        echo mips-dec-osf1
++        exit ;;
 +    alpha:OSF1:*:*)
 +	case $UNAME_RELEASE in
 +	*4.0)
@@ -21448,63 +22426,54 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +	case "$ALPHA_CPU_TYPE" in
 +	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
 +	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
 +	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
 +	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
++		UNAME_MACHINE=alphaev5 ;;
 +	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
++		UNAME_MACHINE=alphaev56 ;;
 +	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
++		UNAME_MACHINE=alphapca56 ;;
 +	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
++		UNAME_MACHINE=alphapca57 ;;
 +	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
++		UNAME_MACHINE=alphaev6 ;;
 +	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
++		UNAME_MACHINE=alphaev67 ;;
 +	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
 +	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
 +	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
 +	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
++		UNAME_MACHINE=alphaev69 ;;
 +	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
++		UNAME_MACHINE=alphaev7 ;;
 +	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
++		UNAME_MACHINE=alphaev79 ;;
 +	esac
 +	# A Pn.n version is a patched version.
 +	# A Vn.n version is a released version.
 +	# A Tn.n version is a released field test version.
 +	# A Xn.n version is an unreleased experimental baselevel.
 +	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 +	exitcode=$?
 +	trap '' 0
 +	exit $exitcode ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit ;;
 +    Amiga*:UNIX_System_V:4.0:*)
 +	echo m68k-unknown-sysv4
 +	exit ;;
 +    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
++	echo "$UNAME_MACHINE"-unknown-amigaos
 +	exit ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
++	echo "$UNAME_MACHINE"-unknown-morphos
 +	exit ;;
 +    *:OS/390:*:*)
 +	echo i370-ibm-openedition
@@ -21516,7 +22485,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo powerpc-ibm-os400
 +	exit ;;
 +    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
++	echo arm-acorn-riscix"$UNAME_RELEASE"
 +	exit ;;
 +    arm*:riscos:*:*|arm*:RISCOS:*:*)
 +	echo arm-unknown-riscos
@@ -21543,38 +22512,38 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	    sparc) echo sparc-icl-nx7; exit ;;
 +	esac ;;
 +    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
 +	exit ;;
 +    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 +	exit ;;
 +    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
 +	exit ;;
 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
++	echo i386-pc-auroraux"$UNAME_RELEASE"
 +	exit ;;
 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
++	eval "$set_cc_for_build"
++	SUN_ARCH=i386
 +	# If there is a compiler, see if it is configured for 64-bit objects.
 +	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 +	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 +	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 +		grep IS_64BIT_ARCH >/dev/null
 +	    then
-+		SUN_ARCH="x86_64"
++		SUN_ARCH=x86_64
 +	    fi
 +	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 +	exit ;;
 +    sun4*:SunOS:6*:*)
 +	# According to config.sub, this is the proper way to canonicalize
 +	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 +	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 +	exit ;;
 +    sun4*:SunOS:*:*)
 +	case "`/usr/bin/arch -k`" in
@@ -21583,25 +22552,25 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +		;;
 +	esac
 +	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
 +	exit ;;
 +    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
++	echo m68k-sun-sunos"$UNAME_RELEASE"
 +	exit ;;
 +    sun*:*:4.2BSD:*)
 +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
 +	case "`/bin/arch`" in
 +	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
++		echo m68k-sun-sunos"$UNAME_RELEASE"
 +		;;
 +	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
++		echo sparc-sun-sunos"$UNAME_RELEASE"
 +		;;
 +	esac
 +	exit ;;
 +    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
++	echo sparc-auspex-sunos"$UNAME_RELEASE"
 +	exit ;;
 +    # The situation for MiNT is a little confusing.  The machine name
 +    # can be virtually everything (everything which is not
@@ -21612,44 +22581,44 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +    # MiNT.  But MiNT is downward compatible to TOS, so this should
 +    # be no problem.
 +    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint"$UNAME_RELEASE"
 +	exit ;;
 +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint"$UNAME_RELEASE"
 +	exit ;;
 +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint"$UNAME_RELEASE"
 +	exit ;;
 +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+	echo m68k-milan-mint${UNAME_RELEASE}
++	echo m68k-milan-mint"$UNAME_RELEASE"
 +	exit ;;
 +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+	echo m68k-hades-mint${UNAME_RELEASE}
++	echo m68k-hades-mint"$UNAME_RELEASE"
 +	exit ;;
 +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+	echo m68k-unknown-mint${UNAME_RELEASE}
++	echo m68k-unknown-mint"$UNAME_RELEASE"
 +	exit ;;
 +    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
++	echo m68k-apple-machten"$UNAME_RELEASE"
 +	exit ;;
 +    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
++	echo powerpc-apple-machten"$UNAME_RELEASE"
 +	exit ;;
 +    RISC*:Mach:*:*)
 +	echo mips-dec-mach_bsd4.3
 +	exit ;;
 +    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
++	echo mips-dec-ultrix"$UNAME_RELEASE"
 +	exit ;;
 +    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
++	echo vax-dec-ultrix"$UNAME_RELEASE"
 +	exit ;;
 +    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
++	echo clipper-intergraph-clix"$UNAME_RELEASE"
 +	exit ;;
 +    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
 +#ifdef __cplusplus
 +#include <stdio.h>  /* for printf() prototype */
 +	int main (int argc, char *argv[]) {
@@ -21658,23 +22627,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +#endif
 +	#if defined (host_mips) && defined (MIPSEB)
 +	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
 +	#endif
 +	#endif
 +	  exit (-1);
 +	}
 +EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 +	    { echo "$SYSTEM_NAME"; exit; }
-+	echo mips-mips-riscos${UNAME_RELEASE}
++	echo mips-mips-riscos"$UNAME_RELEASE"
 +	exit ;;
 +    Motorola:PowerMAX_OS:*:*)
 +	echo powerpc-motorola-powermax
@@ -21700,17 +22669,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +    AViiON:dgux:*:*)
 +	# DG/UX returns AViiON for all architectures
 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
 +	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++	       [ "$TARGET_BINARY_INTERFACE"x = x ]
 +	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
++		echo m88k-dg-dgux"$UNAME_RELEASE"
 +	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
 +	    fi
 +	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
++	    echo i586-dg-dgux"$UNAME_RELEASE"
 +	fi
 +	exit ;;
 +    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
@@ -21727,7 +22696,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo m68k-tektronix-bsd
 +	exit ;;
 +    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
 +	exit ;;
 +    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 +	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
@@ -21739,14 +22708,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	if [ -x /usr/bin/oslevel ] ; then
 +		IBM_REV=`/usr/bin/oslevel`
 +	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 +	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
 +	exit ;;
 +    *:AIX:2:3)
 +	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
++		eval "$set_cc_for_build"
++		sed 's/^		//' << EOF > "$dummy.c"
 +		#include <sys/systemcfg.h>
 +
 +		main()
@@ -21757,7 +22726,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +			exit(0);
 +			}
 +EOF
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 +		then
 +			echo "$SYSTEM_NAME"
 +		else
@@ -21771,26 +22740,27 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	exit ;;
 +    *:AIX:*:[4567])
 +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 +		IBM_ARCH=rs6000
 +	else
 +		IBM_ARCH=powerpc
 +	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
++	if [ -x /usr/bin/lslpp ] ; then
++		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 +	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 +	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
 +	exit ;;
 +    *:AIX:*:*)
 +	echo rs6000-ibm-aix
 +	exit ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
 +	echo romp-ibm-bsd4.4
 +	exit ;;
 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
 +	exit ;;                             # report: romp-ibm BSD 4.3
 +    *:BOSX:*:*)
 +	echo rs6000-bull-bosx
@@ -21805,28 +22775,28 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo m68k-hp-bsd4.4
 +	exit ;;
 +    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	case "$UNAME_MACHINE" in
++	    9000/31?)            HP_ARCH=m68000 ;;
++	    9000/[34]??)         HP_ARCH=m68k ;;
 +	    9000/[678][0-9][0-9])
 +		if [ -x /usr/bin/getconf ]; then
 +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+		    case "${sc_cpu_version}" in
-+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		    case "$sc_cpu_version" in
++		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 +		      532)                      # CPU_PA_RISC2_0
-+			case "${sc_kernel_bits}" in
-+			  32) HP_ARCH="hppa2.0n" ;;
-+			  64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++			case "$sc_kernel_bits" in
++			  32) HP_ARCH=hppa2.0n ;;
++			  64) HP_ARCH=hppa2.0w ;;
++			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 +			esac ;;
 +		    esac
 +		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^		//' << EOF >$dummy.c
++		if [ "$HP_ARCH" = "" ]; then
++		    eval "$set_cc_for_build"
++		    sed 's/^		//' << EOF > "$dummy.c"
 +
 +		#define _HPUX_SOURCE
 +		#include <stdlib.h>
@@ -21859,13 +22829,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +		    exit (0);
 +		}
 +EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 +		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +		fi ;;
 +	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
++	if [ "$HP_ARCH" = hppa2.0w ]
 +	then
-+	    eval $set_cc_for_build
++	    eval "$set_cc_for_build"
 +
 +	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 +	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -21876,23 +22846,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 +	    # => hppa64-hp-hpux11.23
 +
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 +		grep -q __LP64__
 +	    then
-+		HP_ARCH="hppa2.0w"
++		HP_ARCH=hppa2.0w
 +	    else
-+		HP_ARCH="hppa64"
++		HP_ARCH=hppa64
 +	    fi
 +	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
 +	exit ;;
 +    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux"$HPUX_REV"
 +	exit ;;
 +    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
 +	#include <unistd.h>
 +	int
 +	main ()
@@ -21917,11 +22887,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	  exit (0);
 +	}
 +EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 +		{ echo "$SYSTEM_NAME"; exit; }
 +	echo unknown-hitachi-hiuxwe2
 +	exit ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
 +	echo hppa1.1-hp-bsd
 +	exit ;;
 +    9000/8??:4.3bsd:*:*)
@@ -21930,7 +22900,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 +	echo hppa1.0-hp-mpeix
 +	exit ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
 +	echo hppa1.1-hp-osf
 +	exit ;;
 +    hp8??:OSF1:*:*)
@@ -21938,9 +22908,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	exit ;;
 +    i*86:OSF1:*:*)
 +	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	    echo "$UNAME_MACHINE"-unknown-osf1mk
 +	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
++	    echo "$UNAME_MACHINE"-unknown-osf1
 +	fi
 +	exit ;;
 +    parisc*:Lites*:*:*)
@@ -21965,127 +22935,109 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo c4-convex-bsd
 +	exit ;;
 +    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 +	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 +	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 +	      -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
++	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
 +    5000:UNIX_System_V:4.*:*)
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
 +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
 +	exit ;;
 +    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	echo sparc-unknown-bsdi"$UNAME_RELEASE"
 +	exit ;;
 +    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 +	exit ;;
 +    *:FreeBSD:*:*)
 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	case ${UNAME_PROCESSOR} in
++	case "$UNAME_PROCESSOR" in
 +	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		UNAME_PROCESSOR=x86_64 ;;
++	    i386)
++		UNAME_PROCESSOR=i586 ;;
 +	esac
++	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
 +	exit ;;
 +    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
++	echo "$UNAME_MACHINE"-pc-cygwin
 +	exit ;;
 +    *:MINGW64*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw64
++	echo "$UNAME_MACHINE"-pc-mingw64
 +	exit ;;
 +    *:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
++	echo "$UNAME_MACHINE"-pc-mingw32
 +	exit ;;
-+    i*:windows32*:*)
-+	# uname -m includes "-pc" on this system.
-+	echo ${UNAME_MACHINE}-mingw32
++    *:MSYS*:*)
++	echo "$UNAME_MACHINE"-pc-msys
 +	exit ;;
 +    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
++	echo "$UNAME_MACHINE"-pc-pw32
 +	exit ;;
 +    *:Interix*:*)
-+	case ${UNAME_MACHINE} in
++	case "$UNAME_MACHINE" in
 +	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
++		echo i586-pc-interix"$UNAME_RELEASE"
 +		exit ;;
 +	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
++		echo x86_64-unknown-interix"$UNAME_RELEASE"
 +		exit ;;
 +	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
++		echo ia64-unknown-interix"$UNAME_RELEASE"
 +		exit ;;
 +	esac ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit ;;
 +    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
++	echo "$UNAME_MACHINE"-pc-uwin
 +	exit ;;
 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +	echo x86_64-unknown-cygwin
 +	exit ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit ;;
 +    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 +	exit ;;
 +    *:GNU:*:*)
 +	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
 +	exit ;;
 +    *:GNU/*:*:*)
 +	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 +	exit ;;
 +    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
++	echo "$UNAME_MACHINE"-pc-minix
 +	exit ;;
 +    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    aarch64_be:Linux:*:*)
 +	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -22098,58 +23050,64 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +	esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    arc:Linux:*:* | arceb:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    arm*:Linux:*:*)
-+	eval $set_cc_for_build
++	eval "$set_cc_for_build"
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	else
 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 +		| grep -q __ARM_PCS_VFP
 +	    then
-+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
 +	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
 +	    fi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    cris:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
 +	exit ;;
 +    crisv32:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++	exit ;;
++    e2k:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    frv:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    hexagon:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    i*86:Linux:*:*)
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
 +	exit ;;
 +    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++	exit ;;
++    k1om:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    mips:Linux:*:* | mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
 +	#undef CPU
 +	#undef ${UNAME_MACHINE}
 +	#undef ${UNAME_MACHINE}el
@@ -22163,64 +23121,74 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	#endif
 +	#endif
 +EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
 +	;;
-+    or1k:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    mips64el:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
-+    or32:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-"$LIBC"
++	exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    padre:Linux:*:*)
-+	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-"$LIBC"
 +	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-${LIBC}
++	echo hppa64-unknown-linux-"$LIBC"
 +	exit ;;
 +    parisc:Linux:*:* | hppa:Linux:*:*)
 +	# Look for CPU level
 +	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++	  *)    echo hppa-unknown-linux-"$LIBC" ;;
 +	esac
 +	exit ;;
 +    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-"$LIBC"
 +	exit ;;
 +    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-"$LIBC"
 +	exit ;;
 +    ppc64le:Linux:*:*)
-+	echo powerpc64le-unknown-linux-${LIBC}
++	echo powerpc64le-unknown-linux-"$LIBC"
 +	exit ;;
 +    ppcle:Linux:*:*)
-+	echo powerpcle-unknown-linux-${LIBC}
++	echo powerpcle-unknown-linux-"$LIBC"
++	exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
 +	exit ;;
 +    sh64*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    tile*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 +	exit ;;
 +    x86_64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if objdump -f /bin/sh | grep -q elf32-x86-64; then
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++	else
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	fi
 +	exit ;;
 +    xtensa*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
 +    i*86:DYNIX/ptx:4*:*)
 +	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -22234,34 +23202,34 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	# I am not positive that other SVR4 systems won't match this,
 +	# I just have to hope.  -- rms.
 +	# Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
 +	exit ;;
 +    i*86:OS/2:*:*)
 +	# If we were able to find `uname', then EMX Unix compatibility
 +	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
++	echo "$UNAME_MACHINE"-pc-os2-emx
 +	exit ;;
 +    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
++	echo "$UNAME_MACHINE"-unknown-stop
 +	exit ;;
 +    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
++	echo "$UNAME_MACHINE"-unknown-atheos
 +	exit ;;
 +    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
++	echo "$UNAME_MACHINE"-pc-syllable
 +	exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
++	echo i386-unknown-lynxos"$UNAME_RELEASE"
 +	exit ;;
 +    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	echo "$UNAME_MACHINE"-pc-msdosdjgpp
 +	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++    i*86:*:4.*:*)
++	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 +	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
 +	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
 +	fi
 +	exit ;;
 +    i*86:*:5:[678]*)
@@ -22271,12 +23239,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	    *Pentium)	     UNAME_MACHINE=i586 ;;
 +	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 +	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
 +	exit ;;
 +    i*86:*:3.2:*)
 +	if test -f /usr/options/cb.name; then
 +		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
 +	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 +		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 +		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -22286,9 +23254,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +			&& UNAME_MACHINE=i686
 +		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 +			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
 +	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
++		echo "$UNAME_MACHINE"-pc-sysv32
 +	fi
 +	exit ;;
 +    pc:*:*:*)
@@ -22296,7 +23264,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 +	# the processor, so we play safe by assuming i586.
 +	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
++	# prints for the "djgpp" host, or else GDB configure will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
 +	exit ;;
@@ -22308,9 +23276,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	exit ;;
 +    i860:*:4.*:*) # i860-SVR4
 +	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
 +	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
 +	fi
 +	exit ;;
 +    mini*:CTIX:SYS*5:*)
@@ -22330,9 +23298,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	test -r /etc/.relid \
 +	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
 +    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +	  && { echo i486-ncr-sysv4; exit; } ;;
@@ -22341,28 +23309,28 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	test -r /etc/.relid \
 +	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
 +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	echo m68k-unknown-lynxos"$UNAME_RELEASE"
 +	exit ;;
 +    mc68030:UNIX_System_V:4.*:*)
 +	echo m68k-atari-sysv4
 +	exit ;;
 +    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	echo sparc-unknown-lynxos"$UNAME_RELEASE"
 +	exit ;;
 +    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
 +	exit ;;
 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
 +	exit ;;
 +    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
++	echo mips-dde-sysv"$UNAME_RELEASE"
 +	exit ;;
 +    RM*:ReliantUNIX-*:*:*)
 +	echo mips-sni-sysv4
@@ -22373,7 +23341,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +    *:SINIX-*:*:*)
 +	if uname -p 2>/dev/null >/dev/null ; then
 +		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
++		echo "$UNAME_MACHINE"-sni-sysv4
 +	else
 +		echo ns32k-sni-sysv
 +	fi
@@ -22393,23 +23361,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	exit ;;
 +    i*86:VOS:*:*)
 +	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
++	echo "$UNAME_MACHINE"-stratus-vos
 +	exit ;;
 +    *:VOS:*:*)
 +	# From Paul.Green@stratus.com.
 +	echo hppa1.1-stratus-vos
 +	exit ;;
 +    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
++	echo m68k-apple-aux"$UNAME_RELEASE"
 +	exit ;;
 +    news*:NEWS-OS:6*:*)
 +	echo mips-sony-newsos6
 +	exit ;;
 +    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 +	if [ -d /usr/nec ]; then
-+		echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv"$UNAME_RELEASE"
 +	else
-+		echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv"$UNAME_RELEASE"
 +	fi
 +	exit ;;
 +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@@ -22428,67 +23396,93 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo x86_64-unknown-haiku
 +	exit ;;
 +    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
++	echo sx4-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
++	echo sx5-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
++	echo sx6-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
++	echo sx7-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
++	echo sx8-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
++	echo sx8r-nec-superux"$UNAME_RELEASE"
++	exit ;;
++    SX-ACE:SUPER-UX:*:*)
++	echo sxace-nec-superux"$UNAME_RELEASE"
 +	exit ;;
 +    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
 +	exit ;;
 +    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
 +	exit ;;
 +    *:Darwin:*:*)
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	eval $set_cc_for_build
++	eval "$set_cc_for_build"
 +	if test "$UNAME_PROCESSOR" = unknown ; then
 +	    UNAME_PROCESSOR=powerpc
 +	fi
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		case $UNAME_PROCESSOR in
-+		    i386) UNAME_PROCESSOR=x86_64 ;;
-+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+		esac
++	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
++	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		       grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		       grep IS_PPC >/dev/null
++		then
++		    UNAME_PROCESSOR=powerpc
++		fi
 +	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
 +	fi
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
 +	exit ;;
 +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 +	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
++	if test "$UNAME_PROCESSOR" = x86; then
 +		UNAME_PROCESSOR=i386
 +		UNAME_MACHINE=pc
 +	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
 +	exit ;;
 +    *:QNX:*:4*)
 +	echo i386-pc-qnx
 +	exit ;;
-+    NEO-?:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk${UNAME_RELEASE}
++    NEO-*:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk"$UNAME_RELEASE"
 +	exit ;;
 +    NSE-*:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
++	echo nse-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSR-*:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk"$UNAME_RELEASE"
 +	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
++    NSV-*:NONSTOP_KERNEL:*:*)
++	echo nsv-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSX-*:NONSTOP_KERNEL:*:*)
++	echo nsx-tandem-nsk"$UNAME_RELEASE"
 +	exit ;;
 +    *:NonStop-UX:*:*)
 +	echo mips-compaq-nonstopux
@@ -22497,18 +23491,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo bs2000-siemens-sysv
 +	exit ;;
 +    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
 +	exit ;;
 +    *:Plan9:*:*)
 +	# "uname -m" is not consistent, so use $cputype instead. 386
 +	# is converted to i386 for consistency with other x86
 +	# operating systems.
-+	if test "$cputype" = "386"; then
++	if test "$cputype" = 386; then
 +	    UNAME_MACHINE=i386
 +	else
 +	    UNAME_MACHINE="$cputype"
 +	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
++	echo "$UNAME_MACHINE"-unknown-plan9
 +	exit ;;
 +    *:TOPS-10:*:*)
 +	echo pdp10-unknown-tops10
@@ -22529,14 +23523,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo pdp10-unknown-its
 +	exit ;;
 +    SEI:*:*:SEIUX)
-+	echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux"$UNAME_RELEASE"
 +	exit ;;
 +    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
 +	exit ;;
 +    *:*VMS:*:*)
 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
++	case "$UNAME_MACHINE" in
 +	    A*) echo alpha-dec-vms ; exit ;;
 +	    I*) echo ia64-dec-vms ; exit ;;
 +	    V*) echo vax-dec-vms ; exit ;;
@@ -22545,182 +23539,48 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +	echo i386-pc-xenix
 +	exit ;;
 +    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
 +	exit ;;
 +    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
++	echo "$UNAME_MACHINE"-pc-rdos
 +	exit ;;
 +    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
++	echo "$UNAME_MACHINE"-pc-aros
 +	exit ;;
 +    x86_64:VMkernel:*:*)
-+	echo ${UNAME_MACHINE}-unknown-esx
++	echo "$UNAME_MACHINE"-unknown-esx
++	exit ;;
++    amd64:Isilon\ OneFS:*:*)
++	echo x86_64-unknown-onefs
 +	exit ;;
 +esac
 +
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+	"4"
-+#else
-+	""
-+#endif
-+	); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix\n"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
++echo "$0: unable to guess system type" >&2
 +
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
++    mips:Linux | mips64:Linux)
++	# If we got here on MIPS GNU/Linux, output extra information.
++	cat >&2 <<EOF
 +
-+  exit (1);
-+}
++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
++the system type. Please install a C compiler and try again.
 +EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit ;;
-+    esac
-+fi
++	;;
++esac
 +
 +cat >&2 <<EOF
-+$0: unable to guess system type
 +
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
++This script (version $timestamp), has failed to recognize the
++operating system you are using. If your script is old, overwrite *all*
++copies of config.guess and config.sub with the latest versions from:
 +
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 +and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 +
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patches@gnu.org to
++provide the necessary information to handle your system.
 +
 +config.guess timestamp = $timestamp
 +
@@ -22739,29 +23599,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.guess arpack-ng-3.9.0-patch/build-aux
 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 +
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM  = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
 +EOF
 +
 +exit 1
 +
 +# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/config.sub
---- arpack-ng-3.9.0/build-aux/config.sub	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/config.sub	2023-02-12 10:13:44.639181596 +0000
-@@ -0,0 +1,1788 @@
+diff -ruN arpack-ng-3.9.1/build-aux/config.sub arpack-ng-3.9.1-patch/build-aux/config.sub
+--- arpack-ng-3.9.1/build-aux/config.sub	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/config.sub	2023-11-11 16:51:20.874932887 +0900
+@@ -0,0 +1,1801 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
-+#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
 +
-+timestamp='2013-04-24'
++timestamp='2018-02-22'
 +
 +# This file is free software; you can redistribute it and/or modify it
 +# under the terms of the GNU General Public License as published by
@@ -22774,7 +23634,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -22784,7 +23644,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +# of the GNU General Public License, version 3 ("GPLv3").
 +
 +
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
 +#
 +# Configuration subroutine to validate and canonicalize a configuration type.
 +# Supply the specified configuration type as an argument.
@@ -22792,7 +23652,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +# Otherwise, we print the canonical config type on stdout and succeed.
 +
 +# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 +
 +# This file is supposed to be the same for all GNU packages
 +# and recognize all the CPU types, system types and aliases
@@ -22812,12 +23672,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 +
 +Canonicalize a configuration name.
 +
-+Operation modes:
++Options:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
@@ -22827,7 +23686,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +version="\
 +GNU config.sub ($timestamp)
 +
-+Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2018 Free Software Foundation, Inc.
 +
 +This is free software; see the source for copying conditions.  There is NO
 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -22854,7 +23713,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +
 +    *local*)
 +       # First pass through any local machine types.
-+       echo $1
++       echo "$1"
 +       exit ;;
 +
 +    * )
@@ -22872,24 +23731,24 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +
 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 +# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 +case $maybe_os in
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
++  kopensolaris*-gnu* | cloudabi*-eabi* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
 +    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 +    ;;
 +  android-linux)
 +    os=-linux-android
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
 +    ;;
 +  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
++    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
++    if [ "$basic_machine" != "$1" ]
++    then os=`echo "$1" | sed 's/.*-/-/'`
 +    else os=; fi
 +    ;;
 +esac
@@ -22938,44 +23797,44 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		;;
 +	-sco6)
 +		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco5)
 +		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco4)
 +		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2.[4-9]*)
 +		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2v[4-9]*)
 +		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco5v6*)
 +		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco*)
 +		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-isc)
 +		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-clix*)
 +		basic_machine=clipper-intergraph
 +		;;
 +	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-lynx*178)
 +		os=-lynxos178
@@ -22987,10 +23846,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-lynxos
 +		;;
 +	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 +		;;
 +	-psos*)
 +		os=-psos
@@ -23014,16 +23870,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| arc | arceb \
 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 +	| avr | avr32 \
++	| ba \
 +	| be32 | be64 \
 +	| bfin \
-+	| c4x | clipper \
++	| c4x | c8051 | clipper \
 +	| d10v | d30v | dlx | dsp16xx \
-+	| epiphany \
-+	| fido | fr30 | frv \
++	| e2k | epiphany \
++	| fido | fr30 | frv | ft32 \
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| hexagon \
-+	| i370 | i860 | i960 | ia64 \
++	| i370 | i860 | i960 | ia16 | ia64 \
 +	| ip2k | iq2000 \
++	| k1om \
 +	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -23041,8 +23899,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa32r6 | mipsisa32r6el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64r6 | mipsisa64r6el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipsr5900 | mipsr5900el \
@@ -23054,14 +23914,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| nds32 | nds32le | nds32be \
 +	| nios | nios2 | nios2eb | nios2el \
 +	| ns16k | ns32k \
-+	| open8 \
-+	| or1k | or32 \
-+	| pdp10 | pdp11 | pj | pjl \
++	| open8 | or1k | or1knd | or32 \
++	| pdp10 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
++	| pru \
 +	| pyramid \
++	| riscv32 | riscv64 \
 +	| rl78 | rx \
 +	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -23069,7 +23930,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-+	| we32k \
++	| visium \
++	| wasm32 \
 +	| x86 | xc16x | xstormy16 | xtensa \
 +	| z8k | z80)
 +		basic_machine=$basic_machine-unknown
@@ -23083,11 +23945,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	c6x)
 +		basic_machine=tic6x-unknown
 +		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++	leon|leon[3-9])
++		basic_machine=sparc-$basic_machine
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 +		basic_machine=$basic_machine-unknown
 +		os=-none
 +		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 +		;;
 +	ms1)
 +		basic_machine=mt-unknown
@@ -23116,7 +23981,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	  ;;
 +	# Object if more than one company name word.
 +	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 +		exit 1
 +		;;
 +	# Recognize the basic CPU types with company name.
@@ -23128,18 +23993,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* | avr32-* \
++	| ba-* \
 +	| be32-* | be64-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-+	| clipper-* | craynv-* | cydra-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
++	| e2k-* | elxsi-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 +	| h8300-* | h8500-* \
 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| hexagon-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
++	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 +	| ip2k-* | iq2000-* \
++	| k1om-* \
 +	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
@@ -23159,8 +24026,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa32r6-* | mipsisa32r6el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64r6-* | mipsisa64r6el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipsr5900-* | mipsr5900el-* \
@@ -23172,16 +24041,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| open8-* \
++	| or1k*-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
++	| pru-* \
 +	| pyramid-* \
++	| riscv32-* | riscv64-* \
 +	| rl78-* | romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 +	| tahoe-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tile*-* \
@@ -23189,6 +24061,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	| ubicom32-* \
 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +	| vax-* \
++	| visium-* \
++	| wasm32-* \
 +	| we32k-* \
 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
 +	| xstormy16-* | xtensa*-* \
@@ -23202,7 +24076,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	# Recognize the various machine names and aliases which stand
 +	# for a CPU type and a company and sometimes even an OS.
 +	386bsd)
-+		basic_machine=i386-unknown
++		basic_machine=i386-pc
 +		os=-bsd
 +		;;
 +	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -23236,7 +24110,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=x86_64-pc
 +		;;
 +	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	amdahl)
 +		basic_machine=580-amdahl
@@ -23265,6 +24139,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=i386-pc
 +		os=-aros
 +		;;
++	asmjs)
++		basic_machine=asmjs-unknown
++		;;
 +	aux)
 +		basic_machine=m68k-apple
 +		os=-aux
@@ -23278,7 +24155,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-linux
 +		;;
 +	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	bluegene*)
@@ -23286,13 +24163,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-cnk
 +		;;
 +	c54x-*)
-+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	c55x-*)
-+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	c6x-*)
-+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	c90)
 +		basic_machine=c90-cray
@@ -23381,10 +24258,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=rs6000-bull
 +		os=-bosx
 +		;;
-+	dpx2* | dpx2*-bull)
++	dpx2*)
 +		basic_machine=m68k-bull
 +		os=-sysv3
 +		;;
++	e500v[12])
++		basic_machine=powerpc-unknown
++		os=$os"spe"
++		;;
++	e500v[12]-*)
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++		os=$os"spe"
++		;;
 +	ebmon29k)
 +		basic_machine=a29k-amd
 +		os=-ebmon
@@ -23474,9 +24359,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
 +	hppaosf)
 +		basic_machine=hppa1.1-hp
 +		os=-osf
@@ -23489,26 +24371,26 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=i370-ibm
 +		;;
 +	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 +		os=-sysv32
 +		;;
 +	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 +		os=-sysv4
 +		;;
 +	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 +		os=-sysv
 +		;;
 +	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 +		os=-solaris2
 +		;;
 +	i386mach)
 +		basic_machine=i386-mach
 +		os=-mach
 +		;;
-+	i386-vsta | vsta)
++	vsta)
 +		basic_machine=i386-unknown
 +		os=-vsta
 +		;;
@@ -23526,17 +24408,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=m68k-isi
 +		os=-sysv
 +		;;
++	leon-*|leon[3-9]-*)
++		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
++		;;
 +	m68knommu)
 +		basic_machine=m68k-unknown
 +		os=-linux
 +		;;
 +	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
 +	magnum | m3230)
 +		basic_machine=mips-mips
 +		os=-sysv
@@ -23553,7 +24435,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-mingw64
 +		;;
 +	mingw32)
-+		basic_machine=i386-pc
++		basic_machine=i686-pc
 +		os=-mingw32
 +		;;
 +	mingw32ce)
@@ -23568,10 +24450,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-mint
 +		;;
 +	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 +		;;
 +	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 +		;;
 +	monitor)
 +		basic_machine=m68k-rom68k
@@ -23581,15 +24463,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=powerpc-unknown
 +		os=-morphos
 +		;;
++	moxiebox)
++		basic_machine=moxie-unknown
++		os=-moxiebox
++		;;
 +	msdos)
 +		basic_machine=i386-pc
 +		os=-msdos
 +		;;
 +	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 +		;;
 +	msys)
-+		basic_machine=i386-pc
++		basic_machine=i686-pc
 +		os=-msys
 +		;;
 +	mvs)
@@ -23628,7 +24514,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=v70-nec
 +		os=-sysv
 +		;;
-+	next | m*-next )
++	next | m*-next)
 +		basic_machine=m68k-next
 +		case $os in
 +		    -nextstep* )
@@ -23673,6 +24559,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	nsr-tandem)
 +		basic_machine=nsr-tandem
 +		;;
++	nsv-tandem)
++		basic_machine=nsv-tandem
++		;;
++	nsx-tandem)
++		basic_machine=nsx-tandem
++		;;
 +	op50n-* | op60c-*)
 +		basic_machine=hppa1.1-oki
 +		os=-proelf
@@ -23705,7 +24597,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-linux
 +		;;
 +	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	pbd)
@@ -23721,7 +24613,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=i386-pc
 +		;;
 +	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
 +		basic_machine=i586-pc
@@ -23736,16 +24628,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=i786-pc
 +		;;
 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	pn)
 +		basic_machine=pn-gould
@@ -23755,23 +24647,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	ppc | ppcbe)	basic_machine=powerpc-unknown
 +		;;
 +	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
++	ppcle | powerpclittle)
 +		basic_machine=powerpcle-unknown
 +		;;
 +	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	ppc64)	basic_machine=powerpc64-unknown
 +		;;
-+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++	ppc64le | powerpc64little)
 +		basic_machine=powerpc64le-unknown
 +		;;
 +	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	ps2)
 +		basic_machine=i386-ibm
@@ -23825,17 +24717,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	sequent)
 +		basic_machine=i386-sequent
 +		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
 +	sh5el)
 +		basic_machine=sh5le-unknown
 +		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
++	simso-wrs)
 +		basic_machine=sparclite-wrs
 +		os=-vxworks
 +		;;
@@ -23854,7 +24739,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=-sysv4
 +		;;
 +	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +		;;
 +	sun2)
 +		basic_machine=m68000-sun
@@ -23976,6 +24861,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=hppa1.1-winbond
 +		os=-proelf
 +		;;
++	x64)
++		basic_machine=x86_64-pc
++		;;
 +	xbox)
 +		basic_machine=i686-pc
 +		os=-mingw32
@@ -23984,20 +24872,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		basic_machine=xps100-honeywell
 +		;;
 +	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 +		;;
 +	ymp)
 +		basic_machine=ymp-cray
 +		os=-unicos
 +		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
 +	none)
 +		basic_machine=none-none
 +		os=-none
@@ -24026,10 +24906,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	vax)
 +		basic_machine=vax-dec
 +		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
 +	pdp11)
 +		basic_machine=pdp11-dec
 +		;;
@@ -24039,9 +24915,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 +		basic_machine=sh-unknown
 +		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+		basic_machine=sparc-sun
-+		;;
 +	cydra)
 +		basic_machine=cydra-cydrome
 +		;;
@@ -24061,7 +24934,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		# Make sure to match an already-canonicalized machine name.
 +		;;
 +	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
@@ -24069,10 +24942,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +# Here we canonicalize certain aliases for manufacturers.
 +case $basic_machine in
 +	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 +		;;
 +	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 +		;;
 +	*)
 +		;;
@@ -24083,8 +24956,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +if [ x"$os" != x"" ]
 +then
 +case $os in
-+	# First match some system type aliases
-+	# that might get confused with valid system types.
++	# First match some system type aliases that might get confused
++	# with valid system types.
 +	# -solaris* is a basic system type, with this one exception.
 +	-auroraux)
 +		os=-auroraux
@@ -24095,45 +24968,48 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-solaris)
 +		os=-solaris2
 +		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
 +	-unixware*)
 +		os=-sysv4.2uw
 +		;;
 +	-gnu/linux*)
 +		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 +		;;
-+	# First accept the basic system types.
++	# es1800 is here to avoid being matched by es* (a different OS)
++	-es1800*)
++		os=-ose
++		;;
++	# Now accept the basic system types.
 +	# The portable systems comes first.
-+	# Each alternative MUST END IN A *, to match a version number.
++	# Each alternative MUST end in a * to match a version number.
 +	# -sysv* is not here because it comes later, after sysvr4.
 +	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 +	      | -sym* | -kopensolaris* | -plan9* \
 +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* | -aros* \
++	      | -aos* | -aros* | -cloudabi* | -sortix* \
 +	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 +	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -bitrig* | -openbsd* | -solidbsd* \
++	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 +	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
++	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -morphos* | -superux* | -rtmk* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
++	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
++	      | -midnightbsd*)
 +	# Remember, each alternative MUST END IN *, to match a version number.
 +		;;
 +	-qnx*)
@@ -24150,12 +25026,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-nto*)
 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 +		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	-sim | -xray | -os68k* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* \
 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 +		;;
 +	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
++		os=`echo "$os" | sed -e 's|mac|macos|'`
 +		;;
 +	-linux-dietlibc)
 +		os=-linux-dietlibc
@@ -24164,10 +25040,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 +		;;
 +	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 +		;;
 +	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 +		;;
 +	-opened*)
 +		os=-openedition
@@ -24178,12 +25054,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-wince*)
 +		os=-wince
 +		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
 +	-utek*)
 +		os=-bsd
 +		;;
@@ -24208,7 +25078,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-nova*)
 +		os=-rtmk-nova
 +		;;
-+	-ns2 )
++	-ns2)
 +		os=-nextstep2
 +		;;
 +	-nsk*)
@@ -24230,7 +25100,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-oss*)
 +		os=-sysv3
 +		;;
-+	-svr4)
++	-svr4*)
 +		os=-sysv4
 +		;;
 +	-svr3)
@@ -24245,32 +25115,38 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	-ose*)
 +		os=-ose
 +		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
 +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +		os=-mint
 +		;;
-+	-aros*)
-+		os=-aros
-+		;;
 +	-zvmoe)
 +		os=-zvmoe
 +		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
++	-pikeos*)
++		# Until real need of OS specific support for
++		# particular features comes up, bare metal
++		# configurations are quite functional.
++		case $basic_machine in
++		    arm*)
++			os=-eabi
++			;;
++		    *)
++			os=-elf
++			;;
++		esac
++		;;
 +	-nacl*)
 +		;;
++	-ios)
++		;;
 +	-none)
 +		;;
 +	*)
 +		# Get rid of the `-' at the beginning of $os.
 +		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
@@ -24305,6 +25181,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	c4x-* | tic4x-*)
 +		os=-coff
 +		;;
++	c8051-*)
++		os=-elf
++		;;
 +	hexagon-*)
 +		os=-elf
 +		;;
@@ -24348,9 +25227,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	mips*-*)
 +		os=-elf
 +		;;
-+	or1k-*)
-+		os=-elf
-+		;;
 +	or32-*)
 +		os=-coff
 +		;;
@@ -24360,12 +25236,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	sparc-* | *-sun)
 +		os=-sunos4.1.1
 +		;;
++	pru-*)
++		os=-elf
++		;;
 +	*-be)
 +		os=-beos
 +		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
 +	*-ibm)
 +		os=-aix
 +		;;
@@ -24405,7 +25281,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	m88k-omron*)
 +		os=-luna
 +		;;
-+	*-next )
++	*-next)
 +		os=-nextstep
 +		;;
 +	*-sequent)
@@ -24420,9 +25296,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +	i370-*)
 +		os=-mvs
 +		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
 +	*-gould)
 +		os=-sysv
 +		;;
@@ -24532,29 +25405,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/config.sub arpack-ng-3.9.0-patch/build-aux/c
 +				vendor=stratus
 +				;;
 +		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 +		;;
 +esac
 +
-+echo $basic_machine$os
++echo "$basic_machine$os"
 +exit
 +
 +# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -ruN arpack-ng-3.9.0/build-aux/depcomp arpack-ng-3.9.0-patch/build-aux/depcomp
---- arpack-ng-3.9.0/build-aux/depcomp	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/depcomp	2023-02-12 10:13:46.468189007 +0000
+diff -ruN arpack-ng-3.9.1/build-aux/depcomp arpack-ng-3.9.1-patch/build-aux/depcomp
+--- arpack-ng-3.9.1/build-aux/depcomp	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/depcomp	2023-11-11 16:51:21.657935910 +0900
 @@ -0,0 +1,791 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
 +
-+scriptversion=2013-05-30.07; # UTC
++scriptversion=2018-03-07.03; # UTC
 +
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -24567,7 +25440,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/depcomp arpack-ng-3.9.0-patch/build-aux/depc
 +# GNU General Public License for more details.
 +
 +# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 +
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -25334,20 +26207,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/depcomp arpack-ng-3.9.0-patch/build-aux/depc
 +# Local Variables:
 +# mode: shell-script
 +# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
++# time-stamp-time-zone: "UTC0"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/install-sh
---- arpack-ng-3.9.0/build-aux/install-sh	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/install-sh	2023-02-12 10:13:44.642181608 +0000
-@@ -0,0 +1,527 @@
+diff -ruN arpack-ng-3.9.1/build-aux/install-sh arpack-ng-3.9.1-patch/build-aux/install-sh
+--- arpack-ng-3.9.1/build-aux/install-sh	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/install-sh	2023-11-11 16:51:20.881932913 +0900
+@@ -0,0 +1,518 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
 +
-+scriptversion=2011-11-20.07; # UTC
++scriptversion=2018-03-11.20; # UTC
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -25387,19 +26260,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +# This script is compatible with the BSD install script, but was written
 +# from scratch.
 +
++tab='	'
 +nl='
 +'
-+IFS=" ""	$nl"
++IFS=" $tab$nl"
 +
-+# set DOITPROG to echo to test this script
++# Set DOITPROG to "echo" to test this script.
 +
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
 +doit=${DOITPROG-}
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
++doit_exec=${doit:-exec}
 +
 +# Put in absolute file names if you don't have them in your path;
 +# or use environment vars.
@@ -25414,17 +26283,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +rmprog=${RMPROG-rm}
 +stripprog=${STRIPPROG-strip}
 +
-+posix_glob='?'
-+initialize_posix_glob='
-+  test "$posix_glob" != "?" || {
-+    if (set -f) 2>/dev/null; then
-+      posix_glob=
-+    else
-+      posix_glob=:
-+    fi
-+  }
-+'
-+
 +posix_mkdir=
 +
 +# Desired mode of installed file.
@@ -25443,7 +26301,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +dst_arg=
 +
 +copy_on_change=false
-+no_target_directory=
++is_target_a_directory=possibly
 +
 +usage="\
 +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -25483,46 +26341,57 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +    -d) dir_arg=true;;
 +
 +    -g) chgrpcmd="$chgrpprog $2"
-+	shift;;
++        shift;;
 +
 +    --help) echo "$usage"; exit $?;;
 +
 +    -m) mode=$2
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-+	shift;;
++        case $mode in
++          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
++            echo "$0: invalid mode: $mode" >&2
++            exit 1;;
++        esac
++        shift;;
 +
 +    -o) chowncmd="$chownprog $2"
-+	shift;;
++        shift;;
 +
 +    -s) stripcmd=$stripprog;;
 +
-+    -t) dst_arg=$2
-+	# Protect names problematic for 'test' and other utilities.
-+	case $dst_arg in
-+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-+	esac
-+	shift;;
++    -t)
++        is_target_a_directory=always
++        dst_arg=$2
++        # Protect names problematic for 'test' and other utilities.
++        case $dst_arg in
++          -* | [=\(\)!]) dst_arg=./$dst_arg;;
++        esac
++        shift;;
 +
-+    -T) no_target_directory=true;;
++    -T) is_target_a_directory=never;;
 +
 +    --version) echo "$0 $scriptversion"; exit $?;;
 +
-+    --)	shift
-+	break;;
++    --) shift
++        break;;
 +
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
++    -*) echo "$0: invalid option: $1" >&2
++        exit 1;;
 +
 +    *)  break;;
 +  esac
 +  shift
 +done
 +
++# We allow the use of options -d and -T together, by making -d
++# take the precedence; this is for compatibility with GNU install.
++
++if test -n "$dir_arg"; then
++  if test -n "$dst_arg"; then
++    echo "$0: target directory not allowed when installing a directory." >&2
++    exit 1
++  fi
++fi
++
 +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
 +  # When -d is used, all remaining arguments are directories to create.
 +  # When -t is used, the destination is already specified.
@@ -25554,6 +26423,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +fi
 +
 +if test -z "$dir_arg"; then
++  if test $# -gt 1 || test "$is_target_a_directory" = always; then
++    if test ! -d "$dst_arg"; then
++      echo "$0: $dst_arg: Is not a directory." >&2
++      exit 1
++    fi
++  fi
++fi
++
++if test -z "$dir_arg"; then
 +  do_exit='(exit $ret); exit $ret'
 +  trap "ret=129; $do_exit" 1
 +  trap "ret=130; $do_exit" 2
@@ -25569,16 +26447,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +
 +    *[0-7])
 +      if test -z "$stripcmd"; then
-+	u_plus_rw=
++        u_plus_rw=
 +      else
-+	u_plus_rw='% 200'
++        u_plus_rw='% 200'
 +      fi
 +      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
 +    *)
 +      if test -z "$stripcmd"; then
-+	u_plus_rw=
++        u_plus_rw=
 +      else
-+	u_plus_rw=,u+rw
++        u_plus_rw=,u+rw
 +      fi
 +      cp_umask=$mode$u_plus_rw;;
 +  esac
@@ -25612,122 +26490,113 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +    fi
 +    dst=$dst_arg
 +
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
++    # If destination is a directory, append the input filename.
 +    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dst_arg: Is a directory" >&2
-+	exit 1
++      if test "$is_target_a_directory" = never; then
++        echo "$0: $dst_arg: Is a directory" >&2
++        exit 1
 +      fi
 +      dstdir=$dst
-+      dst=$dstdir/`basename "$src"`
++      dstbase=`basename "$src"`
++      case $dst in
++	*/) dst=$dst$dstbase;;
++	*)  dst=$dst/$dstbase;;
++      esac
 +      dstdir_status=0
 +    else
-+      # Prefer dirname, but fall back on a substitute if dirname fails.
-+      dstdir=`
-+	(dirname "$dst") 2>/dev/null ||
-+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	     X"$dst" : 'X\(//\)[^/]' \| \
-+	     X"$dst" : 'X\(//\)$' \| \
-+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+	echo X"$dst" |
-+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)[^/].*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\).*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 s/.*/./; q'
-+      `
-+
++      dstdir=`dirname "$dst"`
 +      test -d "$dstdir"
 +      dstdir_status=$?
 +    fi
 +  fi
 +
++  case $dstdir in
++    */) dstdirslash=$dstdir;;
++    *)  dstdirslash=$dstdir/;;
++  esac
++
 +  obsolete_mkdir_used=false
 +
 +  if test $dstdir_status != 0; then
 +    case $posix_mkdir in
 +      '')
-+	# Create intermediate dirs using mode 755 as modified by the umask.
-+	# This is like FreeBSD 'install' as of 1997-10-28.
-+	umask=`umask`
-+	case $stripcmd.$umask in
-+	  # Optimize common cases.
-+	  *[2367][2367]) mkdir_umask=$umask;;
-+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+	  *[0-7])
-+	    mkdir_umask=`expr $umask + 22 \
-+	      - $umask % 100 % 40 + $umask % 20 \
-+	      - $umask % 10 % 4 + $umask % 2
-+	    `;;
-+	  *) mkdir_umask=$umask,go-w;;
-+	esac
-+
-+	# With -d, create the new directory with the user-specified mode.
-+	# Otherwise, rely on $mkdir_umask.
-+	if test -n "$dir_arg"; then
-+	  mkdir_mode=-m$mode
-+	else
-+	  mkdir_mode=
-+	fi
++        # Create intermediate dirs using mode 755 as modified by the umask.
++        # This is like FreeBSD 'install' as of 1997-10-28.
++        umask=`umask`
++        case $stripcmd.$umask in
++          # Optimize common cases.
++          *[2367][2367]) mkdir_umask=$umask;;
++          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++          *[0-7])
++            mkdir_umask=`expr $umask + 22 \
++              - $umask % 100 % 40 + $umask % 20 \
++              - $umask % 10 % 4 + $umask % 2
++            `;;
++          *) mkdir_umask=$umask,go-w;;
++        esac
 +
-+	posix_mkdir=false
-+	case $umask in
-+	  *[123567][0-7][0-7])
-+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+	    ;;
-+	  *)
-+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++        # With -d, create the new directory with the user-specified mode.
++        # Otherwise, rely on $mkdir_umask.
++        if test -n "$dir_arg"; then
++          mkdir_mode=-m$mode
++        else
++          mkdir_mode=
++        fi
 +
-+	    if (umask $mkdir_umask &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+	    then
-+	      if test -z "$dir_arg" || {
-+		   # Check for POSIX incompatibilities with -m.
-+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+		   # other-writable bit of parent directory when it shouldn't.
-+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   case $ls_ld_tmpdir in
-+		     d????-?r-*) different_mode=700;;
-+		     d????-?--*) different_mode=755;;
-+		     *) false;;
-+		   esac &&
-+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+		   }
-+		 }
-+	      then posix_mkdir=:
-+	      fi
-+	      rmdir "$tmpdir/d" "$tmpdir"
-+	    else
-+	      # Remove any dirs left behind by ancient mkdir implementations.
-+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	    fi
-+	    trap '' 0;;
-+	esac;;
++        posix_mkdir=false
++        case $umask in
++          *[123567][0-7][0-7])
++            # POSIX mkdir -p sets u+wx bits regardless of umask, which
++            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++            ;;
++          *)
++            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
++            # here however when possible just to lower collision chance.
++            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++
++            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++            # Because "mkdir -p" follows existing symlinks and we likely work
++            # directly in world-writeable /tmp, make sure that the '$tmpdir'
++            # directory is successfully created first before we actually test
++            # 'mkdir -p' feature.
++            if (umask $mkdir_umask &&
++                $mkdirprog $mkdir_mode "$tmpdir" &&
++                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
++            then
++              if test -z "$dir_arg" || {
++                   # Check for POSIX incompatibilities with -m.
++                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++                   # other-writable bit of parent directory when it shouldn't.
++                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++                   test_tmpdir="$tmpdir/a"
++                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
++                   case $ls_ld_tmpdir in
++                     d????-?r-*) different_mode=700;;
++                     d????-?--*) different_mode=755;;
++                     *) false;;
++                   esac &&
++                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
++                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
++                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++                   }
++                 }
++              then posix_mkdir=:
++              fi
++              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
++            else
++              # Remove any dirs left behind by ancient mkdir implementations.
++              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
++            fi
++            trap '' 0;;
++        esac;;
 +    esac
 +
 +    if
 +      $posix_mkdir && (
-+	umask $mkdir_umask &&
-+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++        umask $mkdir_umask &&
++        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
 +      )
 +    then :
 +    else
@@ -25737,53 +26606,51 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +      # directory the slow way, step by step, checking for races as we go.
 +
 +      case $dstdir in
-+	/*) prefix='/';;
-+	[-=\(\)!]*) prefix='./';;
-+	*)  prefix='';;
++        /*) prefix='/';;
++        [-=\(\)!]*) prefix='./';;
++        *)  prefix='';;
 +      esac
 +
-+      eval "$initialize_posix_glob"
-+
 +      oIFS=$IFS
 +      IFS=/
-+      $posix_glob set -f
++      set -f
 +      set fnord $dstdir
 +      shift
-+      $posix_glob set +f
++      set +f
 +      IFS=$oIFS
 +
 +      prefixes=
 +
 +      for d
 +      do
-+	test X"$d" = X && continue
++        test X"$d" = X && continue
 +
-+	prefix=$prefix$d
-+	if test -d "$prefix"; then
-+	  prefixes=
-+	else
-+	  if $posix_mkdir; then
-+	    (umask=$mkdir_umask &&
-+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+	    # Don't fail if two instances are running concurrently.
-+	    test -d "$prefix" || exit 1
-+	  else
-+	    case $prefix in
-+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+	      *) qprefix=$prefix;;
-+	    esac
-+	    prefixes="$prefixes '$qprefix'"
-+	  fi
-+	fi
-+	prefix=$prefix/
++        prefix=$prefix$d
++        if test -d "$prefix"; then
++          prefixes=
++        else
++          if $posix_mkdir; then
++            (umask=$mkdir_umask &&
++             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++            # Don't fail if two instances are running concurrently.
++            test -d "$prefix" || exit 1
++          else
++            case $prefix in
++              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++              *) qprefix=$prefix;;
++            esac
++            prefixes="$prefixes '$qprefix'"
++          fi
++        fi
++        prefix=$prefix/
 +      done
 +
 +      if test -n "$prefixes"; then
-+	# Don't fail if two instances are running concurrently.
-+	(umask $mkdir_umask &&
-+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-+	  test -d "$dstdir" || exit 1
-+	obsolete_mkdir_used=true
++        # Don't fail if two instances are running concurrently.
++        (umask $mkdir_umask &&
++         eval "\$doit_exec \$mkdirprog $prefixes") ||
++          test -d "$dstdir" || exit 1
++        obsolete_mkdir_used=true
 +      fi
 +    fi
 +  fi
@@ -25796,8 +26663,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +  else
 +
 +    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
++    dsttmp=${dstdirslash}_inst.$$_
++    rmtmp=${dstdirslash}_rm.$$_
 +
 +    # Trap to clean up those temp files at exit.
 +    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -25818,15 +26685,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +
 +    # If -C, don't bother to copy if it wouldn't change the file.
 +    if $copy_on_change &&
-+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-+
-+       eval "$initialize_posix_glob" &&
-+       $posix_glob set -f &&
++       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
++       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
++       set -f &&
 +       set X $old && old=:$2:$4:$5:$6 &&
 +       set X $new && new=:$2:$4:$5:$6 &&
-+       $posix_glob set +f &&
-+
++       set +f &&
 +       test "$old" = "$new" &&
 +       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
 +    then
@@ -25839,24 +26703,24 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +      # to itself, or perhaps because mv is so ancient that it does not
 +      # support -f.
 +      {
-+	# Now remove or move aside any old file at destination location.
-+	# We try this two ways since rm can't unlink itself on some
-+	# systems and the destination file might be busy for other
-+	# reasons.  In this case, the final cleanup might fail but the new
-+	# file should still install successfully.
-+	{
-+	  test ! -f "$dst" ||
-+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+	  } ||
-+	  { echo "$0: cannot unlink or rename $dst" >&2
-+	    (exit 1); exit 1
-+	  }
-+	} &&
-+
-+	# Now rename the file to the real destination.
-+	$doit $mvcmd "$dsttmp" "$dst"
++        # Now remove or move aside any old file at destination location.
++        # We try this two ways since rm can't unlink itself on some
++        # systems and the destination file might be busy for other
++        # reasons.  In this case, the final cleanup might fail but the new
++        # file should still install successfully.
++        {
++          test ! -f "$dst" ||
++          $doit $rmcmd -f "$dst" 2>/dev/null ||
++          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++          } ||
++          { echo "$0: cannot unlink or rename $dst" >&2
++            (exit 1); exit 1
++          }
++        } &&
++
++        # Now rename the file to the real destination.
++        $doit $mvcmd "$dsttmp" "$dst"
 +      }
 +    fi || exit 1
 +
@@ -25865,22 +26729,25 @@ diff -ruN arpack-ng-3.9.0/build-aux/install-sh arpack-ng-3.9.0-patch/build-aux/i
 +done
 +
 +# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
++# time-stamp-time-zone: "UTC0"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/ltmain.sh
---- arpack-ng-3.9.0/build-aux/ltmain.sh	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/ltmain.sh	2023-02-12 10:13:26.752109110 +0000
-@@ -0,0 +1,9655 @@
+diff -ruN arpack-ng-3.9.1/build-aux/ltmain.sh arpack-ng-3.9.1-patch/build-aux/ltmain.sh
+--- arpack-ng-3.9.1/build-aux/ltmain.sh	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/ltmain.sh	2023-11-11 16:51:16.195914819 +0900
+@@ -0,0 +1,11251 @@
++#! /bin/sh
++## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
++##               by inline-source v2014-01-03.01
 +
-+# libtool (GNU libtool) 2.4.2
++# libtool (GNU libtool) 2.4.6
++# Provide generalized library-building support services.
 +# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 +
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 +# This is free software; see the source for copying conditions.  There is NO
 +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
@@ -25900,881 +26767,2185 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-+# or obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
-+# Usage: $progname [OPTION]... [MODE-ARG]...
-+#
-+# Provide generalized library-building support services.
-+#
-+#       --config             show all configuration variables
-+#       --debug              enable verbose shell tracing
-+#   -n, --dry-run            display commands without modifying any files
-+#       --features           display basic configuration information and exit
-+#       --mode=MODE          use operation mode MODE
-+#       --preserve-dup-deps  don't remove duplicate dependency libraries
-+#       --quiet, --silent    don't print informational messages
-+#       --no-quiet, --no-silent
-+#                            print informational messages (default)
-+#       --no-warn            don't display warning messages
-+#       --tag=TAG            use configuration variables from tag TAG
-+#   -v, --verbose            print more informational messages than default
-+#       --no-verbose         don't print the extra informational messages
-+#       --version            print version information
-+#   -h, --help, --help-all   print short, long, or detailed help message
-+#
-+# MODE must be one of the following:
-+#
-+#         clean              remove files from the build directory
-+#         compile            compile a source file into a libtool object
-+#         execute            automatically set library path, then run a program
-+#         finish             complete the installation of libtool libraries
-+#         install            install libraries or executables
-+#         link               create a library or an executable
-+#         uninstall          remove libraries from an installed directory
-+#
-+# MODE-ARGS vary depending on the MODE.  When passed as first option,
-+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-+#
-+# When reporting a bug, please describe a test case to reproduce it and
-+# include the following information:
-+#
-+#         host-triplet:	$host
-+#         shell:		$SHELL
-+#         compiler:		$LTCC
-+#         compiler flags:		$LTCFLAGS
-+#         linker:		$LD (gnu? $with_gnu_ld)
-+#         $progname:	(GNU libtool) 2.4.2
-+#         automake:	$automake_version
-+#         autoconf:	$autoconf_version
-+#
-+# Report bugs to <bug-libtool@gnu.org>.
-+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 +
 +PROGRAM=libtool
 +PACKAGE=libtool
-+VERSION=2.4.2
-+TIMESTAMP=""
-+package_revision=1.3337
++VERSION="2.4.6 Debian-2.4.6-14"
++package_revision=2.4.6
 +
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++
++## ------ ##
++## Usage. ##
++## ------ ##
++
++# Run './libtool --help' for help with using this script from the
++# command line.
++
++
++## ------------------------------- ##
++## User overridable command paths. ##
++## ------------------------------- ##
++
++# After configure completes, it has a better idea of some of the
++# shell tools we need than the defaults used by the functions shared
++# with bootstrap, so set those here where they can still be over-
++# ridden by the user, but otherwise take precedence.
++
++: ${AUTOCONF="autoconf"}
++: ${AUTOMAKE="automake"}
++
++
++## -------------------------- ##
++## Source external libraries. ##
++## -------------------------- ##
++
++# Much of our low-level functionality needs to be sourced from external
++# libraries, which are installed to $pkgauxdir.
++
++# Set a version string for this script.
++scriptversion=2015-01-20.17; # UTC
++
++# General shell script boiler plate, and helper functions.
++# Written by Gary V. Vaughan, 2004
++
++# Copyright (C) 2004-2015 Free Software Foundation, Inc.
++# This is free software; see the source for copying conditions.  There is NO
++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++
++# As a special exception to the GNU General Public License, if you distribute
++# this file as part of a program or library that is built using GNU Libtool,
++# you may include this file under the same distribution terms that you use
++# for the rest of that program.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++# Please report bugs or propose patches to gary@gnu.org.
++
++
++## ------ ##
++## Usage. ##
++## ------ ##
++
++# Evaluate this file near the top of your script to gain access to
++# the functions and variables defined here:
++#
++#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
++#
++# If you need to override any of the default environment variable
++# settings, do that before evaluating this file.
++
++
++## -------------------- ##
++## Shell normalisation. ##
++## -------------------- ##
++
++# Some shells need a little help to be as Bourne compatible as possible.
++# Before doing anything else, make sure all that help has been provided!
++
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 +  emulate sh
 +  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
 +
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+}
-+
-+# NLS nuisances: We save the old values to restore during execute mode.
-+lt_user_locale=
-+lt_safe_locale=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++# NLS nuisances: We save the old values in case they are required later.
++_G_user_locale=
++_G_safe_locale=
++for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 +do
-+  eval "if test \"\${$lt_var+set}\" = set; then
-+          save_$lt_var=\$$lt_var
-+          $lt_var=C
-+	  export $lt_var
-+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
++  eval "if test set = \"\${$_G_var+set}\"; then
++          save_$_G_var=\$$_G_var
++          $_G_var=C
++	  export $_G_var
++	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
++	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 +	fi"
 +done
-+LC_ALL=C
-+LANGUAGE=C
-+export LANGUAGE LC_ALL
 +
-+$lt_unset CDPATH
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
++# Make sure IFS has a sensible default
++sp=' '
++nl='
++'
++IFS="$sp	$nl"
 +
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
++# There are apparently some retarded systems that use ';' as a PATH separator!
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
++fi
++
++
++
++## ------------------------- ##
++## Locate command utilities. ##
++## ------------------------- ##
++
++
++# func_executable_p FILE
++# ----------------------
++# Check that FILE is an executable regular file.
++func_executable_p ()
++{
++    test -f "$1" && test -x "$1"
++}
++
++
++# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
++# --------------------------------------------
++# Search for either a program that responds to --version with output
++# containing "GNU", or else returned by CHECK_FUNC otherwise, by
++# trying all the directories in PATH with each of the elements of
++# PROGS_LIST.
++#
++# CHECK_FUNC should accept the path to a candidate program, and
++# set $func_check_prog_result if it truncates its output less than
++# $_G_path_prog_max characters.
++func_path_progs ()
++{
++    _G_progs_list=$1
++    _G_check_func=$2
++    _G_PATH=${3-"$PATH"}
++
++    _G_path_prog_max=0
++    _G_path_prog_found=false
++    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
++    for _G_dir in $_G_PATH; do
++      IFS=$_G_save_IFS
++      test -z "$_G_dir" && _G_dir=.
++      for _G_prog_name in $_G_progs_list; do
++        for _exeext in '' .EXE; do
++          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
++          func_executable_p "$_G_path_prog" || continue
++          case `"$_G_path_prog" --version 2>&1` in
++            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
++            *)     $_G_check_func $_G_path_prog
++		   func_path_progs_result=$func_check_prog_result
++		   ;;
++          esac
++          $_G_path_prog_found && break 3
++        done
++      done
++    done
++    IFS=$_G_save_IFS
++    test -z "$func_path_progs_result" && {
++      echo "no acceptable sed could be found in \$PATH" >&2
++      exit 1
++    }
++}
++
++
++# We want to be able to use the functions in this file before configure
++# has figured out where the best binaries are kept, which means we have
++# to search for them ourselves - except when the results are already set
++# where we skip the searches.
++
++# Unless the user overrides by setting SED, search the path for either GNU
++# sed, or the sed that truncates its output the least.
++test -z "$SED" && {
++  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
++  for _G_i in 1 2 3 4 5 6 7; do
++    _G_sed_script=$_G_sed_script$nl$_G_sed_script
++  done
++  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
++  _G_sed_script=
++
++  func_check_prog_sed ()
++  {
++    _G_path_prog=$1
++
++    _G_count=0
++    printf 0123456789 >conftest.in
++    while :
++    do
++      cat conftest.in conftest.in >conftest.tmp
++      mv conftest.tmp conftest.in
++      cp conftest.in conftest.nl
++      echo '' >> conftest.nl
++      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
++      diff conftest.out conftest.nl >/dev/null 2>&1 || break
++      _G_count=`expr $_G_count + 1`
++      if test "$_G_count" -gt "$_G_path_prog_max"; then
++        # Best one so far, save it but keep looking for a better one
++        func_check_prog_result=$_G_path_prog
++        _G_path_prog_max=$_G_count
++      fi
++      # 10*(2^10) chars as input seems more than enough
++      test 10 -lt "$_G_count" && break
++    done
++    rm -f conftest.in conftest.tmp conftest.nl conftest.out
++  }
++
++  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
++  rm -f conftest.sed
++  SED=$func_path_progs_result
++}
++
++
++# Unless the user overrides by setting GREP, search the path for either GNU
++# grep, or the grep that truncates its output the least.
++test -z "$GREP" && {
++  func_check_prog_grep ()
++  {
++    _G_path_prog=$1
++
++    _G_count=0
++    _G_path_prog_max=0
++    printf 0123456789 >conftest.in
++    while :
++    do
++      cat conftest.in conftest.in >conftest.tmp
++      mv conftest.tmp conftest.in
++      cp conftest.in conftest.nl
++      echo 'GREP' >> conftest.nl
++      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
++      diff conftest.out conftest.nl >/dev/null 2>&1 || break
++      _G_count=`expr $_G_count + 1`
++      if test "$_G_count" -gt "$_G_path_prog_max"; then
++        # Best one so far, save it but keep looking for a better one
++        func_check_prog_result=$_G_path_prog
++        _G_path_prog_max=$_G_count
++      fi
++      # 10*(2^10) chars as input seems more than enough
++      test 10 -lt "$_G_count" && break
++    done
++    rm -f conftest.in conftest.tmp conftest.nl conftest.out
++  }
++
++  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
++  GREP=$func_path_progs_result
++}
 +
 +
++## ------------------------------- ##
++## User overridable command paths. ##
++## ------------------------------- ##
++
++# All uppercase variable names are used for environment variables.  These
++# variables can be overridden by the user before calling a script that
++# uses them if a suitable command of that name is not already available
++# in the command search PATH.
 +
 +: ${CP="cp -f"}
-+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
++: ${ECHO="printf %s\n"}
++: ${EGREP="$GREP -E"}
++: ${FGREP="$GREP -F"}
++: ${LN_S="ln -s"}
 +: ${MAKE="make"}
 +: ${MKDIR="mkdir"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-+: ${Xsed="$SED -e 1s/^X//"}
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-+
-+exit_status=$EXIT_SUCCESS
-+
-+# Make sure IFS has a sensible default
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
 +
-+dirname="s,/[^/]*$,,"
-+basename="s,^.*/,,"
 +
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+} # func_dirname may be replaced by extended shell implementation
++## -------------------- ##
++## Useful sed snippets. ##
++## -------------------- ##
 +
++sed_dirname='s|/[^/]*$||'
++sed_basename='s|^.*/||'
 +
-+# func_basename file
-+func_basename ()
-+{
-+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+} # func_basename may be replaced by extended shell implementation
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
 +
++# Same as above, but do not quote variable references.
++sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
 +
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+    # Extract subdirectory from the argument.
-+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+} # func_dirname_and_basename may be replaced by extended shell implementation
++# Sed substitution that turns a string into a regex matching for the
++# string literally.
++sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
 +
++# Sed substitution that converts a w32 file name or path
++# that contains forward slashes, into one that contains
++# (escaped) backslashes.  A very naive implementation.
++sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++
++# Re-'\' parameter expansions in output of sed_double_quote_subst that
++# were '\'-ed in input to the same.  If an odd number of '\' preceded a
++# '$' in input to sed_double_quote_subst, that '$' was protected from
++# expansion.  Since each input '\' is now two '\'s, look for any number
++# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
++_G_bs='\\'
++_G_bs2='\\\\'
++_G_bs4='\\\\\\\\'
++_G_dollar='\$'
++sed_double_backslash="\
++  s/$_G_bs4/&\\
++/g
++  s/^$_G_bs2$_G_dollar/$_G_bs&/
++  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
++  s/\n//g"
 +
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+    case ${2} in
-+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    esac
-+} # func_stripname may be replaced by extended shell implementation
 +
++## ----------------- ##
++## Global variables. ##
++## ----------------- ##
 +
-+# These SED scripts presuppose an absolute path with a trailing slash.
-+pathcar='s,^/\([^/]*\).*$,\1,'
-+pathcdr='s,^/[^/]*,,'
-+removedotparts=':dotsl
-+		s@/\./@/@g
-+		t dotsl
-+		s,/\.$,/,'
-+collapseslashes='s@/\{1,\}@/@g'
-+finalslash='s,/*$,/,'
++# Except for the global variables explicitly listed below, the following
++# functions in the '^func_' namespace, and the '^require_' namespace
++# variables initialised in the 'Resource management' section, sourcing
++# this file will not pollute your global namespace with anything
++# else. There's no portable way to scope variables in Bourne shell
++# though, so actually running these functions will sometimes place
++# results into a variable named after the function, and often use
++# temporary variables in the '^_G_' namespace. If you are careful to
++# avoid using those namespaces casually in your sourcing script, things
++# should continue to work as you expect. And, of course, you can freely
++# overwrite any of the functions or variables defined here before
++# calling anything to customize them.
 +
-+# func_normal_abspath PATH
-+# Remove doubled-up and trailing slashes, "." path components,
-+# and cancel out any ".." path components in PATH after making
-+# it an absolute path.
-+#             value returned in "$func_normal_abspath_result"
-+func_normal_abspath ()
-+{
-+  # Start from root dir and reassemble the path.
-+  func_normal_abspath_result=
-+  func_normal_abspath_tpath=$1
-+  func_normal_abspath_altnamespace=
-+  case $func_normal_abspath_tpath in
-+    "")
-+      # Empty path, that just means $cwd.
-+      func_stripname '' '/' "`pwd`"
-+      func_normal_abspath_result=$func_stripname_result
-+      return
-+    ;;
-+    # The next three entries are used to spot a run of precisely
-+    # two leading slashes without using negated character classes;
-+    # we take advantage of case's first-match behaviour.
-+    ///*)
-+      # Unusual form of absolute path, do nothing.
-+    ;;
-+    //*)
-+      # Not necessarily an ordinary path; POSIX reserves leading '//'
-+      # and for example Cygwin uses it to access remote file shares
-+      # over CIFS/SMB, so we conserve a leading double slash if found.
-+      func_normal_abspath_altnamespace=/
-+    ;;
-+    /*)
-+      # Absolute path, do nothing.
-+    ;;
-+    *)
-+      # Relative path, prepend $cwd.
-+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-+    ;;
-+  esac
-+  # Cancel out all the simple stuff to save iterations.  We also want
-+  # the path to end with a slash for ease of parsing, so make sure
-+  # there is one (and only one) here.
-+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-+  while :; do
-+    # Processed it all yet?
-+    if test "$func_normal_abspath_tpath" = / ; then
-+      # If we ascended to the root using ".." the result may be empty now.
-+      if test -z "$func_normal_abspath_result" ; then
-+        func_normal_abspath_result=/
-+      fi
-+      break
-+    fi
-+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcar"`
-+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcdr"`
-+    # Figure out what to do with it
-+    case $func_normal_abspath_tcomponent in
-+      "")
-+        # Trailing empty path component, ignore it.
-+      ;;
-+      ..)
-+        # Parent dir; strip last assembled component from result.
-+        func_dirname "$func_normal_abspath_result"
-+        func_normal_abspath_result=$func_dirname_result
-+      ;;
-+      *)
-+        # Actual path component, append it.
-+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-+      ;;
-+    esac
-+  done
-+  # Restore leading double-slash if one was found on entry.
-+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-+}
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
++EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 +
-+# func_relative_path SRCDIR DSTDIR
-+# generates a relative path from SRCDIR to DSTDIR, with a trailing
-+# slash if non-empty, suitable for immediately appending a filename
-+# without needing to append a separator.
-+#             value returned in "$func_relative_path_result"
-+func_relative_path ()
-+{
-+  func_relative_path_result=
-+  func_normal_abspath "$1"
-+  func_relative_path_tlibdir=$func_normal_abspath_result
-+  func_normal_abspath "$2"
-+  func_relative_path_tbindir=$func_normal_abspath_result
-+
-+  # Ascend the tree starting from libdir
-+  while :; do
-+    # check if we have found a prefix of bindir
-+    case $func_relative_path_tbindir in
-+      $func_relative_path_tlibdir)
-+        # found an exact match
-+        func_relative_path_tcancelled=
-+        break
-+        ;;
-+      $func_relative_path_tlibdir*)
-+        # found a matching prefix
-+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-+        func_relative_path_tcancelled=$func_stripname_result
-+        if test -z "$func_relative_path_result"; then
-+          func_relative_path_result=.
-+        fi
-+        break
-+        ;;
-+      *)
-+        func_dirname $func_relative_path_tlibdir
-+        func_relative_path_tlibdir=${func_dirname_result}
-+        if test "x$func_relative_path_tlibdir" = x ; then
-+          # Have to descend all the way to the root!
-+          func_relative_path_result=../$func_relative_path_result
-+          func_relative_path_tcancelled=$func_relative_path_tbindir
-+          break
-+        fi
-+        func_relative_path_result=../$func_relative_path_result
-+        ;;
-+    esac
-+  done
++# Allow overriding, eg assuming that you follow the convention of
++# putting '$debug_cmd' at the start of all your functions, you can get
++# bash to show function call trace with:
++#
++#    debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
++debug_cmd=${debug_cmd-":"}
++exit_cmd=:
 +
-+  # Now calculate path; take care to avoid doubling-up slashes.
-+  func_stripname '' '/' "$func_relative_path_result"
-+  func_relative_path_result=$func_stripname_result
-+  func_stripname '/' '/' "$func_relative_path_tcancelled"
-+  if test "x$func_stripname_result" != x ; then
-+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-+  fi
++# By convention, finish your script with:
++#
++#    exit $exit_status
++#
++# so that you can set exit_status to non-zero if you want to indicate
++# something went wrong during execution without actually bailing out at
++# the point of failure.
++exit_status=$EXIT_SUCCESS
 +
-+  # Normalisation. If bindir is libdir, return empty string,
-+  # else relative path ending with a slash; either way, target
-+  # file name can be directly appended.
-+  if test ! -z "$func_relative_path_result"; then
-+    func_stripname './' '' "$func_relative_path_result/"
-+    func_relative_path_result=$func_stripname_result
-+  fi
-+}
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath=$0
 +
-+# The name of this program:
-+func_dirname_and_basename "$progpath"
-+progname=$func_basename_result
++# The name of this program.
++progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 +
-+# Make sure we have an absolute path for reexecution:
++# Make sure we have an absolute progpath for reexecution:
 +case $progpath in
 +  [\\/]*|[A-Za-z]:\\*) ;;
 +  *[\\/]*)
-+     progdir=$func_dirname_result
++     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
 +     progdir=`cd "$progdir" && pwd`
-+     progpath="$progdir/$progname"
++     progpath=$progdir/$progname
 +     ;;
 +  *)
-+     save_IFS="$IFS"
++     _G_IFS=$IFS
 +     IFS=${PATH_SEPARATOR-:}
 +     for progdir in $PATH; do
-+       IFS="$save_IFS"
++       IFS=$_G_IFS
 +       test -x "$progdir/$progname" && break
 +     done
-+     IFS="$save_IFS"
++     IFS=$_G_IFS
 +     test -n "$progdir" || progdir=`pwd`
-+     progpath="$progdir/$progname"
++     progpath=$progdir/$progname
 +     ;;
 +esac
 +
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
 +
-+# Sed substitution that turns a string into a regex matching for the
-+# string literally.
-+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
++## ----------------- ##
++## Standard options. ##
++## ----------------- ##
 +
-+# Sed substitution that converts a w32 file name or path
-+# which contains forward slashes, into one that contains
-+# (escaped) backslashes.  A very naive implementation.
-+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+
-+# Re-`\' parameter expansions in output of double_quote_subst that were
-+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-+# in input to double_quote_subst, that '$' was protected from expansion.
-+# Since each input `\' is now two `\'s, look for any number of runs of
-+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-+bs='\\'
-+bs2='\\\\'
-+bs4='\\\\\\\\'
-+dollar='\$'
-+sed_double_backslash="\
-+  s/$bs4/&\\
-+/g
-+  s/^$bs2$dollar/$bs&/
-+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-+  s/\n//g"
++# The following options affect the operation of the functions defined
++# below, and should be set appropriately depending on run-time para-
++# meters passed on the command line.
 +
-+# Standard options:
 +opt_dry_run=false
-+opt_help=false
 +opt_quiet=false
 +opt_verbose=false
-+opt_warning=:
 +
-+# func_echo arg...
-+# Echo program name prefixed message, along with the current mode
-+# name if it has been set yet.
-+func_echo ()
-+{
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-+}
++# Categories 'all' and 'none' are always available.  Append any others
++# you will pass as the first argument to func_warning from your own
++# code.
++warning_categories=
 +
-+# func_verbose arg...
-+# Echo program name prefixed message in verbose mode only.
-+func_verbose ()
-+{
-+    $opt_verbose && func_echo ${1+"$@"}
++# By default, display warnings according to 'opt_warning_types'.  Set
++# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
++# treat the next displayed warning as a fatal error.
++warning_func=func_warn_and_continue
 +
-+    # A bug in bash halts the script if the last line of a function
-+    # fails when set -e is in force, so we need another command to
-+    # work around that:
-+    :
-+}
++# Set to 'all' to display all warnings, 'none' to suppress all
++# warnings, or a space delimited list of some subset of
++# 'warning_categories' to display only the listed warnings.
++opt_warning_types=all
 +
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "$*"
-+}
 +
-+# func_error arg...
-+# Echo program name prefixed message to standard error.
-+func_error ()
-+{
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-+}
++## -------------------- ##
++## Resource management. ##
++## -------------------- ##
 +
-+# func_warning arg...
-+# Echo program name prefixed warning message to standard error.
-+func_warning ()
-+{
-+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++# This section contains definitions for functions that each ensure a
++# particular resource (a file, or a non-empty configuration variable for
++# example) is available, and if appropriate to extract default values
++# from pertinent package files. Call them using their associated
++# 'require_*' variable to ensure that they are executed, at most, once.
++#
++# It's entirely deliberate that calling these functions can set
++# variables that don't obey the namespace limitations obeyed by the rest
++# of this file, in order that that they be as useful as possible to
++# callers.
 +
-+    # bash bug again:
-+    :
-+}
 +
-+# func_fatal_error arg...
-+# Echo program name prefixed message to standard error, and exit.
-+func_fatal_error ()
++# require_term_colors
++# -------------------
++# Allow display of bold text on terminals that support it.
++require_term_colors=func_require_term_colors
++func_require_term_colors ()
 +{
-+    func_error ${1+"$@"}
-+    exit $EXIT_FAILURE
++    $debug_cmd
++
++    test -t 1 && {
++      # COLORTERM and USE_ANSI_COLORS environment variables take
++      # precedence, because most terminfo databases neglect to describe
++      # whether color sequences are supported.
++      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
++
++      if test 1 = "$USE_ANSI_COLORS"; then
++        # Standard ANSI escape sequences
++        tc_reset=''
++        tc_bold='';   tc_standout=''
++        tc_red='';   tc_green=''
++        tc_blue='';  tc_cyan=''
++      else
++        # Otherwise trust the terminfo database after all.
++        test -n "`tput sgr0 2>/dev/null`" && {
++          tc_reset=`tput sgr0`
++          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
++          tc_standout=$tc_bold
++          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
++          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
++          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
++          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
++          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
++        }
++      fi
++    }
++
++    require_term_colors=:
 +}
 +
-+# func_fatal_help arg...
-+# Echo program name prefixed message to standard error, followed by
-+# a help hint, and exit.
-+func_fatal_help ()
++
++## ----------------- ##
++## Function library. ##
++## ----------------- ##
++
++# This section contains a variety of useful functions to call in your
++# scripts. Take note of the portable wrappers for features provided by
++# some modern shells, which will fall back to slower equivalents on
++# less featureful shells.
++
++
++# func_append VAR VALUE
++# ---------------------
++# Append VALUE onto the existing contents of VAR.
++
++  # We should try to minimise forks, especially on Windows where they are
++  # unreasonably slow, so skip the feature probes when bash or zsh are
++  # being used:
++  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
++    : ${_G_HAVE_ARITH_OP="yes"}
++    : ${_G_HAVE_XSI_OPS="yes"}
++    # The += operator was introduced in bash 3.1
++    case $BASH_VERSION in
++      [12].* | 3.0 | 3.0*) ;;
++      *)
++        : ${_G_HAVE_PLUSEQ_OP="yes"}
++        ;;
++    esac
++  fi
++
++  # _G_HAVE_PLUSEQ_OP
++  # Can be empty, in which case the shell is probed, "yes" if += is
++  # useable or anything else if it does not work.
++  test -z "$_G_HAVE_PLUSEQ_OP" \
++    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
++    && _G_HAVE_PLUSEQ_OP=yes
++
++if test yes = "$_G_HAVE_PLUSEQ_OP"
++then
++  # This is an XSI compatible shell, allowing a faster implementation...
++  eval 'func_append ()
++  {
++    $debug_cmd
++
++    eval "$1+=\$2"
++  }'
++else
++  # ...otherwise fall back to using expr, which is often a shell builtin.
++  func_append ()
++  {
++    $debug_cmd
++
++    eval "$1=\$$1\$2"
++  }
++fi
++
++
++# func_append_quoted VAR VALUE
++# ----------------------------
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++if test yes = "$_G_HAVE_PLUSEQ_OP"; then
++  eval 'func_append_quoted ()
++  {
++    $debug_cmd
++
++    func_quote_for_eval "$2"
++    eval "$1+=\\ \$func_quote_for_eval_result"
++  }'
++else
++  func_append_quoted ()
++  {
++    $debug_cmd
++
++    func_quote_for_eval "$2"
++    eval "$1=\$$1\\ \$func_quote_for_eval_result"
++  }
++fi
++
++
++# func_append_uniq VAR VALUE
++# --------------------------
++# Append unique VALUE onto the existing contents of VAR, assuming
++# entries are delimited by the first character of VALUE.  For example:
++#
++#   func_append_uniq options " --another-option option-argument"
++#
++# will only append to $options if " --another-option option-argument "
++# is not already present somewhere in $options already (note spaces at
++# each end implied by leading space in second argument).
++func_append_uniq ()
 +{
-+    func_error ${1+"$@"}
-+    func_fatal_error "$help"
++    $debug_cmd
++
++    eval _G_current_value='`$ECHO $'$1'`'
++    _G_delim=`expr "$2" : '\(.\)'`
++
++    case $_G_delim$_G_current_value$_G_delim in
++      *"$2$_G_delim"*) ;;
++      *) func_append "$@" ;;
++    esac
 +}
-+help="Try \`$progname --help' for more information."  ## default
 +
 +
-+# func_grep expression filename
++# func_arith TERM...
++# ------------------
++# Set func_arith_result to the result of evaluating TERMs.
++  test -z "$_G_HAVE_ARITH_OP" \
++    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
++    && _G_HAVE_ARITH_OP=yes
++
++if test yes = "$_G_HAVE_ARITH_OP"; then
++  eval 'func_arith ()
++  {
++    $debug_cmd
++
++    func_arith_result=$(( $* ))
++  }'
++else
++  func_arith ()
++  {
++    $debug_cmd
++
++    func_arith_result=`expr "$@"`
++  }
++fi
++
++
++# func_basename FILE
++# ------------------
++# Set func_basename_result to FILE with everything up to and including
++# the last / stripped.
++if test yes = "$_G_HAVE_XSI_OPS"; then
++  # If this shell supports suffix pattern removal, then use it to avoid
++  # forking. Hide the definitions single quotes in case the shell chokes
++  # on unsupported syntax...
++  _b='func_basename_result=${1##*/}'
++  _d='case $1 in
++        */*) func_dirname_result=${1%/*}$2 ;;
++        *  ) func_dirname_result=$3        ;;
++      esac'
++
++else
++  # ...otherwise fall back to using sed.
++  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
++  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
++      if test "X$func_dirname_result" = "X$1"; then
++        func_dirname_result=$3
++      else
++        func_append func_dirname_result "$2"
++      fi'
++fi
++
++eval 'func_basename ()
++{
++    $debug_cmd
++
++    '"$_b"'
++}'
++
++
++# func_dirname FILE APPEND NONDIR_REPLACEMENT
++# -------------------------------------------
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++eval 'func_dirname ()
++{
++    $debug_cmd
++
++    '"$_d"'
++}'
++
++
++# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
++# --------------------------------------------------------
++# Perform func_basename and func_dirname in a single function
++# call:
++#   dirname:  Compute the dirname of FILE.  If nonempty,
++#             add APPEND to the result, otherwise set result
++#             to NONDIR_REPLACEMENT.
++#             value returned in "$func_dirname_result"
++#   basename: Compute filename of FILE.
++#             value retuned in "$func_basename_result"
++# For efficiency, we do not delegate to the functions above but instead
++# duplicate the functionality here.
++eval 'func_dirname_and_basename ()
++{
++    $debug_cmd
++
++    '"$_b"'
++    '"$_d"'
++}'
++
++
++# func_echo ARG...
++# ----------------
++# Echo program name prefixed message.
++func_echo ()
++{
++    $debug_cmd
++
++    _G_message=$*
++
++    func_echo_IFS=$IFS
++    IFS=$nl
++    for _G_line in $_G_message; do
++      IFS=$func_echo_IFS
++      $ECHO "$progname: $_G_line"
++    done
++    IFS=$func_echo_IFS
++}
++
++
++# func_echo_all ARG...
++# --------------------
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO "$*"
++}
++
++
++# func_echo_infix_1 INFIX ARG...
++# ------------------------------
++# Echo program name, followed by INFIX on the first line, with any
++# additional lines not showing INFIX.
++func_echo_infix_1 ()
++{
++    $debug_cmd
++
++    $require_term_colors
++
++    _G_infix=$1; shift
++    _G_indent=$_G_infix
++    _G_prefix="$progname: $_G_infix: "
++    _G_message=$*
++
++    # Strip color escape sequences before counting printable length
++    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
++    do
++      test -n "$_G_tc" && {
++        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
++        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
++      }
++    done
++    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
++
++    func_echo_infix_1_IFS=$IFS
++    IFS=$nl
++    for _G_line in $_G_message; do
++      IFS=$func_echo_infix_1_IFS
++      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
++      _G_prefix=$_G_indent
++    done
++    IFS=$func_echo_infix_1_IFS
++}
++
++
++# func_error ARG...
++# -----------------
++# Echo program name prefixed message to standard error.
++func_error ()
++{
++    $debug_cmd
++
++    $require_term_colors
++
++    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
++}
++
++
++# func_fatal_error ARG...
++# -----------------------
++# Echo program name prefixed message to standard error, and exit.
++func_fatal_error ()
++{
++    $debug_cmd
++
++    func_error "$*"
++    exit $EXIT_FAILURE
++}
++
++
++# func_grep EXPRESSION FILENAME
++# -----------------------------
 +# Check whether EXPRESSION matches any line of FILENAME, without output.
 +func_grep ()
 +{
++    $debug_cmd
++
 +    $GREP "$1" "$2" >/dev/null 2>&1
 +}
 +
 +
-+# func_mkdir_p directory-path
++# func_len STRING
++# ---------------
++# Set func_len_result to the length of STRING. STRING may not
++# start with a hyphen.
++  test -z "$_G_HAVE_XSI_OPS" \
++    && (eval 'x=a/b/c;
++      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
++    && _G_HAVE_XSI_OPS=yes
++
++if test yes = "$_G_HAVE_XSI_OPS"; then
++  eval 'func_len ()
++  {
++    $debug_cmd
++
++    func_len_result=${#1}
++  }'
++else
++  func_len ()
++  {
++    $debug_cmd
++
++    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
++  }
++fi
++
++
++# func_mkdir_p DIRECTORY-PATH
++# ---------------------------
 +# Make sure the entire path to DIRECTORY-PATH is available.
 +func_mkdir_p ()
 +{
-+    my_directory_path="$1"
-+    my_dir_list=
++    $debug_cmd
++
++    _G_directory_path=$1
++    _G_dir_list=
 +
-+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
++    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
 +
-+      # Protect directory names starting with `-'
-+      case $my_directory_path in
-+        -*) my_directory_path="./$my_directory_path" ;;
++      # Protect directory names starting with '-'
++      case $_G_directory_path in
++        -*) _G_directory_path=./$_G_directory_path ;;
 +      esac
 +
 +      # While some portion of DIR does not yet exist...
-+      while test ! -d "$my_directory_path"; do
++      while test ! -d "$_G_directory_path"; do
 +        # ...make a list in topmost first order.  Use a colon delimited
 +	# list incase some portion of path contains whitespace.
-+        my_dir_list="$my_directory_path:$my_dir_list"
++        _G_dir_list=$_G_directory_path:$_G_dir_list
 +
 +        # If the last portion added has no slash in it, the list is done
-+        case $my_directory_path in */*) ;; *) break ;; esac
++        case $_G_directory_path in */*) ;; *) break ;; esac
 +
 +        # ...otherwise throw away the child directory and loop
-+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
++        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
 +      done
-+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
++      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 +
-+      save_mkdir_p_IFS="$IFS"; IFS=':'
-+      for my_dir in $my_dir_list; do
-+	IFS="$save_mkdir_p_IFS"
-+        # mkdir can fail with a `File exist' error if two processes
++      func_mkdir_p_IFS=$IFS; IFS=:
++      for _G_dir in $_G_dir_list; do
++	IFS=$func_mkdir_p_IFS
++        # mkdir can fail with a 'File exist' error if two processes
 +        # try to create one of the directories concurrently.  Don't
 +        # stop in that case!
-+        $MKDIR "$my_dir" 2>/dev/null || :
++        $MKDIR "$_G_dir" 2>/dev/null || :
 +      done
-+      IFS="$save_mkdir_p_IFS"
++      IFS=$func_mkdir_p_IFS
 +
 +      # Bail out if we (or some other process) failed to create a directory.
-+      test -d "$my_directory_path" || \
-+        func_fatal_error "Failed to create \`$1'"
++      test -d "$_G_directory_path" || \
++        func_fatal_error "Failed to create '$1'"
 +    fi
 +}
 +
 +
-+# func_mktempdir [string]
++# func_mktempdir [BASENAME]
++# -------------------------
 +# Make a temporary directory that won't clash with other running
 +# libtool processes, and avoids race conditions if possible.  If
-+# given, STRING is the basename for that directory.
++# given, BASENAME is the basename for that directory.
 +func_mktempdir ()
 +{
-+    my_template="${TMPDIR-/tmp}/${1-$progname}"
++    $debug_cmd
 +
-+    if test "$opt_dry_run" = ":"; then
++    _G_template=${TMPDIR-/tmp}/${1-$progname}
++
++    if test : = "$opt_dry_run"; then
 +      # Return a directory name, but don't create it in dry-run mode
-+      my_tmpdir="${my_template}-$$"
++      _G_tmpdir=$_G_template-$$
 +    else
 +
 +      # If mktemp works, use that first and foremost
-+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 +
-+      if test ! -d "$my_tmpdir"; then
++      if test ! -d "$_G_tmpdir"; then
 +        # Failing that, at least try and use $RANDOM to avoid a race
-+        my_tmpdir="${my_template}-${RANDOM-0}$$"
++        _G_tmpdir=$_G_template-${RANDOM-0}$$
 +
-+        save_mktempdir_umask=`umask`
++        func_mktempdir_umask=`umask`
 +        umask 0077
-+        $MKDIR "$my_tmpdir"
-+        umask $save_mktempdir_umask
++        $MKDIR "$_G_tmpdir"
++        umask $func_mktempdir_umask
 +      fi
 +
 +      # If we're not in dry-run mode, bomb out on failure
-+      test -d "$my_tmpdir" || \
-+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
++      test -d "$_G_tmpdir" || \
++        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
 +    fi
 +
-+    $ECHO "$my_tmpdir"
++    $ECHO "$_G_tmpdir"
 +}
 +
 +
-+# func_quote_for_eval arg
-+# Aesthetically quote ARG to be evaled later.
-+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-+# is double-quoted, suitable for a subsequent eval, whereas
-+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-+# which are still active within double quotes backslashified.
-+func_quote_for_eval ()
++# func_normal_abspath PATH
++# ------------------------
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++func_normal_abspath ()
 +{
-+    case $1 in
-+      *[\\\`\"\$]*)
-+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-+      *)
-+        func_quote_for_eval_unquoted_result="$1" ;;
-+    esac
++    $debug_cmd
 +
-+    case $func_quote_for_eval_unquoted_result in
-+      # Double-quote args containing shell metacharacters to delay
-+      # word splitting, command substitution and and variable
-+      # expansion for a subsequent eval.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
++    # These SED scripts presuppose an absolute path with a trailing slash.
++    _G_pathcar='s|^/\([^/]*\).*$|\1|'
++    _G_pathcdr='s|^/[^/]*||'
++    _G_removedotparts=':dotsl
++		s|/\./|/|g
++		t dotsl
++		s|/\.$|/|'
++    _G_collapseslashes='s|/\{1,\}|/|g'
++    _G_finalslash='s|/*$|/|'
++
++    # Start from root dir and reassemble the path.
++    func_normal_abspath_result=
++    func_normal_abspath_tpath=$1
++    func_normal_abspath_altnamespace=
++    case $func_normal_abspath_tpath in
++      "")
++        # Empty path, that just means $cwd.
++        func_stripname '' '/' "`pwd`"
++        func_normal_abspath_result=$func_stripname_result
++        return
++        ;;
++      # The next three entries are used to spot a run of precisely
++      # two leading slashes without using negated character classes;
++      # we take advantage of case's first-match behaviour.
++      ///*)
++        # Unusual form of absolute path, do nothing.
++        ;;
++      //*)
++        # Not necessarily an ordinary path; POSIX reserves leading '//'
++        # and for example Cygwin uses it to access remote file shares
++        # over CIFS/SMB, so we conserve a leading double slash if found.
++        func_normal_abspath_altnamespace=/
++        ;;
++      /*)
++        # Absolute path, do nothing.
 +        ;;
 +      *)
-+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
++        # Relative path, prepend $cwd.
++        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++        ;;
 +    esac
++
++    # Cancel out all the simple stuff to save iterations.  We also want
++    # the path to end with a slash for ease of parsing, so make sure
++    # there is one (and only one) here.
++    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
++    while :; do
++      # Processed it all yet?
++      if test / = "$func_normal_abspath_tpath"; then
++        # If we ascended to the root using ".." the result may be empty now.
++        if test -z "$func_normal_abspath_result"; then
++          func_normal_abspath_result=/
++        fi
++        break
++      fi
++      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++          -e "$_G_pathcar"`
++      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++          -e "$_G_pathcdr"`
++      # Figure out what to do with it
++      case $func_normal_abspath_tcomponent in
++        "")
++          # Trailing empty path component, ignore it.
++          ;;
++        ..)
++          # Parent dir; strip last assembled component from result.
++          func_dirname "$func_normal_abspath_result"
++          func_normal_abspath_result=$func_dirname_result
++          ;;
++        *)
++          # Actual path component, append it.
++          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
++          ;;
++      esac
++    done
++    # Restore leading double-slash if one was found on entry.
++    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
++}
++
++
++# func_notquiet ARG...
++# --------------------
++# Echo program name prefixed message only when not in quiet mode.
++func_notquiet ()
++{
++    $debug_cmd
++
++    $opt_quiet || func_echo ${1+"$@"}
++
++    # A bug in bash halts the script if the last line of a function
++    # fails when set -e is in force, so we need another command to
++    # work around that:
++    :
++}
++
++
++# func_relative_path SRCDIR DSTDIR
++# --------------------------------
++# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
++func_relative_path ()
++{
++    $debug_cmd
++
++    func_relative_path_result=
++    func_normal_abspath "$1"
++    func_relative_path_tlibdir=$func_normal_abspath_result
++    func_normal_abspath "$2"
++    func_relative_path_tbindir=$func_normal_abspath_result
++
++    # Ascend the tree starting from libdir
++    while :; do
++      # check if we have found a prefix of bindir
++      case $func_relative_path_tbindir in
++        $func_relative_path_tlibdir)
++          # found an exact match
++          func_relative_path_tcancelled=
++          break
++          ;;
++        $func_relative_path_tlibdir*)
++          # found a matching prefix
++          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++          func_relative_path_tcancelled=$func_stripname_result
++          if test -z "$func_relative_path_result"; then
++            func_relative_path_result=.
++          fi
++          break
++          ;;
++        *)
++          func_dirname $func_relative_path_tlibdir
++          func_relative_path_tlibdir=$func_dirname_result
++          if test -z "$func_relative_path_tlibdir"; then
++            # Have to descend all the way to the root!
++            func_relative_path_result=../$func_relative_path_result
++            func_relative_path_tcancelled=$func_relative_path_tbindir
++            break
++          fi
++          func_relative_path_result=../$func_relative_path_result
++          ;;
++      esac
++    done
++
++    # Now calculate path; take care to avoid doubling-up slashes.
++    func_stripname '' '/' "$func_relative_path_result"
++    func_relative_path_result=$func_stripname_result
++    func_stripname '/' '/' "$func_relative_path_tcancelled"
++    if test -n "$func_stripname_result"; then
++      func_append func_relative_path_result "/$func_stripname_result"
++    fi
++
++    # Normalisation. If bindir is libdir, return '.' else relative path.
++    if test -n "$func_relative_path_result"; then
++      func_stripname './' '' "$func_relative_path_result"
++      func_relative_path_result=$func_stripname_result
++    fi
++
++    test -n "$func_relative_path_result" || func_relative_path_result=.
++
++    :
 +}
 +
 +
-+# func_quote_for_expand arg
++# func_quote_for_eval ARG...
++# --------------------------
++# Aesthetically quote ARGs to be evaled later.
++# This function returns two values:
++#   i) func_quote_for_eval_result
++#      double-quoted, suitable for a subsequent eval
++#  ii) func_quote_for_eval_unquoted_result
++#      has all characters that are still active within double
++#      quotes backslashified.
++func_quote_for_eval ()
++{
++    $debug_cmd
++
++    func_quote_for_eval_unquoted_result=
++    func_quote_for_eval_result=
++    while test 0 -lt $#; do
++      case $1 in
++        *[\\\`\"\$]*)
++	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
++        *)
++          _G_unquoted_arg=$1 ;;
++      esac
++      if test -n "$func_quote_for_eval_unquoted_result"; then
++	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
++      else
++        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
++      fi
++
++      case $_G_unquoted_arg in
++        # Double-quote args containing shell metacharacters to delay
++        # word splitting, command substitution and variable expansion
++        # for a subsequent eval.
++        # Many Bourne shells cannot handle close brackets correctly
++        # in scan sets, so we specify it separately.
++        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++          _G_quoted_arg=\"$_G_unquoted_arg\"
++          ;;
++        *)
++          _G_quoted_arg=$_G_unquoted_arg
++	  ;;
++      esac
++
++      if test -n "$func_quote_for_eval_result"; then
++	func_append func_quote_for_eval_result " $_G_quoted_arg"
++      else
++        func_append func_quote_for_eval_result "$_G_quoted_arg"
++      fi
++      shift
++    done
++}
++
++
++# func_quote_for_expand ARG
++# -------------------------
 +# Aesthetically quote ARG to be evaled later; same as above,
 +# but do not quote variable references.
 +func_quote_for_expand ()
 +{
++    $debug_cmd
++
 +    case $1 in
 +      *[\\\`\"]*)
-+	my_arg=`$ECHO "$1" | $SED \
-+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
++	_G_arg=`$ECHO "$1" | $SED \
++	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
 +      *)
-+        my_arg="$1" ;;
++        _G_arg=$1 ;;
 +    esac
 +
-+    case $my_arg in
++    case $_G_arg in
 +      # Double-quote args containing shell metacharacters to delay
 +      # word splitting and command substitution for a subsequent eval.
 +      # Many Bourne shells cannot handle close brackets correctly
 +      # in scan sets, so we specify it separately.
 +      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+        my_arg="\"$my_arg\""
++        _G_arg=\"$_G_arg\"
 +        ;;
 +    esac
 +
-+    func_quote_for_expand_result="$my_arg"
++    func_quote_for_expand_result=$_G_arg
 +}
 +
 +
-+# func_show_eval cmd [fail_exp]
-+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
++# func_stripname PREFIX SUFFIX NAME
++# ---------------------------------
++# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++if test yes = "$_G_HAVE_XSI_OPS"; then
++  eval 'func_stripname ()
++  {
++    $debug_cmd
++
++    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++    # positional parameters, so assign one to ordinary variable first.
++    func_stripname_result=$3
++    func_stripname_result=${func_stripname_result#"$1"}
++    func_stripname_result=${func_stripname_result%"$2"}
++  }'
++else
++  func_stripname ()
++  {
++    $debug_cmd
++
++    case $2 in
++      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
++      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
++    esac
++  }
++fi
++
++
++# func_show_eval CMD [FAIL_EXP]
++# -----------------------------
++# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 +# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 +# is given, then evaluate it.
 +func_show_eval ()
 +{
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
++    $debug_cmd
 +
-+    ${opt_silent-false} || {
-+      func_quote_for_expand "$my_cmd"
-+      eval "func_echo $func_quote_for_expand_result"
-+    }
++    _G_cmd=$1
++    _G_fail_exp=${2-':'}
++
++    func_quote_for_expand "$_G_cmd"
++    eval "func_notquiet $func_quote_for_expand_result"
 +
-+    if ${opt_dry_run-false}; then :; else
-+      eval "$my_cmd"
-+      my_status=$?
-+      if test "$my_status" -eq 0; then :; else
-+	eval "(exit $my_status); $my_fail_exp"
++    $opt_dry_run || {
++      eval "$_G_cmd"
++      _G_status=$?
++      if test 0 -ne "$_G_status"; then
++	eval "(exit $_G_status); $_G_fail_exp"
 +      fi
-+    fi
++    }
 +}
 +
 +
-+# func_show_eval_locale cmd [fail_exp]
-+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
++# func_show_eval_locale CMD [FAIL_EXP]
++# ------------------------------------
++# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 +# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 +# is given, then evaluate it.  Use the saved locale for evaluation.
 +func_show_eval_locale ()
 +{
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
++    $debug_cmd
 +
-+    ${opt_silent-false} || {
-+      func_quote_for_expand "$my_cmd"
++    _G_cmd=$1
++    _G_fail_exp=${2-':'}
++
++    $opt_quiet || {
++      func_quote_for_expand "$_G_cmd"
 +      eval "func_echo $func_quote_for_expand_result"
 +    }
 +
-+    if ${opt_dry_run-false}; then :; else
-+      eval "$lt_user_locale
-+	    $my_cmd"
-+      my_status=$?
-+      eval "$lt_safe_locale"
-+      if test "$my_status" -eq 0; then :; else
-+	eval "(exit $my_status); $my_fail_exp"
++    $opt_dry_run || {
++      eval "$_G_user_locale
++	    $_G_cmd"
++      _G_status=$?
++      eval "$_G_safe_locale"
++      if test 0 -ne "$_G_status"; then
++	eval "(exit $_G_status); $_G_fail_exp"
 +      fi
-+    fi
++    }
 +}
 +
++
 +# func_tr_sh
++# ----------
 +# Turn $1 into a string suitable for a shell variable name.
 +# Result is stored in $func_tr_sh_result.  All characters
 +# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
 +# if $1 begins with a digit, a '_' is prepended as well.
 +func_tr_sh ()
 +{
-+  case $1 in
-+  [0-9]* | *[!a-zA-Z0-9_]*)
-+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-+    ;;
-+  * )
-+    func_tr_sh_result=$1
-+    ;;
-+  esac
++    $debug_cmd
++
++    case $1 in
++    [0-9]* | *[!a-zA-Z0-9_]*)
++      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
++      ;;
++    * )
++      func_tr_sh_result=$1
++      ;;
++    esac
 +}
 +
 +
-+# func_version
-+# Echo version message to standard output and exit.
-+func_version ()
++# func_verbose ARG...
++# -------------------
++# Echo program name prefixed message in verbose mode only.
++func_verbose ()
 +{
-+    $opt_debug
-+
-+    $SED -n '/(C)/!b go
-+	:more
-+	/\./!{
-+	  N
-+	  s/\n# / /
-+	  b more
-+	}
-+	:go
-+	/^# '$PROGRAM' (GNU /,/# warranty; / {
-+        s/^# //
-+	s/^# *$//
-+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-+        p
-+     }' < "$progpath"
-+     exit $?
++    $debug_cmd
++
++    $opt_verbose && func_echo "$*"
++
++    :
 +}
 +
-+# func_usage
-+# Echo short help message to standard output and exit.
-+func_usage ()
++
++# func_warn_and_continue ARG...
++# -----------------------------
++# Echo program name prefixed warning message to standard error.
++func_warn_and_continue ()
 +{
-+    $opt_debug
++    $debug_cmd
 +
-+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-+        s/^# //
-+	s/^# *$//
-+	s/\$progname/'$progname'/
-+	p
-+    }' < "$progpath"
-+    echo
-+    $ECHO "run \`$progname --help | more' for full usage"
-+    exit $?
++    $require_term_colors
++
++    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
 +}
 +
-+# func_help [NOEXIT]
-+# Echo long help message to standard output and exit,
-+# unless 'noexit' is passed as argument.
-+func_help ()
++
++# func_warning CATEGORY ARG...
++# ----------------------------
++# Echo program name prefixed warning message to standard error. Warning
++# messages can be filtered according to CATEGORY, where this function
++# elides messages where CATEGORY is not listed in the global variable
++# 'opt_warning_types'.
++func_warning ()
 +{
-+    $opt_debug
-+
-+    $SED -n '/^# Usage:/,/# Report bugs to/ {
-+	:print
-+        s/^# //
-+	s/^# *$//
-+	s*\$progname*'$progname'*
-+	s*\$host*'"$host"'*
-+	s*\$SHELL*'"$SHELL"'*
-+	s*\$LTCC*'"$LTCC"'*
-+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-+	s*\$LD*'"$LD"'*
-+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-+	p
-+	d
-+     }
-+     /^# .* home page:/b print
-+     /^# General help using/b print
-+     ' < "$progpath"
-+    ret=$?
-+    if test -z "$1"; then
-+      exit $ret
++    $debug_cmd
++
++    # CATEGORY must be in the warning_categories list!
++    case " $warning_categories " in
++      *" $1 "*) ;;
++      *) func_internal_error "invalid warning category '$1'" ;;
++    esac
++
++    _G_category=$1
++    shift
++
++    case " $opt_warning_types " in
++      *" $_G_category "*) $warning_func ${1+"$@"} ;;
++    esac
++}
++
++
++# func_sort_ver VER1 VER2
++# -----------------------
++# 'sort -V' is not generally available.
++# Note this deviates from the version comparison in automake
++# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
++# but this should suffice as we won't be specifying old
++# version formats or redundant trailing .0 in bootstrap.conf.
++# If we did want full compatibility then we should probably
++# use m4_version_compare from autoconf.
++func_sort_ver ()
++{
++    $debug_cmd
++
++    printf '%s\n%s\n' "$1" "$2" \
++      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
++}
++
++# func_lt_ver PREV CURR
++# ---------------------
++# Return true if PREV and CURR are in the correct order according to
++# func_sort_ver, otherwise false.  Use it like this:
++#
++#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
++func_lt_ver ()
++{
++    $debug_cmd
++
++    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
++}
++
++
++# Local variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'before-save-hook 'time-stamp)
++# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
++# time-stamp-time-zone: "UTC"
++# End:
++#! /bin/sh
++
++# Set a version string for this script.
++scriptversion=2015-10-07.11; # UTC
++
++# A portable, pluggable option parser for Bourne shell.
++# Written by Gary V. Vaughan, 2010
++
++# Copyright (C) 2010-2015 Free Software Foundation, Inc.
++# This is free software; see the source for copying conditions.  There is NO
++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Please report bugs or propose patches to gary@gnu.org.
++
++
++## ------ ##
++## Usage. ##
++## ------ ##
++
++# This file is a library for parsing options in your shell scripts along
++# with assorted other useful supporting features that you can make use
++# of too.
++#
++# For the simplest scripts you might need only:
++#
++#   #!/bin/sh
++#   . relative/path/to/funclib.sh
++#   . relative/path/to/options-parser
++#   scriptversion=1.0
++#   func_options ${1+"$@"}
++#   eval set dummy "$func_options_result"; shift
++#   ...rest of your script...
++#
++# In order for the '--version' option to work, you will need to have a
++# suitably formatted comment like the one at the top of this file
++# starting with '# Written by ' and ending with '# warranty; '.
++#
++# For '-h' and '--help' to work, you will also need a one line
++# description of your script's purpose in a comment directly above the
++# '# Written by ' line, like the one at the top of this file.
++#
++# The default options also support '--debug', which will turn on shell
++# execution tracing (see the comment above debug_cmd below for another
++# use), and '--verbose' and the func_verbose function to allow your script
++# to display verbose messages only when your user has specified
++# '--verbose'.
++#
++# After sourcing this file, you can plug processing for additional
++# options by amending the variables from the 'Configuration' section
++# below, and following the instructions in the 'Option parsing'
++# section further down.
++
++## -------------- ##
++## Configuration. ##
++## -------------- ##
++
++# You should override these variables in your script after sourcing this
++# file so that they reflect the customisations you have added to the
++# option parser.
++
++# The usage line for option parsing errors and the start of '-h' and
++# '--help' output messages. You can embed shell variables for delayed
++# expansion at the time the message is displayed, but you will need to
++# quote other shell meta-characters carefully to prevent them being
++# expanded when the contents are evaled.
++usage='$progpath [OPTION]...'
++
++# Short help message in response to '-h' and '--help'.  Add to this or
++# override it after sourcing this library to reflect the full set of
++# options your script accepts.
++usage_message="\
++       --debug        enable verbose shell tracing
++   -W, --warnings=CATEGORY
++                      report the warnings falling in CATEGORY [all]
++   -v, --verbose      verbosely report processing
++       --version      print version information and exit
++   -h, --help         print short or long help message and exit
++"
++
++# Additional text appended to 'usage_message' in response to '--help'.
++long_help_message="
++Warning categories include:
++       'all'          show all warnings
++       'none'         turn off all the warnings
++       'error'        warnings are treated as fatal errors"
++
++# Help message printed before fatal option parsing errors.
++fatal_help="Try '\$progname --help' for more information."
++
++
++
++## ------------------------- ##
++## Hook function management. ##
++## ------------------------- ##
++
++# This section contains functions for adding, removing, and running hooks
++# to the main code.  A hook is just a named list of of function, that can
++# be run in order later on.
++
++# func_hookable FUNC_NAME
++# -----------------------
++# Declare that FUNC_NAME will run hooks added with
++# 'func_add_hook FUNC_NAME ...'.
++func_hookable ()
++{
++    $debug_cmd
++
++    func_append hookable_fns " $1"
++}
++
++
++# func_add_hook FUNC_NAME HOOK_FUNC
++# ---------------------------------
++# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
++# first have been declared "hookable" by a call to 'func_hookable'.
++func_add_hook ()
++{
++    $debug_cmd
++
++    case " $hookable_fns " in
++      *" $1 "*) ;;
++      *) func_fatal_error "'$1' does not accept hook functions." ;;
++    esac
++
++    eval func_append ${1}_hooks '" $2"'
++}
++
++
++# func_remove_hook FUNC_NAME HOOK_FUNC
++# ------------------------------------
++# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
++func_remove_hook ()
++{
++    $debug_cmd
++
++    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
++}
++
++
++# func_run_hooks FUNC_NAME [ARG]...
++# ---------------------------------
++# Run all hook functions registered to FUNC_NAME.
++# It is assumed that the list of hook functions contains nothing more
++# than a whitespace-delimited list of legal shell function names, and
++# no effort is wasted trying to catch shell meta-characters or preserve
++# whitespace.
++func_run_hooks ()
++{
++    $debug_cmd
++
++    _G_rc_run_hooks=false
++
++    case " $hookable_fns " in
++      *" $1 "*) ;;
++      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
++    esac
++
++    eval _G_hook_fns=\$$1_hooks; shift
++
++    for _G_hook in $_G_hook_fns; do
++      if eval $_G_hook '"$@"'; then
++        # store returned options list back into positional
++        # parameters for next 'cmd' execution.
++        eval _G_hook_result=\$${_G_hook}_result
++        eval set dummy "$_G_hook_result"; shift
++        _G_rc_run_hooks=:
++      fi
++    done
++
++    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
++}
++
++
++
++## --------------- ##
++## Option parsing. ##
++## --------------- ##
++
++# In order to add your own option parsing hooks, you must accept the
++# full positional parameter list in your hook function, you may remove/edit
++# any options that you action, and then pass back the remaining unprocessed
++# options in '<hooked_function_name>_result', escaped suitably for
++# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
++# hook's caller know that it should pay attention to
++# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
++# arguments are left untouched by the hook and therefore caller will ignore the
++# result variable.
++#
++# Like this:
++#
++#    my_options_prep ()
++#    {
++#        $debug_cmd
++#
++#        # Extend the existing usage message.
++#        usage_message=$usage_message'
++#      -s, --silent       don'\''t print informational messages
++#    '
++#        # No change in '$@' (ignored completely by this hook).  There is
++#        # no need to do the equivalent (but slower) action:
++#        # func_quote_for_eval ${1+"$@"}
++#        # my_options_prep_result=$func_quote_for_eval_result
++#        false
++#    }
++#    func_add_hook func_options_prep my_options_prep
++#
++#
++#    my_silent_option ()
++#    {
++#        $debug_cmd
++#
++#        args_changed=false
++#
++#        # Note that for efficiency, we parse as many options as we can
++#        # recognise in a loop before passing the remainder back to the
++#        # caller on the first unrecognised argument we encounter.
++#        while test $# -gt 0; do
++#          opt=$1; shift
++#          case $opt in
++#            --silent|-s) opt_silent=:
++#                         args_changed=:
++#                         ;;
++#            # Separate non-argument short options:
++#            -s*)         func_split_short_opt "$_G_opt"
++#                         set dummy "$func_split_short_opt_name" \
++#                             "-$func_split_short_opt_arg" ${1+"$@"}
++#                         shift
++#                         args_changed=:
++#                         ;;
++#            *)           # Make sure the first unrecognised option "$_G_opt"
++#                         # is added back to "$@", we could need that later
++#                         # if $args_changed is true.
++#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
++#          esac
++#        done
++#
++#        if $args_changed; then
++#          func_quote_for_eval ${1+"$@"}
++#          my_silent_option_result=$func_quote_for_eval_result
++#        fi
++#
++#        $args_changed
++#    }
++#    func_add_hook func_parse_options my_silent_option
++#
++#
++#    my_option_validation ()
++#    {
++#        $debug_cmd
++#
++#        $opt_silent && $opt_verbose && func_fatal_help "\
++#    '--silent' and '--verbose' options are mutually exclusive."
++#
++#        false
++#    }
++#    func_add_hook func_validate_options my_option_validation
++#
++# You'll also need to manually amend $usage_message to reflect the extra
++# options you parse.  It's preferable to append if you can, so that
++# multiple option parsing hooks can be added safely.
++
++
++# func_options_finish [ARG]...
++# ----------------------------
++# Finishing the option parse loop (call 'func_options' hooks ATM).
++func_options_finish ()
++{
++    $debug_cmd
++
++    _G_func_options_finish_exit=false
++    if func_run_hooks func_options ${1+"$@"}; then
++      func_options_finish_result=$func_run_hooks_result
++      _G_func_options_finish_exit=:
 +    fi
++
++    $_G_func_options_finish_exit
 +}
 +
-+# func_missing_arg argname
++
++# func_options [ARG]...
++# ---------------------
++# All the functions called inside func_options are hookable. See the
++# individual implementations for details.
++func_hookable func_options
++func_options ()
++{
++    $debug_cmd
++
++    _G_rc_options=false
++
++    for my_func in options_prep parse_options validate_options options_finish
++    do
++      if eval func_$my_func '${1+"$@"}'; then
++        eval _G_res_var='$'"func_${my_func}_result"
++        eval set dummy "$_G_res_var" ; shift
++        _G_rc_options=:
++      fi
++    done
++
++    # Save modified positional parameters for caller.  As a top-level
++    # options-parser function we always need to set the 'func_options_result'
++    # variable (regardless the $_G_rc_options value).
++    if $_G_rc_options; then
++      func_options_result=$_G_res_var
++    else
++      func_quote_for_eval ${1+"$@"}
++      func_options_result=$func_quote_for_eval_result
++    fi
++
++    $_G_rc_options
++}
++
++
++# func_options_prep [ARG]...
++# --------------------------
++# All initialisations required before starting the option parse loop.
++# Note that when calling hook functions, we pass through the list of
++# positional parameters.  If a hook function modifies that list, and
++# needs to propagate that back to rest of this script, then the complete
++# modified list must be put in 'func_run_hooks_result' before
++# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
++func_hookable func_options_prep
++func_options_prep ()
++{
++    $debug_cmd
++
++    # Option defaults:
++    opt_verbose=false
++    opt_warning_types=
++
++    _G_rc_options_prep=false
++    if func_run_hooks func_options_prep ${1+"$@"}; then
++      _G_rc_options_prep=:
++      # save modified positional parameters for caller
++      func_options_prep_result=$func_run_hooks_result
++    fi
++
++    $_G_rc_options_prep
++}
++
++
++# func_parse_options [ARG]...
++# ---------------------------
++# The main option parsing loop.
++func_hookable func_parse_options
++func_parse_options ()
++{
++    $debug_cmd
++
++    func_parse_options_result=
++
++    _G_rc_parse_options=false
++    # this just eases exit handling
++    while test $# -gt 0; do
++      # Defer to hook functions for initial option parsing, so they
++      # get priority in the event of reusing an option name.
++      if func_run_hooks func_parse_options ${1+"$@"}; then
++        eval set dummy "$func_run_hooks_result"; shift
++        _G_rc_parse_options=:
++      fi
++
++      # Break out of the loop if we already parsed every option.
++      test $# -gt 0 || break
++
++      _G_match_parse_options=:
++      _G_opt=$1
++      shift
++      case $_G_opt in
++        --debug|-x)   debug_cmd='set -x'
++                      func_echo "enabling shell trace mode"
++                      $debug_cmd
++                      ;;
++
++        --no-warnings|--no-warning|--no-warn)
++                      set dummy --warnings none ${1+"$@"}
++                      shift
++		      ;;
++
++        --warnings|--warning|-W)
++                      if test $# = 0 && func_missing_arg $_G_opt; then
++                        _G_rc_parse_options=:
++                        break
++                      fi
++                      case " $warning_categories $1" in
++                        *" $1 "*)
++                          # trailing space prevents matching last $1 above
++                          func_append_uniq opt_warning_types " $1"
++                          ;;
++                        *all)
++                          opt_warning_types=$warning_categories
++                          ;;
++                        *none)
++                          opt_warning_types=none
++                          warning_func=:
++                          ;;
++                        *error)
++                          opt_warning_types=$warning_categories
++                          warning_func=func_fatal_error
++                          ;;
++                        *)
++                          func_fatal_error \
++                             "unsupported warning category: '$1'"
++                          ;;
++                      esac
++                      shift
++                      ;;
++
++        --verbose|-v) opt_verbose=: ;;
++        --version)    func_version ;;
++        -\?|-h)       func_usage ;;
++        --help)       func_help ;;
++
++	# Separate optargs to long options (plugins may need this):
++	--*=*)        func_split_equals "$_G_opt"
++	              set dummy "$func_split_equals_lhs" \
++                          "$func_split_equals_rhs" ${1+"$@"}
++                      shift
++                      ;;
++
++       # Separate optargs to short options:
++        -W*)
++                      func_split_short_opt "$_G_opt"
++                      set dummy "$func_split_short_opt_name" \
++                          "$func_split_short_opt_arg" ${1+"$@"}
++                      shift
++                      ;;
++
++        # Separate non-argument short options:
++        -\?*|-h*|-v*|-x*)
++                      func_split_short_opt "$_G_opt"
++                      set dummy "$func_split_short_opt_name" \
++                          "-$func_split_short_opt_arg" ${1+"$@"}
++                      shift
++                      ;;
++
++        --)           _G_rc_parse_options=: ; break ;;
++        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
++        *)            set dummy "$_G_opt" ${1+"$@"}; shift
++                      _G_match_parse_options=false
++                      break
++                      ;;
++      esac
++
++      $_G_match_parse_options && _G_rc_parse_options=:
++    done
++
++
++    if $_G_rc_parse_options; then
++      # save modified positional parameters for caller
++      func_quote_for_eval ${1+"$@"}
++      func_parse_options_result=$func_quote_for_eval_result
++    fi
++
++    $_G_rc_parse_options
++}
++
++
++# func_validate_options [ARG]...
++# ------------------------------
++# Perform any sanity checks on option settings and/or unconsumed
++# arguments.
++func_hookable func_validate_options
++func_validate_options ()
++{
++    $debug_cmd
++
++    _G_rc_validate_options=false
++
++    # Display all warnings if -W was not given.
++    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
++
++    if func_run_hooks func_validate_options ${1+"$@"}; then
++      # save modified positional parameters for caller
++      func_validate_options_result=$func_run_hooks_result
++      _G_rc_validate_options=:
++    fi
++
++    # Bail if the options were screwed!
++    $exit_cmd $EXIT_FAILURE
++
++    $_G_rc_validate_options
++}
++
++
++
++## ----------------- ##
++## Helper functions. ##
++## ----------------- ##
++
++# This section contains the helper functions used by the rest of the
++# hookable option parser framework in ascii-betical order.
++
++
++# func_fatal_help ARG...
++# ----------------------
++# Echo program name prefixed message to standard error, followed by
++# a help hint, and exit.
++func_fatal_help ()
++{
++    $debug_cmd
++
++    eval \$ECHO \""Usage: $usage"\"
++    eval \$ECHO \""$fatal_help"\"
++    func_error ${1+"$@"}
++    exit $EXIT_FAILURE
++}
++
++
++# func_help
++# ---------
++# Echo long help message to standard output and exit.
++func_help ()
++{
++    $debug_cmd
++
++    func_usage_message
++    $ECHO "$long_help_message"
++    exit 0
++}
++
++
++# func_missing_arg ARGNAME
++# ------------------------
 +# Echo program name prefixed message to standard error and set global
 +# exit_cmd.
 +func_missing_arg ()
 +{
-+    $opt_debug
++    $debug_cmd
 +
-+    func_error "missing argument for $1."
++    func_error "Missing argument for '$1'."
 +    exit_cmd=exit
 +}
 +
 +
-+# func_split_short_opt shortopt
++# func_split_equals STRING
++# ------------------------
++# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
++# splitting STRING at the '=' sign.
++test -z "$_G_HAVE_XSI_OPS" \
++    && (eval 'x=a/b/c;
++      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
++    && _G_HAVE_XSI_OPS=yes
++
++if test yes = "$_G_HAVE_XSI_OPS"
++then
++  # This is an XSI compatible shell, allowing a faster implementation...
++  eval 'func_split_equals ()
++  {
++      $debug_cmd
++
++      func_split_equals_lhs=${1%%=*}
++      func_split_equals_rhs=${1#*=}
++      test "x$func_split_equals_lhs" = "x$1" \
++        && func_split_equals_rhs=
++  }'
++else
++  # ...otherwise fall back to using expr, which is often a shell builtin.
++  func_split_equals ()
++  {
++      $debug_cmd
++
++      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
++      func_split_equals_rhs=
++      test "x$func_split_equals_lhs" = "x$1" \
++        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
++  }
++fi #func_split_equals
++
++
++# func_split_short_opt SHORTOPT
++# -----------------------------
 +# Set func_split_short_opt_name and func_split_short_opt_arg shell
 +# variables after splitting SHORTOPT after the 2nd character.
-+func_split_short_opt ()
++if test yes = "$_G_HAVE_XSI_OPS"
++then
++  # This is an XSI compatible shell, allowing a faster implementation...
++  eval 'func_split_short_opt ()
++  {
++      $debug_cmd
++
++      func_split_short_opt_arg=${1#??}
++      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
++  }'
++else
++  # ...otherwise fall back to using expr, which is often a shell builtin.
++  func_split_short_opt ()
++  {
++      $debug_cmd
++
++      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
++      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
++  }
++fi #func_split_short_opt
++
++
++# func_usage
++# ----------
++# Echo short help message to standard output and exit.
++func_usage ()
 +{
-+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
++    $debug_cmd
 +
-+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-+} # func_split_short_opt may be replaced by extended shell implementation
++    func_usage_message
++    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
++    exit 0
++}
 +
 +
-+# func_split_long_opt longopt
-+# Set func_split_long_opt_name and func_split_long_opt_arg shell
-+# variables after splitting LONGOPT at the `=' sign.
-+func_split_long_opt ()
++# func_usage_message
++# ------------------
++# Echo short help message to standard output.
++func_usage_message ()
 +{
-+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-+    my_sed_long_arg='1s/^--[^=]*=//'
++    $debug_cmd
 +
-+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-+} # func_split_long_opt may be replaced by extended shell implementation
++    eval \$ECHO \""Usage: $usage"\"
++    echo
++    $SED -n 's|^# ||
++        /^Written by/{
++          x;p;x
++        }
++	h
++	/^Written by/q' < "$progpath"
++    echo
++    eval \$ECHO \""$usage_message"\"
++}
 +
-+exit_cmd=:
 +
++# func_version
++# ------------
++# Echo version message to standard output and exit.
++func_version ()
++{
++    $debug_cmd
 +
++    printf '%s\n' "$progname $scriptversion"
++    $SED -n '
++        /(C)/!b go
++        :more
++        /\./!{
++          N
++          s|\n# | |
++          b more
++        }
++        :go
++        /^# Written by /,/# warranty; / {
++          s|^# ||
++          s|^# *$||
++          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
++          p
++        }
++        /^# Written by / {
++          s|^# ||
++          p
++        }
++        /^warranty; /q' < "$progpath"
 +
++    exit $?
++}
 +
 +
-+magic="%%%MAGIC variable%%%"
-+magic_exe="%%%MAGIC EXE variable%%%"
++# Local variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'before-save-hook 'time-stamp)
++# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
++# time-stamp-time-zone: "UTC"
++# End:
 +
-+# Global variables.
-+nonopt=
-+preserve_args=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
++# Set a version string.
++scriptversion='(GNU libtool) 2.4.6'
 +
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end.  This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
 +
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
++# func_echo ARG...
++# ----------------
++# Libtool also displays the current mode in messages, so override
++# funclib.sh func_echo with this custom definition.
++func_echo ()
 +{
-+    eval "${1}=\$${1}\${2}"
-+} # func_append may be replaced by extended shell implementation
++    $debug_cmd
 +
-+# func_append_quoted var value
-+# Quote VALUE and append to the end of shell variable VAR, separated
-+# by a space.
-+func_append_quoted ()
-+{
-+    func_quote_for_eval "${2}"
-+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-+} # func_append_quoted may be replaced by extended shell implementation
++    _G_message=$*
++
++    func_echo_IFS=$IFS
++    IFS=$nl
++    for _G_line in $_G_message; do
++      IFS=$func_echo_IFS
++      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
++    done
++    IFS=$func_echo_IFS
++}
 +
 +
-+# func_arith arithmetic-term...
-+func_arith ()
++# func_warning ARG...
++# -------------------
++# Libtool warnings are not categorized, so override funclib.sh
++# func_warning with this simpler definition.
++func_warning ()
 +{
-+    func_arith_result=`expr "${@}"`
-+} # func_arith may be replaced by extended shell implementation
++    $debug_cmd
 +
++    $warning_func ${1+"$@"}
++}
 +
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-+} # func_len may be replaced by extended shell implementation
 +
++## ---------------- ##
++## Options parsing. ##
++## ---------------- ##
++
++# Hook in the functions to make sure our own options are parsed during
++# the option parsing loop.
++
++usage='$progpath [OPTION]... [MODE-ARG]...'
++
++# Short help message in response to '-h'.
++usage_message="Options:
++       --config             show all configuration variables
++       --debug              enable verbose shell tracing
++   -n, --dry-run            display commands without modifying any files
++       --features           display basic configuration information and exit
++       --mode=MODE          use operation mode MODE
++       --no-warnings        equivalent to '-Wnone'
++       --preserve-dup-deps  don't remove duplicate dependency libraries
++       --quiet, --silent    don't print informational messages
++       --tag=TAG            use configuration variables from tag TAG
++   -v, --verbose            print more informational messages than default
++       --version            print version information
++   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
++   -h, --help, --help-all   print short, long, or detailed help message
++"
 +
-+# func_lo2o object
-+func_lo2o ()
++# Additional text appended to 'usage_message' in response to '--help'.
++func_help ()
 +{
-+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+} # func_lo2o may be replaced by extended shell implementation
++    $debug_cmd
++
++    func_usage_message
++    $ECHO "$long_help_message
++
++MODE must be one of the following:
++
++       clean           remove files from the build directory
++       compile         compile a source file into a libtool object
++       execute         automatically set library path, then run a program
++       finish          complete the installation of libtool libraries
++       install         install libraries or executables
++       link            create a library or an executable
++       uninstall       remove libraries from an installed directory
++
++MODE-ARGS vary depending on the MODE.  When passed as first option,
++'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
++Try '$progname --help --mode=MODE' for a more detailed description of MODE.
++
++When reporting a bug, please describe a test case to reproduce it and
++include the following information:
++
++       host-triplet:   $host
++       shell:          $SHELL
++       compiler:       $LTCC
++       compiler flags: $LTCFLAGS
++       linker:         $LD (gnu? $with_gnu_ld)
++       version:        $progname $scriptversion Debian-2.4.6-14
++       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
++       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
++
++Report bugs to <bug-libtool@gnu.org>.
++GNU libtool home page: <http://www.gnu.org/s/libtool/>.
++General help using GNU software: <http://www.gnu.org/gethelp/>."
++    exit 0
++}
 +
 +
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+} # func_xform may be replaced by extended shell implementation
++# func_lo2o OBJECT-NAME
++# ---------------------
++# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
++# object suffix.
++
++lo2o=s/\\.lo\$/.$objext/
++o2lo=s/\\.$objext\$/.lo/
 +
++if test yes = "$_G_HAVE_XSI_OPS"; then
++  eval 'func_lo2o ()
++  {
++    case $1 in
++      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
++      *   ) func_lo2o_result=$1               ;;
++    esac
++  }'
 +
-+# func_fatal_configuration arg...
++  # func_xform LIBOBJ-OR-SOURCE
++  # ---------------------------
++  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
++  # suffix to a '.lo' libtool-object suffix.
++  eval 'func_xform ()
++  {
++    func_xform_result=${1%.*}.lo
++  }'
++else
++  # ...otherwise fall back to using sed.
++  func_lo2o ()
++  {
++    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
++  }
++
++  func_xform ()
++  {
++    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
++  }
++fi
++
++
++# func_fatal_configuration ARG...
++# -------------------------------
 +# Echo program name prefixed message to standard error, followed by
 +# a configuration failure hint, and exit.
 +func_fatal_configuration ()
 +{
-+    func_error ${1+"$@"}
-+    func_error "See the $PACKAGE documentation for more information."
-+    func_fatal_error "Fatal configuration error."
++    func__fatal_error ${1+"$@"} \
++      "See the $PACKAGE documentation for more information." \
++      "Fatal configuration error."
 +}
 +
 +
 +# func_config
++# -----------
 +# Display the configuration for all the tags in this script.
 +func_config ()
 +{
@@ -26792,17 +28963,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    exit $?
 +}
 +
++
 +# func_features
++# -------------
 +# Display the features supported by this script.
 +func_features ()
 +{
 +    echo "host: $host"
-+    if test "$build_libtool_libs" = yes; then
++    if test yes = "$build_libtool_libs"; then
 +      echo "enable shared libraries"
 +    else
 +      echo "disable shared libraries"
 +    fi
-+    if test "$build_old_libs" = yes; then
++    if test yes = "$build_old_libs"; then
 +      echo "enable static libraries"
 +    else
 +      echo "disable static libraries"
@@ -26811,289 +28984,316 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    exit $?
 +}
 +
-+# func_enable_tag tagname
++
++# func_enable_tag TAGNAME
++# -----------------------
 +# Verify that TAGNAME is valid, and either flag an error and exit, or
 +# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 +# variable here.
 +func_enable_tag ()
 +{
-+  # Global variable:
-+  tagname="$1"
++    # Global variable:
++    tagname=$1
 +
-+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
++    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
++    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
++    sed_extractcf=/$re_begincf/,/$re_endcf/p
 +
-+  # Validate tagname.
-+  case $tagname in
-+    *[!-_A-Za-z0-9,/]*)
-+      func_fatal_error "invalid tag name: $tagname"
-+      ;;
-+  esac
++    # Validate tagname.
++    case $tagname in
++      *[!-_A-Za-z0-9,/]*)
++        func_fatal_error "invalid tag name: $tagname"
++        ;;
++    esac
 +
-+  # Don't test for the "default" C tag, as we know it's
-+  # there but not specially marked.
-+  case $tagname in
-+    CC) ;;
++    # Don't test for the "default" C tag, as we know it's
++    # there but not specially marked.
++    case $tagname in
++        CC) ;;
 +    *)
-+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-+	taglist="$taglist $tagname"
-+
-+	# Evaluate the configuration.  Be careful to quote the path
-+	# and the sed script, to avoid splitting on whitespace, but
-+	# also don't use non-portable quotes within backquotes within
-+	# quotes we have to do it in 2 steps:
-+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-+	eval "$extractedcf"
-+      else
-+	func_error "ignoring unknown tag $tagname"
-+      fi
-+      ;;
-+  esac
++        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
++	  taglist="$taglist $tagname"
++
++	  # Evaluate the configuration.  Be careful to quote the path
++	  # and the sed script, to avoid splitting on whitespace, but
++	  # also don't use non-portable quotes within backquotes within
++	  # quotes we have to do it in 2 steps:
++	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
++	  eval "$extractedcf"
++        else
++	  func_error "ignoring unknown tag $tagname"
++        fi
++        ;;
++    esac
 +}
 +
++
 +# func_check_version_match
++# ------------------------
 +# Ensure that we are using m4 macros, and libtool script from the same
 +# release of libtool.
 +func_check_version_match ()
 +{
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
++    if test "$package_revision" != "$macro_revision"; then
++      if test "$VERSION" != "$macro_version"; then
++        if test -z "$macro_version"; then
++          cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 +$progname: definition of this LT_INIT comes from an older release.
 +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 +$progname: and run autoconf again.
 +_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
++        else
++          cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 +$progname: and run autoconf again.
 +_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
++        fi
++      else
++        cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 +$progname: but the definition of this LT_INIT comes from revision $macro_revision.
 +$progname: You should recreate aclocal.m4 with macros from revision $package_revision
 +$progname: of $PACKAGE $VERSION and run autoconf again.
 +_LT_EOF
-+    fi
++      fi
 +
-+    exit $EXIT_MISMATCH
-+  fi
++      exit $EXIT_MISMATCH
++    fi
 +}
 +
 +
-+# Shorthand for --mode=foo, only valid as the first argument
-+case $1 in
-+clean|clea|cle|cl)
-+  shift; set dummy --mode clean ${1+"$@"}; shift
-+  ;;
-+compile|compil|compi|comp|com|co|c)
-+  shift; set dummy --mode compile ${1+"$@"}; shift
-+  ;;
-+execute|execut|execu|exec|exe|ex|e)
-+  shift; set dummy --mode execute ${1+"$@"}; shift
-+  ;;
-+finish|finis|fini|fin|fi|f)
-+  shift; set dummy --mode finish ${1+"$@"}; shift
-+  ;;
-+install|instal|insta|inst|ins|in|i)
-+  shift; set dummy --mode install ${1+"$@"}; shift
-+  ;;
-+link|lin|li|l)
-+  shift; set dummy --mode link ${1+"$@"}; shift
-+  ;;
-+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+  shift; set dummy --mode uninstall ${1+"$@"}; shift
-+  ;;
-+esac
++# libtool_options_prep [ARG]...
++# -----------------------------
++# Preparation for options parsed by libtool.
++libtool_options_prep ()
++{
++    $debug_mode
 +
++    # Option defaults:
++    opt_config=false
++    opt_dlopen=
++    opt_dry_run=false
++    opt_help=false
++    opt_mode=
++    opt_preserve_dup_deps=false
++    opt_quiet=false
 +
++    nonopt=
++    preserve_args=
 +
-+# Option defaults:
-+opt_debug=:
-+opt_dry_run=false
-+opt_config=false
-+opt_preserve_dup_deps=false
-+opt_features=false
-+opt_finish=false
-+opt_help=false
-+opt_help_all=false
-+opt_silent=:
-+opt_warning=:
-+opt_verbose=:
-+opt_silent=false
-+opt_verbose=false
++    _G_rc_lt_options_prep=:
++
++    # Shorthand for --mode=foo, only valid as the first argument
++    case $1 in
++    clean|clea|cle|cl)
++      shift; set dummy --mode clean ${1+"$@"}; shift
++      ;;
++    compile|compil|compi|comp|com|co|c)
++      shift; set dummy --mode compile ${1+"$@"}; shift
++      ;;
++    execute|execut|execu|exec|exe|ex|e)
++      shift; set dummy --mode execute ${1+"$@"}; shift
++      ;;
++    finish|finis|fini|fin|fi|f)
++      shift; set dummy --mode finish ${1+"$@"}; shift
++      ;;
++    install|instal|insta|inst|ins|in|i)
++      shift; set dummy --mode install ${1+"$@"}; shift
++      ;;
++    link|lin|li|l)
++      shift; set dummy --mode link ${1+"$@"}; shift
++      ;;
++    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++      shift; set dummy --mode uninstall ${1+"$@"}; shift
++      ;;
++    *)
++      _G_rc_lt_options_prep=false
++      ;;
++    esac
++
++    if $_G_rc_lt_options_prep; then
++      # Pass back the list of options.
++      func_quote_for_eval ${1+"$@"}
++      libtool_options_prep_result=$func_quote_for_eval_result
++    fi
++
++    $_G_rc_lt_options_prep
++}
++func_add_hook func_options_prep libtool_options_prep
 +
 +
-+# Parse options once, thoroughly.  This comes as soon as possible in the
-+# script to make things like `--version' happen as quickly as we can.
++# libtool_parse_options [ARG]...
++# ---------------------------------
++# Provide handling for libtool specific options.
++libtool_parse_options ()
 +{
-+  # this just eases exit handling
-+  while test $# -gt 0; do
-+    opt="$1"
-+    shift
-+    case $opt in
-+      --debug|-x)	opt_debug='set -x'
-+			func_echo "enabling shell trace mode"
-+			$opt_debug
-+			;;
-+      --dry-run|--dryrun|-n)
-+			opt_dry_run=:
-+			;;
-+      --config)
-+			opt_config=:
-+func_config
-+			;;
-+      --dlopen|-dlopen)
-+			optarg="$1"
-+			opt_dlopen="${opt_dlopen+$opt_dlopen
-+}$optarg"
-+			shift
-+			;;
-+      --preserve-dup-deps)
-+			opt_preserve_dup_deps=:
-+			;;
-+      --features)
-+			opt_features=:
-+func_features
-+			;;
-+      --finish)
-+			opt_finish=:
-+set dummy --mode finish ${1+"$@"}; shift
-+			;;
-+      --help)
-+			opt_help=:
-+			;;
-+      --help-all)
-+			opt_help_all=:
-+opt_help=': help-all'
-+			;;
-+      --mode)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_mode="$optarg"
-+case $optarg in
-+  # Valid mode arguments:
-+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-+
-+  # Catch anything else as an error
-+  *) func_error "invalid argument for $opt"
-+     exit_cmd=exit
-+     break
-+     ;;
-+esac
-+			shift
-+			;;
-+      --no-silent|--no-quiet)
-+			opt_silent=false
-+func_append preserve_args " $opt"
-+			;;
-+      --no-warning|--no-warn)
-+			opt_warning=false
-+func_append preserve_args " $opt"
-+			;;
-+      --no-verbose)
-+			opt_verbose=false
-+func_append preserve_args " $opt"
-+			;;
-+      --silent|--quiet)
-+			opt_silent=:
-+func_append preserve_args " $opt"
-+        opt_verbose=false
-+			;;
-+      --verbose|-v)
-+			opt_verbose=:
-+func_append preserve_args " $opt"
-+opt_silent=false
-+			;;
-+      --tag)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_tag="$optarg"
-+func_append preserve_args " $opt $optarg"
-+func_enable_tag "$optarg"
-+			shift
-+			;;
++    $debug_cmd
 +
-+      -\?|-h)		func_usage				;;
-+      --help)		func_help				;;
-+      --version)	func_version				;;
++    _G_rc_lt_parse_options=false
 +
-+      # Separate optargs to long options:
-+      --*=*)
-+			func_split_long_opt "$opt"
-+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-+			shift
-+			;;
++    # Perform our own loop to consume as many options as possible in
++    # each iteration.
++    while test $# -gt 0; do
++      _G_match_lt_parse_options=:
++      _G_opt=$1
++      shift
++      case $_G_opt in
++        --dry-run|--dryrun|-n)
++                        opt_dry_run=:
++                        ;;
++
++        --config)       func_config ;;
++
++        --dlopen|-dlopen)
++                        opt_dlopen="${opt_dlopen+$opt_dlopen
++}$1"
++                        shift
++                        ;;
++
++        --preserve-dup-deps)
++                        opt_preserve_dup_deps=: ;;
++
++        --features)     func_features ;;
++
++        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
++
++        --help)         opt_help=: ;;
++
++        --help-all)     opt_help=': help-all' ;;
++
++        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
++                        opt_mode=$1
++                        case $1 in
++                          # Valid mode arguments:
++                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
++
++                          # Catch anything else as an error
++                          *) func_error "invalid argument for $_G_opt"
++                             exit_cmd=exit
++                             break
++                             ;;
++                        esac
++                        shift
++                        ;;
++
++        --no-silent|--no-quiet)
++                        opt_quiet=false
++                        func_append preserve_args " $_G_opt"
++                        ;;
++
++        --no-warnings|--no-warning|--no-warn)
++                        opt_warning=false
++                        func_append preserve_args " $_G_opt"
++                        ;;
++
++        --no-verbose)
++                        opt_verbose=false
++                        func_append preserve_args " $_G_opt"
++                        ;;
++
++        --silent|--quiet)
++                        opt_quiet=:
++                        opt_verbose=false
++                        func_append preserve_args " $_G_opt"
++                        ;;
++
++        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
++                        opt_tag=$1
++                        func_append preserve_args " $_G_opt $1"
++                        func_enable_tag "$1"
++                        shift
++                        ;;
++
++        --verbose|-v)   opt_quiet=false
++                        opt_verbose=:
++                        func_append preserve_args " $_G_opt"
++                        ;;
++
++        # An option not handled by this hook function:
++        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
++                        _G_match_lt_parse_options=false
++                        break
++                        ;;
++      esac
++      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
++    done
 +
-+      # Separate non-argument short options:
-+      -\?*|-h*|-n*|-v*)
-+			func_split_short_opt "$opt"
-+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-+			shift
-+			;;
++    if $_G_rc_lt_parse_options; then
++      # save modified positional parameters for caller
++      func_quote_for_eval ${1+"$@"}
++      libtool_parse_options_result=$func_quote_for_eval_result
++    fi
 +
-+      --)		break					;;
-+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-+    esac
-+  done
++    $_G_rc_lt_parse_options
++}
++func_add_hook func_parse_options libtool_parse_options
 +
-+  # Validate options:
 +
-+  # save first non-option argument
-+  if test "$#" -gt 0; then
-+    nonopt="$opt"
-+    shift
-+  fi
 +
-+  # preserve --debug
-+  test "$opt_debug" = : || func_append preserve_args " --debug"
++# libtool_validate_options [ARG]...
++# ---------------------------------
++# Perform any sanity checks on option settings and/or unconsumed
++# arguments.
++libtool_validate_options ()
++{
++    # save first non-option argument
++    if test 0 -lt $#; then
++      nonopt=$1
++      shift
++    fi
 +
-+  case $host in
-+    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+      # don't eliminate duplications in $postdeps and $predeps
-+      opt_duplicate_compiler_generated_deps=:
-+      ;;
-+    *)
-+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-+      ;;
-+  esac
++    # preserve --debug
++    test : = "$debug_cmd" || func_append preserve_args " --debug"
 +
-+  $opt_help || {
-+    # Sanity checks first:
-+    func_check_version_match
++    case $host in
++      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
++      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
++      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
++        # don't eliminate duplications in $postdeps and $predeps
++        opt_duplicate_compiler_generated_deps=:
++        ;;
++      *)
++        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++        ;;
++    esac
 +
-+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+      func_fatal_configuration "not configured to build any kind of library"
-+    fi
++    $opt_help || {
++      # Sanity checks first:
++      func_check_version_match
 +
-+    # Darwin sucks
-+    eval std_shrext=\"$shrext_cmds\"
++      test yes != "$build_libtool_libs" \
++        && test yes != "$build_old_libs" \
++        && func_fatal_configuration "not configured to build any kind of library"
 +
-+    # Only execute mode is allowed to have -dlopen flags.
-+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-+      func_error "unrecognized option \`-dlopen'"
-+      $ECHO "$help" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
++      # Darwin sucks
++      eval std_shrext=\"$shrext_cmds\"
 +
-+    # Change the help message to a mode-specific one.
-+    generic_help="$help"
-+    help="Try \`$progname --help --mode=$opt_mode' for more information."
-+  }
++      # Only execute mode is allowed to have -dlopen flags.
++      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
++        func_error "unrecognized option '-dlopen'"
++        $ECHO "$help" 1>&2
++        exit $EXIT_FAILURE
++      fi
 +
++      # Change the help message to a mode-specific one.
++      generic_help=$help
++      help="Try '$progname --help --mode=$opt_mode' for more information."
++    }
 +
-+  # Bail if the options were screwed
-+  $exit_cmd $EXIT_FAILURE
++    # Pass back the unparsed argument list
++    func_quote_for_eval ${1+"$@"}
++    libtool_validate_options_result=$func_quote_for_eval_result
 +}
++func_add_hook func_validate_options libtool_validate_options
++
 +
++# Process options as early as possible so that --help and --version
++# can return quickly.
++func_options ${1+"$@"}
++eval set dummy "$func_options_result"; shift
 +
 +
 +
@@ -27101,24 +29301,52 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +##    Main.    ##
 +## ----------- ##
 +
++magic='%%%MAGIC variable%%%'
++magic_exe='%%%MAGIC EXE variable%%%'
++
++# Global variables.
++extracted_archives=
++extracted_serial=0
++
++# If this variable is set in any of the actions, the command in it
++# will be execed at the end.  This prevents here-documents from being
++# left over by shells.
++exec_cmd=
++
++
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++  eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++}
++
++# func_generated_by_libtool
++# True iff stdin has been generated by Libtool. This function is only
++# a basic sanity check; it will hardly flush out determined imposters.
++func_generated_by_libtool_p ()
++{
++  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
++}
++
 +# func_lalib_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
++# True iff FILE is a libtool '.la' library or '.lo' object file.
 +# This function is only a basic sanity check; it will hardly flush out
 +# determined imposters.
 +func_lalib_p ()
 +{
 +    test -f "$1" &&
-+      $SED -e 4q "$1" 2>/dev/null \
-+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
++      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 +}
 +
 +# func_lalib_unsafe_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
++# True iff FILE is a libtool '.la' library or '.lo' object file.
 +# This function implements the same check as func_lalib_p without
 +# resorting to external programs.  To this end, it redirects stdin and
 +# closes it afterwards, without saving the original file descriptor.
 +# As a safety measure, use it only where a negative result would be
-+# fatal anyway.  Works if `file' does not exist.
++# fatal anyway.  Works if 'file' does not exist.
 +func_lalib_unsafe_p ()
 +{
 +    lalib_p=no
@@ -27126,13 +29354,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	for lalib_p_l in 1 2 3 4
 +	do
 +	    read lalib_p_line
-+	    case "$lalib_p_line" in
++	    case $lalib_p_line in
 +		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 +	    esac
 +	done
 +	exec 0<&5 5<&-
 +    fi
-+    test "$lalib_p" = yes
++    test yes = "$lalib_p"
 +}
 +
 +# func_ltwrapper_script_p file
@@ -27141,7 +29369,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# determined imposters.
 +func_ltwrapper_script_p ()
 +{
-+    func_lalib_p "$1"
++    test -f "$1" &&
++      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 +}
 +
 +# func_ltwrapper_executable_p file
@@ -27166,7 +29395,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +{
 +    func_dirname_and_basename "$1" "" "."
 +    func_stripname '' '.exe' "$func_basename_result"
-+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
++    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 +}
 +
 +# func_ltwrapper_p file
@@ -27185,11 +29414,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# FAIL_CMD may read-access the current command in variable CMD!
 +func_execute_cmds ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    save_ifs=$IFS; IFS='~'
 +    for cmd in $1; do
-+      IFS=$save_ifs
++      IFS=$sp$nl
 +      eval cmd=\"$cmd\"
++      IFS=$save_ifs
 +      func_show_eval "$cmd" "${2-:}"
 +    done
 +    IFS=$save_ifs
@@ -27201,10 +29432,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Note that it is not necessary on cygwin/mingw to append a dot to
 +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 +# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+# `FILE.' does not work on cygwin managed mounts.
++# 'FILE.' does not work on cygwin managed mounts.
 +func_source ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    case $1 in
 +    */* | *\\*)	. "$1" ;;
 +    *)		. "./$1" ;;
@@ -27231,10 +29463,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# store the result into func_replace_sysroot_result.
 +func_replace_sysroot ()
 +{
-+  case "$lt_sysroot:$1" in
++  case $lt_sysroot:$1 in
 +  ?*:"$lt_sysroot"*)
 +    func_stripname "$lt_sysroot" '' "$1"
-+    func_replace_sysroot_result="=$func_stripname_result"
++    func_replace_sysroot_result='='$func_stripname_result
 +    ;;
 +  *)
 +    # Including no sysroot.
@@ -27251,7 +29483,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# arg is usually of the form 'gcc ...'
 +func_infer_tag ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    if test -n "$available_tags" && test -z "$tagname"; then
 +      CC_quoted=
 +      for arg in $CC; do
@@ -27270,7 +29503,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	for z in $available_tags; do
 +	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 +	    # Evaluate the configuration.
-+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 +	    CC_quoted=
 +	    for arg in $CC; do
 +	      # Double-quote args containing other shell metacharacters.
@@ -27295,7 +29528,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# line option must be used.
 +	if test -z "$tagname"; then
 +	  func_echo "unable to infer tagged configuration"
-+	  func_fatal_error "specify a tag with \`--tag'"
++	  func_fatal_error "specify a tag with '--tag'"
 +#	else
 +#	  func_verbose "using $tagname tagged configuration"
 +	fi
@@ -27311,15 +29544,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# but don't create it if we're doing a dry run.
 +func_write_libtool_object ()
 +{
-+    write_libobj=${1}
-+    if test "$build_libtool_libs" = yes; then
-+      write_lobj=\'${2}\'
++    write_libobj=$1
++    if test yes = "$build_libtool_libs"; then
++      write_lobj=\'$2\'
 +    else
 +      write_lobj=none
 +    fi
 +
-+    if test "$build_old_libs" = yes; then
-+      write_oldobj=\'${3}\'
++    if test yes = "$build_old_libs"; then
++      write_oldobj=\'$3\'
 +    else
 +      write_oldobj=none
 +    fi
@@ -27327,7 +29560,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    $opt_dry_run || {
 +      cat >${write_libobj}T <<EOF
 +# $write_libobj - a libtool object file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 +#
 +# Please DO NOT delete this file!
 +# It is necessary for linking the library.
@@ -27339,7 +29572,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +non_pic_object=$write_oldobj
 +
 +EOF
-+      $MV "${write_libobj}T" "${write_libobj}"
++      $MV "${write_libobj}T" "$write_libobj"
 +    }
 +}
 +
@@ -27359,8 +29592,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# be empty on error (or when ARG is empty)
 +func_convert_core_file_wine_to_w32 ()
 +{
-+  $opt_debug
-+  func_convert_core_file_wine_to_w32_result="$1"
++  $debug_cmd
++
++  func_convert_core_file_wine_to_w32_result=$1
 +  if test -n "$1"; then
 +    # Unfortunately, winepath does not exit with a non-zero error code, so we
 +    # are forced to check the contents of stdout. On the other hand, if the
@@ -27368,9 +29602,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    # *an error message* to stdout. So we must check for both error code of
 +    # zero AND non-empty stdout, which explains the odd construction:
 +    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
++    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
 +      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-+        $SED -e "$lt_sed_naive_backslashify"`
++        $SED -e "$sed_naive_backslashify"`
 +    else
 +      func_convert_core_file_wine_to_w32_result=
 +    fi
@@ -27391,18 +29625,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# are convertible, then the result may be empty.
 +func_convert_core_path_wine_to_w32 ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  # unfortunately, winepath doesn't convert paths, only file names
-+  func_convert_core_path_wine_to_w32_result=""
++  func_convert_core_path_wine_to_w32_result=
 +  if test -n "$1"; then
 +    oldIFS=$IFS
 +    IFS=:
 +    for func_convert_core_path_wine_to_w32_f in $1; do
 +      IFS=$oldIFS
 +      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
++      if test -n "$func_convert_core_file_wine_to_w32_result"; then
 +        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
++          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
 +        else
 +          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
 +        fi
@@ -27431,7 +29666,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# environment variable; do not put it in $PATH.
 +func_cygpath ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
 +    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
 +    if test "$?" -ne 0; then
@@ -27440,7 +29676,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    fi
 +  else
 +    func_cygpath_result=
-+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
++    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
 +  fi
 +}
 +#end: func_cygpath
@@ -27451,10 +29687,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# result in func_convert_core_msys_to_w32_result.
 +func_convert_core_msys_to_w32 ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  # awkward: cmd appends spaces to result
 +  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
 +}
 +#end: func_convert_core_msys_to_w32
 +
@@ -27465,13 +29702,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result to ARG1).
 +func_convert_file_check ()
 +{
-+  $opt_debug
-+  if test -z "$2" && test -n "$1" ; then
++  $debug_cmd
++
++  if test -z "$2" && test -n "$1"; then
 +    func_error "Could not determine host file name corresponding to"
-+    func_error "  \`$1'"
++    func_error "  '$1'"
 +    func_error "Continuing, but uninstalled executables may not work."
 +    # Fallback:
-+    func_to_host_file_result="$1"
++    func_to_host_file_result=$1
 +  fi
 +}
 +# end func_convert_file_check
@@ -27483,10 +29721,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result to a simplistic fallback value (see below).
 +func_convert_path_check ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  if test -z "$4" && test -n "$3"; then
 +    func_error "Could not determine the host path corresponding to"
-+    func_error "  \`$3'"
++    func_error "  '$3'"
 +    func_error "Continuing, but uninstalled executables may not work."
 +    # Fallback.  This is a deliberately simplistic "conversion" and
 +    # should not be "improved".  See libtool.info.
@@ -27495,7 +29734,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_to_host_path_result=`echo "$3" |
 +        $SED -e "$lt_replace_pathsep_chars"`
 +    else
-+      func_to_host_path_result="$3"
++      func_to_host_path_result=$3
 +    fi
 +  fi
 +}
@@ -27507,9 +29746,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# and appending REPL if ORIG matches BACKPAT.
 +func_convert_path_front_back_pathsep ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  case $4 in
-+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
++  $1 ) func_to_host_path_result=$3$func_to_host_path_result
 +    ;;
 +  esac
 +  case $4 in
@@ -27523,7 +29763,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +##################################################
 +# $build to $host FILE NAME CONVERSION FUNCTIONS #
 +##################################################
-+# invoked via `$to_host_file_cmd ARG'
++# invoked via '$to_host_file_cmd ARG'
 +#
 +# In each case, ARG is the path to be converted from $build to $host format.
 +# Result will be available in $func_to_host_file_result.
@@ -27534,7 +29774,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# in func_to_host_file_result.
 +func_to_host_file ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  $to_host_file_cmd "$1"
 +}
 +# end func_to_host_file
@@ -27546,7 +29787,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# in (the comma separated) LAZY, no conversion takes place.
 +func_to_tool_file ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  case ,$2, in
 +    *,"$to_tool_file_cmd",*)
 +      func_to_tool_file_result=$1
@@ -27564,7 +29806,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Copy ARG to func_to_host_file_result.
 +func_convert_file_noop ()
 +{
-+  func_to_host_file_result="$1"
++  func_to_host_file_result=$1
 +}
 +# end func_convert_file_noop
 +
@@ -27575,11 +29817,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result.
 +func_convert_file_msys_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_file_result="$1"
++  $debug_cmd
++
++  func_to_host_file_result=$1
 +  if test -n "$1"; then
 +    func_convert_core_msys_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
++    func_to_host_file_result=$func_convert_core_msys_to_w32_result
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
@@ -27591,8 +29834,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result.
 +func_convert_file_cygwin_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_file_result="$1"
++  $debug_cmd
++
++  func_to_host_file_result=$1
 +  if test -n "$1"; then
 +    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
 +    # LT_CYGPATH in this case.
@@ -27608,11 +29852,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# and a working winepath. Returns result in func_to_host_file_result.
 +func_convert_file_nix_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_file_result="$1"
++  $debug_cmd
++
++  func_to_host_file_result=$1
 +  if test -n "$1"; then
 +    func_convert_core_file_wine_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
++    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
@@ -27624,12 +29869,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Returns result in func_to_host_file_result.
 +func_convert_file_msys_to_cygwin ()
 +{
-+  $opt_debug
-+  func_to_host_file_result="$1"
++  $debug_cmd
++
++  func_to_host_file_result=$1
 +  if test -n "$1"; then
 +    func_convert_core_msys_to_w32 "$1"
 +    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
++    func_to_host_file_result=$func_cygpath_result
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
@@ -27642,13 +29888,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# in func_to_host_file_result.
 +func_convert_file_nix_to_cygwin ()
 +{
-+  $opt_debug
-+  func_to_host_file_result="$1"
++  $debug_cmd
++
++  func_to_host_file_result=$1
 +  if test -n "$1"; then
 +    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
 +    func_convert_core_file_wine_to_w32 "$1"
 +    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
++    func_to_host_file_result=$func_cygpath_result
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
@@ -27658,7 +29905,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#############################################
 +# $build to $host PATH CONVERSION FUNCTIONS #
 +#############################################
-+# invoked via `$to_host_path_cmd ARG'
++# invoked via '$to_host_path_cmd ARG'
 +#
 +# In each case, ARG is the path to be converted from $build to $host format.
 +# The result will be available in $func_to_host_path_result.
@@ -27682,10 +29929,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +to_host_path_cmd=
 +func_init_to_host_path_cmd ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  if test -z "$to_host_path_cmd"; then
 +    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
++    to_host_path_cmd=func_convert_path_$func_stripname_result
 +  fi
 +}
 +
@@ -27695,7 +29943,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# in func_to_host_path_result.
 +func_to_host_path ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  func_init_to_host_path_cmd
 +  $to_host_path_cmd "$1"
 +}
@@ -27706,7 +29955,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Copy ARG to func_to_host_path_result.
 +func_convert_path_noop ()
 +{
-+  func_to_host_path_result="$1"
++  func_to_host_path_result=$1
 +}
 +# end func_convert_path_noop
 +
@@ -27717,8 +29966,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_path_result.
 +func_convert_path_msys_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_path_result="$1"
++  $debug_cmd
++
++  func_to_host_path_result=$1
 +  if test -n "$1"; then
 +    # Remove leading and trailing path separator characters from ARG.  MSYS
 +    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -27726,7 +29976,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
++    func_to_host_path_result=$func_convert_core_msys_to_w32_result
 +    func_convert_path_check : ";" \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -27740,8 +29990,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result.
 +func_convert_path_cygwin_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_path_result="$1"
++  $debug_cmd
++
++  func_to_host_path_result=$1
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
@@ -27760,14 +30011,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# a working winepath.  Returns result in func_to_host_file_result.
 +func_convert_path_nix_to_w32 ()
 +{
-+  $opt_debug
-+  func_to_host_path_result="$1"
++  $debug_cmd
++
++  func_to_host_path_result=$1
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
++    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
 +    func_convert_path_check : ";" \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -27781,15 +30033,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Returns result in func_to_host_file_result.
 +func_convert_path_msys_to_cygwin ()
 +{
-+  $opt_debug
-+  func_to_host_path_result="$1"
++  $debug_cmd
++
++  func_to_host_path_result=$1
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
 +    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
++    func_to_host_path_result=$func_cygpath_result
 +    func_convert_path_check : : \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -27804,8 +30057,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_to_host_file_result.
 +func_convert_path_nix_to_cygwin ()
 +{
-+  $opt_debug
-+  func_to_host_path_result="$1"
++  $debug_cmd
++
++  func_to_host_path_result=$1
 +  if test -n "$1"; then
 +    # Remove leading and trailing path separator characters from
 +    # ARG. msys behavior is inconsistent here, cygpath turns them
@@ -27814,7 +30068,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
 +    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
++    func_to_host_path_result=$func_cygpath_result
 +    func_convert_path_check : : \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -27823,13 +30077,31 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# end func_convert_path_nix_to_cygwin
 +
 +
++# func_dll_def_p FILE
++# True iff FILE is a Windows DLL '.def' file.
++# Keep in sync with _LT_DLL_DEF_P in libtool.m4
++func_dll_def_p ()
++{
++  $debug_cmd
++
++  func_dll_def_p_tmp=`$SED -n \
++    -e 's/^[	 ]*//' \
++    -e '/^\(;.*\)*$/d' \
++    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
++    -e q \
++    "$1"`
++  test DEF = "$func_dll_def_p_tmp"
++}
++
++
 +# func_mode_compile arg...
 +func_mode_compile ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    # Get the compilation command and the source file.
 +    base_compile=
-+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
 +    suppress_opt=yes
 +    suppress_output=
 +    arg_mode=normal
@@ -27842,12 +30114,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      case $arg_mode in
 +      arg  )
 +	# do not "continue".  Instead, add this to base_compile
-+	lastarg="$arg"
++	lastarg=$arg
 +	arg_mode=normal
 +	;;
 +
 +      target )
-+	libobj="$arg"
++	libobj=$arg
 +	arg_mode=normal
 +	continue
 +	;;
@@ -27857,7 +30129,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	case $arg in
 +	-o)
 +	  test -n "$libobj" && \
-+	    func_fatal_error "you cannot specify \`-o' more than once"
++	    func_fatal_error "you cannot specify '-o' more than once"
 +	  arg_mode=target
 +	  continue
 +	  ;;
@@ -27886,12 +30158,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  func_stripname '-Wc,' '' "$arg"
 +	  args=$func_stripname_result
 +	  lastarg=
-+	  save_ifs="$IFS"; IFS=','
++	  save_ifs=$IFS; IFS=,
 +	  for arg in $args; do
-+	    IFS="$save_ifs"
++	    IFS=$save_ifs
 +	    func_append_quoted lastarg "$arg"
 +	  done
-+	  IFS="$save_ifs"
++	  IFS=$save_ifs
 +	  func_stripname ' ' '' "$lastarg"
 +	  lastarg=$func_stripname_result
 +
@@ -27904,8 +30176,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  # Accept the current argument as the source file.
 +	  # The previous "srcfile" becomes the current argument.
 +	  #
-+	  lastarg="$srcfile"
-+	  srcfile="$arg"
++	  lastarg=$srcfile
++	  srcfile=$arg
 +	  ;;
 +	esac  #  case $arg
 +	;;
@@ -27920,13 +30192,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_fatal_error "you must specify an argument for -Xcompile"
 +      ;;
 +    target)
-+      func_fatal_error "you must specify a target with \`-o'"
++      func_fatal_error "you must specify a target with '-o'"
 +      ;;
 +    *)
 +      # Get the name of the library object.
 +      test -z "$libobj" && {
 +	func_basename "$srcfile"
-+	libobj="$func_basename_result"
++	libobj=$func_basename_result
 +      }
 +      ;;
 +    esac
@@ -27946,7 +30218,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    case $libobj in
 +    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
 +    *)
-+      func_fatal_error "cannot determine name of library object from \`$libobj'"
++      func_fatal_error "cannot determine name of library object from '$libobj'"
 +      ;;
 +    esac
 +
@@ -27955,8 +30227,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    for arg in $later; do
 +      case $arg in
 +      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
++	test yes = "$build_libtool_libs" \
++	  || func_fatal_configuration "cannot build a shared library"
 +	build_old_libs=no
 +	continue
 +	;;
@@ -27982,17 +30254,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    func_quote_for_eval "$libobj"
 +    test "X$libobj" != "X$func_quote_for_eval_result" \
 +      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
++      && func_warning "libobj name '$libobj' may not contain shell special characters."
 +    func_dirname_and_basename "$obj" "/" ""
-+    objname="$func_basename_result"
-+    xdir="$func_dirname_result"
-+    lobj=${xdir}$objdir/$objname
++    objname=$func_basename_result
++    xdir=$func_dirname_result
++    lobj=$xdir$objdir/$objname
 +
 +    test -z "$base_compile" && \
 +      func_fatal_help "you must specify a compilation command"
 +
 +    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
++    if test yes = "$build_old_libs"; then
 +      removelist="$obj $lobj $libobj ${libobj}T"
 +    else
 +      removelist="$lobj $libobj ${libobj}T"
@@ -28004,16 +30276,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      pic_mode=default
 +      ;;
 +    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
++    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
 +      # non-PIC code in shared libraries is not supported
 +      pic_mode=default
 +    fi
 +
 +    # Calculate the filename of the output object if compiler does
 +    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
++    if test no = "$compiler_c_o"; then
++      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
++      lockfile=$output_obj.lock
 +    else
 +      output_obj=
 +      need_locks=no
@@ -28022,12 +30294,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    # Lock this critical section if it is needed
 +    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
++    if test yes = "$need_locks"; then
 +      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 +	func_echo "Waiting for $lockfile to be removed"
 +	sleep 2
 +      done
-+    elif test "$need_locks" = warn; then
++    elif test warn = "$need_locks"; then
 +      if test -f "$lockfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile exists and contains:
@@ -28035,7 +30307,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
++your compiler does not support '-c' and '-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
@@ -28057,11 +30329,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    qsrcfile=$func_quote_for_eval_result
 +
 +    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
++    if test yes = "$build_libtool_libs"; then
 +      # Without this assignment, base_compile gets emptied.
 +      fbsd_hideous_sh_bug=$base_compile
 +
-+      if test "$pic_mode" != no; then
++      if test no != "$pic_mode"; then
 +	command="$base_compile $qsrcfile $pic_flag"
 +      else
 +	# Don't build PIC code
@@ -28078,7 +30350,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_show_eval_locale "$command"	\
 +          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 +
-+      if test "$need_locks" = warn &&
++      if test warn = "$need_locks" &&
 +	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile contains:
@@ -28089,7 +30361,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
++your compiler does not support '-c' and '-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
@@ -28105,20 +30377,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      fi
 +
 +      # Allow error messages only from the first compilation.
-+      if test "$suppress_opt" = yes; then
++      if test yes = "$suppress_opt"; then
 +	suppress_output=' >/dev/null 2>&1'
 +      fi
 +    fi
 +
 +    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      if test "$pic_mode" != yes; then
++    if test yes = "$build_old_libs"; then
++      if test yes != "$pic_mode"; then
 +	# Don't build PIC code
 +	command="$base_compile $qsrcfile$pie_flag"
 +      else
 +	command="$base_compile $qsrcfile $pic_flag"
 +      fi
-+      if test "$compiler_c_o" = yes; then
++      if test yes = "$compiler_c_o"; then
 +	func_append command " -o $obj"
 +      fi
 +
@@ -28127,7 +30399,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_show_eval_locale "$command" \
 +        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 +
-+      if test "$need_locks" = warn &&
++      if test warn = "$need_locks" &&
 +	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile contains:
@@ -28138,7 +30410,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
++your compiler does not support '-c' and '-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
@@ -28158,7 +30430,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 +
 +      # Unlock the critical section if it was locked
-+      if test "$need_locks" != no; then
++      if test no != "$need_locks"; then
 +	removelist=$lockfile
 +        $RM "$lockfile"
 +      fi
@@ -28168,7 +30440,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +}
 +
 +$opt_help || {
-+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
++  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 +}
 +
 +func_mode_help ()
@@ -28188,7 +30460,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +Remove files from the build directory.
 +
 +RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 +to RM.
 +
 +If FILE is a libtool library, object or program, all the files associated
@@ -28207,16 +30479,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  -no-suppress      do not suppress compiler output for multiple passes
 +  -prefer-pic       try to build PIC objects only
 +  -prefer-non-pic   try to build non-PIC objects only
-+  -shared           do not build a \`.o' file suitable for static linking
-+  -static           only build a \`.o' file suitable for static linking
++  -shared           do not build a '.o' file suitable for static linking
++  -static           only build a '.o' file suitable for static linking
 +  -Wc,FLAG          pass FLAG directly to the compiler
 +
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 +from the given SOURCEFILE.
 +
 +The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
++SOURCEFILE, then substituting the C source code suffix '.c' with the
++library object suffix, '.lo'."
 +        ;;
 +
 +      execute)
@@ -28229,7 +30501,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +  -dlopen FILE      add the directory containing FILE to the library path
 +
-+This mode sets the library path environment variable according to \`-dlopen'
++This mode sets the library path environment variable according to '-dlopen'
 +flags.
 +
 +If any of the ARGS are libtool executable wrappers, then they are translated
@@ -28248,7 +30520,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +Each LIBDIR is a directory that contains libtool libraries.
 +
 +The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
++the '--dry-run' option if you just want to see what would be executed."
 +        ;;
 +
 +      install)
@@ -28258,7 +30530,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +Install executables or libraries.
 +
 +INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
++either the 'install' or 'cp' program.
 +
 +The following components of INSTALL-COMMAND are treated specially:
 +
@@ -28284,7 +30556,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  -avoid-version    do not add a version suffix if possible
 +  -bindir BINDIR    specify path to binaries directory (for systems where
 +                    libraries must be found in the PATH setting at runtime)
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
 +  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
 +  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
 +  -export-symbols SYMFILE
@@ -28298,7 +30570,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  -no-install       link a not-installable executable
 +  -no-undefined     declare that a library does not refer to external symbols
 +  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -objectlist FILE  use a list of object files found in FILE to specify objects
++  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
 +  -precious-files-regex REGEX
 +                    don't remove output files matching REGEX
 +  -release RELEASE  specify package release information
@@ -28318,20 +30591,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
 +  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 +
-+All other options (arguments beginning with \`-') are ignored.
++All other options (arguments beginning with '-') are ignored.
 +
-+Every other argument is treated as a filename.  Files ending in \`.la' are
++Every other argument is treated as a filename.  Files ending in '.la' are
 +treated as uninstalled libtool libraries, other files are standard or library
 +object files.
 +
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
++If the OUTPUT-FILE ends in '.la', then a libtool library is created,
++only library objects ('.lo' files) may be specified, and '-rpath' is
 +required, except when creating a convenience library.
 +
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
++If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
++using 'ar' and 'ranlib', or on Windows using 'lib'.
 +
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 +is created, otherwise an executable program is created."
 +        ;;
 +
@@ -28342,7 +30615,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +Remove libraries from an installation directory.
 +
 +RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 +to RM.
 +
 +If FILE is a libtool library, all the files associated with it are deleted.
@@ -28350,17 +30623,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +        ;;
 +
 +      *)
-+        func_fatal_help "invalid operation mode \`$opt_mode'"
++        func_fatal_help "invalid operation mode '$opt_mode'"
 +        ;;
 +    esac
 +
 +    echo
-+    $ECHO "Try \`$progname --help' for more information about other modes."
++    $ECHO "Try '$progname --help' for more information about other modes."
 +}
 +
 +# Now that we've collected a possible --mode arg, show help if necessary
 +if $opt_help; then
-+  if test "$opt_help" = :; then
++  if test : = "$opt_help"; then
 +    func_mode_help
 +  else
 +    {
@@ -28368,7 +30641,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      for opt_mode in compile link execute install finish uninstall clean; do
 +	func_mode_help
 +      done
-+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
++    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
 +    {
 +      func_help noexit
 +      for opt_mode in compile link execute install finish uninstall clean; do
@@ -28376,7 +30649,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_mode_help
 +      done
 +    } |
-+    sed '1d
++    $SED '1d
 +      /^When reporting/,/^Report/{
 +	H
 +	d
@@ -28393,16 +30666,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_mode_execute arg...
 +func_mode_execute ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    # The first argument is the command name.
-+    cmd="$nonopt"
++    cmd=$nonopt
 +    test -z "$cmd" && \
 +      func_fatal_help "you must specify a COMMAND"
 +
 +    # Handle -dlopen flags immediately.
 +    for file in $opt_dlopen; do
 +      test -f "$file" \
-+	|| func_fatal_help "\`$file' is not a file"
++	|| func_fatal_help "'$file' is not a file"
 +
 +      dir=
 +      case $file in
@@ -28412,7 +30686,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
++	  || func_fatal_help "'$lib' is not a valid libtool archive"
 +
 +	# Read the libtool library.
 +	dlname=
@@ -28423,18 +30697,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if test -z "$dlname"; then
 +	  # Warn if it was a shared library.
 +	  test -n "$library_names" && \
-+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
++	    func_warning "'$file' was not linked with '-export-dynamic'"
 +	  continue
 +	fi
 +
 +	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
++	dir=$func_dirname_result
 +
 +	if test -f "$dir/$objdir/$dlname"; then
 +	  func_append dir "/$objdir"
 +	else
 +	  if test ! -f "$dir/$dlname"; then
-+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
++	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 +	  fi
 +	fi
 +	;;
@@ -28442,18 +30716,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      *.lo)
 +	# Just add the directory containing the .lo file.
 +	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
++	dir=$func_dirname_result
 +	;;
 +
 +      *)
-+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
++	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 +	continue
 +	;;
 +      esac
 +
 +      # Get the absolute pathname.
 +      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
++      test -n "$absdir" && dir=$absdir
 +
 +      # Now add the directory to shlibpath_var.
 +      if eval "test -z \"\$$shlibpath_var\""; then
@@ -28465,7 +30739,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    # This variable tells wrapper scripts just to set shlibpath_var
 +    # rather than running their programs.
-+    libtool_execute_magic="$magic"
++    libtool_execute_magic=$magic
 +
 +    # Check if any of the arguments is a wrapper script.
 +    args=
@@ -28478,12 +30752,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if func_ltwrapper_script_p "$file"; then
 +	  func_source "$file"
 +	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
++	  file=$progdir/$program
 +	elif func_ltwrapper_executable_p "$file"; then
 +	  func_ltwrapper_scriptname "$file"
 +	  func_source "$func_ltwrapper_scriptname_result"
 +	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
++	  file=$progdir/$program
 +	fi
 +	;;
 +      esac
@@ -28491,7 +30765,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_append_quoted args "$file"
 +    done
 +
-+    if test "X$opt_dry_run" = Xfalse; then
++    if $opt_dry_run; then
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
++	echo "export $shlibpath_var"
++      fi
++      $ECHO "$cmd$args"
++      exit $EXIT_SUCCESS
++    else
 +      if test -n "$shlibpath_var"; then
 +	# Export the shlibpath_var.
 +	eval "export $shlibpath_var"
@@ -28508,25 +30790,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      done
 +
 +      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-+	echo "export $shlibpath_var"
-+      fi
-+      $ECHO "$cmd$args"
-+      exit $EXIT_SUCCESS
++      exec_cmd=\$cmd$args
 +    fi
 +}
 +
-+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
++test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 +
 +
 +# func_mode_finish arg...
 +func_mode_finish ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    libs=
 +    libdirs=
 +    admincmds=
@@ -28540,11 +30815,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if func_lalib_unsafe_p "$opt"; then
 +	  func_append libs " $opt"
 +	else
-+	  func_warning "\`$opt' is not a valid libtool archive"
++	  func_warning "'$opt' is not a valid libtool archive"
 +	fi
 +
 +      else
-+	func_fatal_error "invalid argument \`$opt'"
++	func_fatal_error "invalid argument '$opt'"
 +      fi
 +    done
 +
@@ -28559,12 +30834,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # Remove sysroot references
 +      if $opt_dry_run; then
 +        for lib in $libs; do
-+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
++          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
 +        done
 +      else
 +        tmpdir=`func_mktempdir`
 +        for lib in $libs; do
-+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
++	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 +	    > $tmpdir/tmp-la
 +	  mv -f $tmpdir/tmp-la $lib
 +	done
@@ -28589,7 +30864,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    fi
 +
 +    # Exit here if they wanted silent mode.
-+    $opt_silent && exit $EXIT_SUCCESS
++    $opt_quiet && exit $EXIT_SUCCESS
 +
 +    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 +      echo "----------------------------------------------------------------------"
@@ -28600,27 +30875,27 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      echo
 +      echo "If you ever happen to want to link against installed libraries"
 +      echo "in a given directory, LIBDIR, you must either use libtool, and"
-+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
 +      echo "flag during linking and do at least one of the following:"
 +      if test -n "$shlibpath_var"; then
-+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
 +	echo "     during execution"
 +      fi
 +      if test -n "$runpath_var"; then
-+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++	echo "   - add LIBDIR to the '$runpath_var' environment variable"
 +	echo "     during linking"
 +      fi
 +      if test -n "$hardcode_libdir_flag_spec"; then
 +	libdir=LIBDIR
 +	eval flag=\"$hardcode_libdir_flag_spec\"
 +
-+	$ECHO "   - use the \`$flag' linker flag"
++	$ECHO "   - use the '$flag' linker flag"
 +      fi
 +      if test -n "$admincmds"; then
 +	$ECHO "   - have your system administrator run these commands:$admincmds"
 +      fi
 +      if test -f /etc/ld.so.conf; then
-+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
 +      fi
 +      echo
 +
@@ -28639,18 +30914,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    exit $EXIT_SUCCESS
 +}
 +
-+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
++test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 +
 +
 +# func_mode_install arg...
 +func_mode_install ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    # There may be an optional sh(1) argument at the beginning of
 +    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
 +       # Allow the use of GNU shtool's install command.
-+       case $nonopt in *shtool*) :;; *) false;; esac; then
++       case $nonopt in *shtool*) :;; *) false;; esac
++    then
 +      # Aesthetically quote it.
 +      func_quote_for_eval "$nonopt"
 +      install_prog="$func_quote_for_eval_result "
@@ -28677,7 +30954,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    opts=
 +    prev=
 +    install_type=
-+    isdir=no
++    isdir=false
 +    stripme=
 +    no_mode=:
 +    for arg
@@ -28690,7 +30967,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      fi
 +
 +      case $arg in
-+      -d) isdir=yes ;;
++      -d) isdir=: ;;
 +      -f)
 +	if $install_cp; then :; else
 +	  prev=$arg
@@ -28708,7 +30985,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      *)
 +	# If the previous option needed an argument, then skip it.
 +	if test -n "$prev"; then
-+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
++	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
 +	    arg2=$install_override_mode
 +	    no_mode=false
 +	  fi
@@ -28733,7 +31010,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_fatal_help "you must specify an install program"
 +
 +    test -n "$prev" && \
-+      func_fatal_help "the \`$prev' option requires an argument"
++      func_fatal_help "the '$prev' option requires an argument"
 +
 +    if test -n "$install_override_mode" && $no_mode; then
 +      if $install_cp; then :; else
@@ -28755,19 +31032,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    dest=$func_stripname_result
 +
 +    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
++    test -d "$dest" && isdir=:
++    if $isdir; then
++      destdir=$dest
 +      destname=
 +    else
 +      func_dirname_and_basename "$dest" "" "."
-+      destdir="$func_dirname_result"
-+      destname="$func_basename_result"
++      destdir=$func_dirname_result
++      destname=$func_basename_result
 +
 +      # Not a directory, so check to see that there is only one file specified.
 +      set dummy $files; shift
 +      test "$#" -gt 1 && \
-+	func_fatal_help "\`$dest' is not a directory"
++	func_fatal_help "'$dest' is not a directory"
 +    fi
 +    case $destdir in
 +    [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -28776,7 +31053,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	case $file in
 +	*.lo) ;;
 +	*)
-+	  func_fatal_help "\`$destdir' must be an absolute directory name"
++	  func_fatal_help "'$destdir' must be an absolute directory name"
 +	  ;;
 +	esac
 +      done
@@ -28785,7 +31062,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    # This variable tells wrapper scripts just to set variables rather
 +    # than running their programs.
-+    libtool_install_magic="$magic"
++    libtool_install_magic=$magic
 +
 +    staticlibs=
 +    future_libdirs=
@@ -28805,7 +31082,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$file' is not a valid libtool archive"
++	  || func_fatal_help "'$file' is not a valid libtool archive"
 +
 +	library_names=
 +	old_library=
@@ -28827,7 +31104,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	func_dirname "$file" "/" ""
-+	dir="$func_dirname_result"
++	dir=$func_dirname_result
 +	func_append dir "$objdir"
 +
 +	if test -n "$relink_command"; then
@@ -28841,7 +31118,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  # are installed into $libdir/../bin (currently, that works fine)
 +	  # but it's something to keep an eye on.
 +	  test "$inst_prefix_dir" = "$destdir" && \
-+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 +
 +	  if test -n "$inst_prefix_dir"; then
 +	    # Stick the inst_prefix_dir data into the link command.
@@ -28850,29 +31127,36 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 +	  fi
 +
-+	  func_warning "relinking \`$file'"
++	  func_warning "relinking '$file'"
 +	  func_show_eval "$relink_command" \
-+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
++	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 +	fi
 +
 +	# See the names of the shared library.
 +	set dummy $library_names; shift
 +	if test -n "$1"; then
-+	  realname="$1"
++	  realname=$1
 +	  shift
 +
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
++	  srcname=$realname
++	  test -n "$relink_command" && srcname=${realname}T
 +
 +	  # Install the shared library and build the symlinks.
 +	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 +	      'exit $?'
-+	  tstripme="$stripme"
++	  tstripme=$stripme
 +	  case $host_os in
 +	  cygwin* | mingw* | pw32* | cegcc*)
 +	    case $realname in
 +	    *.dll.a)
-+	      tstripme=""
++	      tstripme=
++	      ;;
++	    esac
++	    ;;
++	  os2*)
++	    case $realname in
++	    *_dll.a)
++	      tstripme=
 +	      ;;
 +	    esac
 +	    ;;
@@ -28883,7 +31167,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	  if test "$#" -gt 0; then
 +	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 +	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 +	    # so we also need to try rm && ln -s.
 +	    for linkname
@@ -28894,14 +31178,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  fi
 +
 +	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
++	  lib=$destdir/$realname
 +	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 +	fi
 +
 +	# Install the pseudo-library for information purposes.
 +	func_basename "$file"
-+	name="$func_basename_result"
-+	instname="$dir/$name"i
++	name=$func_basename_result
++	instname=$dir/${name}i
 +	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 +
 +	# Maybe install the static library, too.
@@ -28913,11 +31197,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	# Figure out destination file name, if it wasn't already specified.
 +	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
++	  destfile=$destdir/$destname
 +	else
 +	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
++	  destfile=$func_basename_result
++	  destfile=$destdir/$destfile
 +	fi
 +
 +	# Deduce the name of the destination old-style object file.
@@ -28927,11 +31211,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  staticdest=$func_lo2o_result
 +	  ;;
 +	*.$objext)
-+	  staticdest="$destfile"
++	  staticdest=$destfile
 +	  destfile=
 +	  ;;
 +	*)
-+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
++	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 +	  ;;
 +	esac
 +
@@ -28940,7 +31224,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 +
 +	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
++	if test yes = "$build_old_libs"; then
 +	  # Deduce the name of the old-style object file.
 +	  func_lo2o "$file"
 +	  staticobj=$func_lo2o_result
@@ -28952,23 +31236,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      *)
 +	# Figure out destination file name, if it wasn't already specified.
 +	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
++	  destfile=$destdir/$destname
 +	else
 +	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
++	  destfile=$func_basename_result
++	  destfile=$destdir/$destfile
 +	fi
 +
 +	# If the file is missing, and there is a .exe on the end, strip it
 +	# because it is most likely a libtool script we actually want to
 +	# install
-+	stripped_ext=""
++	stripped_ext=
 +	case $file in
 +	  *.exe)
 +	    if test ! -f "$file"; then
 +	      func_stripname '' '.exe' "$file"
 +	      file=$func_stripname_result
-+	      stripped_ext=".exe"
++	      stripped_ext=.exe
 +	    fi
 +	    ;;
 +	esac
@@ -28996,19 +31280,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	  # Check the variables that should have been set.
 +	  test -z "$generated_by_libtool_version" && \
-+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
++	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
 +
-+	  finalize=yes
++	  finalize=:
 +	  for lib in $notinst_deplibs; do
 +	    # Check to see that each library is installed.
 +	    libdir=
 +	    if test -f "$lib"; then
 +	      func_source "$lib"
 +	    fi
-+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
++	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 +	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      func_warning "\`$lib' has not been installed in \`$libdir'"
-+	      finalize=no
++	      func_warning "'$lib' has not been installed in '$libdir'"
++	      finalize=false
 +	    fi
 +	  done
 +
@@ -29016,29 +31300,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  func_source "$wrapper"
 +
 +	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
++	  if test no = "$fast_install" && test -n "$relink_command"; then
 +	    $opt_dry_run || {
-+	      if test "$finalize" = yes; then
++	      if $finalize; then
 +	        tmpdir=`func_mktempdir`
 +		func_basename "$file$stripped_ext"
-+		file="$func_basename_result"
-+	        outputname="$tmpdir/$file"
++		file=$func_basename_result
++	        outputname=$tmpdir/$file
 +	        # Replace the output file specification.
 +	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 +
-+	        $opt_silent || {
++	        $opt_quiet || {
 +	          func_quote_for_expand "$relink_command"
 +		  eval "func_echo $func_quote_for_expand_result"
 +	        }
 +	        if eval "$relink_command"; then :
 +	          else
-+		  func_error "error: relink \`$file' with the above command before installing it"
++		  func_error "error: relink '$file' with the above command before installing it"
 +		  $opt_dry_run || ${RM}r "$tmpdir"
 +		  continue
 +	        fi
-+	        file="$outputname"
++	        file=$outputname
 +	      else
-+	        func_warning "cannot relink \`$file'"
++	        func_warning "cannot relink '$file'"
 +	      fi
 +	    }
 +	  else
@@ -29075,10 +31359,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    for file in $staticlibs; do
 +      func_basename "$file"
-+      name="$func_basename_result"
++      name=$func_basename_result
 +
 +      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
++      oldlib=$destdir/$name
 +      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
 +      tool_oldlib=$func_to_tool_file_result
 +
@@ -29093,18 +31377,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    done
 +
 +    test -n "$future_libdirs" && \
-+      func_warning "remember to run \`$progname --finish$future_libdirs'"
++      func_warning "remember to run '$progname --finish$future_libdirs'"
 +
 +    if test -n "$current_libdirs"; then
 +      # Maybe just do a dry run.
 +      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
++      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
 +    else
 +      exit $EXIT_SUCCESS
 +    fi
 +}
 +
-+test "$opt_mode" = install && func_mode_install ${1+"$@"}
++test install = "$opt_mode" && func_mode_install ${1+"$@"}
 +
 +
 +# func_generate_dlsyms outputname originator pic_p
@@ -29112,16 +31396,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# a dlpreopen symbol table.
 +func_generate_dlsyms ()
 +{
-+    $opt_debug
-+    my_outputname="$1"
-+    my_originator="$2"
-+    my_pic_p="${3-no}"
-+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
++    $debug_cmd
++
++    my_outputname=$1
++    my_originator=$2
++    my_pic_p=${3-false}
++    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
 +    my_dlsyms=
 +
-+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
 +      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	my_dlsyms="${my_outputname}S.c"
++	my_dlsyms=${my_outputname}S.c
 +      else
 +	func_error "not configured to extract global symbols from dlpreopened files"
 +      fi
@@ -29132,7 +31417,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      "") ;;
 +      *.c)
 +	# Discover the nlist of each of the dlfiles.
-+	nlist="$output_objdir/${my_outputname}.nm"
++	nlist=$output_objdir/$my_outputname.nm
 +
 +	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 +
@@ -29140,34 +31425,36 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_verbose "creating $output_objdir/$my_dlsyms"
 +
 +	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
++/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 +
 +#ifdef __cplusplus
 +extern \"C\" {
 +#endif
 +
-+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 +#endif
 +
 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
++/* DATA imports from DLLs on WIN32 can't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT_DLSYM_CONST
-+#elif defined(__osf__)
++#elif defined __osf__
 +/* This system does not cope well with relocations in const data.  */
 +# define LT_DLSYM_CONST
 +#else
 +# define LT_DLSYM_CONST const
 +#endif
 +
++#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
++
 +/* External symbol declarations for the compiler. */\
 +"
 +
-+	if test "$dlself" = yes; then
-+	  func_verbose "generating symbol list for \`$output'"
++	if test yes = "$dlself"; then
++	  func_verbose "generating symbol list for '$output'"
 +
 +	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 +
@@ -29175,7 +31462,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	  for progfile in $progfiles; do
 +	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
++	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
 +	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 +	  done
 +
@@ -29195,10 +31482,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	  # Prepare the list of exported symbols
 +	  if test -z "$export_symbols"; then
-+	    export_symbols="$output_objdir/$outputname.exp"
++	    export_symbols=$output_objdir/$outputname.exp
 +	    $opt_dry_run || {
 +	      $RM $export_symbols
-+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 +	      case $host in
 +	      *cygwin* | *mingw* | *cegcc* )
 +                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -29208,7 +31495,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    }
 +	  else
 +	    $opt_dry_run || {
-+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 +	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 +	      eval '$MV "$nlist"T "$nlist"'
 +	      case $host in
@@ -29222,22 +31509,22 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	for dlprefile in $dlprefiles; do
-+	  func_verbose "extracting global C symbols from \`$dlprefile'"
++	  func_verbose "extracting global C symbols from '$dlprefile'"
 +	  func_basename "$dlprefile"
-+	  name="$func_basename_result"
++	  name=$func_basename_result
 +          case $host in
 +	    *cygwin* | *mingw* | *cegcc* )
 +	      # if an import library, we need to obtain dlname
 +	      if func_win32_import_lib_p "$dlprefile"; then
 +	        func_tr_sh "$dlprefile"
 +	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-+	        dlprefile_dlbasename=""
++	        dlprefile_dlbasename=
 +	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 +	          # Use subshell, to avoid clobbering current variable values
 +	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-+	          if test -n "$dlprefile_dlname" ; then
++	          if test -n "$dlprefile_dlname"; then
 +	            func_basename "$dlprefile_dlname"
-+	            dlprefile_dlbasename="$func_basename_result"
++	            dlprefile_dlbasename=$func_basename_result
 +	          else
 +	            # no lafile. user explicitly requested -dlpreopen <import library>.
 +	            $sharedlib_from_linklib_cmd "$dlprefile"
@@ -29245,7 +31532,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	          fi
 +	        fi
 +	        $opt_dry_run || {
-+	          if test -n "$dlprefile_dlbasename" ; then
++	          if test -n "$dlprefile_dlbasename"; then
 +	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 +	          else
 +	            func_warning "Could not compute DLL name from $name"
@@ -29301,6 +31588,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 +	  fi
 +
++	  func_show_eval '$RM "${nlist}I"'
++	  if test -n "$global_symbol_to_import"; then
++	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
++	  fi
++
 +	  echo >> "$output_objdir/$my_dlsyms" "\
 +
 +/* The mapping between symbol names and symbols.  */
@@ -29309,11 +31601,30 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  void *address;
 +} lt_dlsymlist;
 +extern LT_DLSYM_CONST lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[];
++lt_${my_prefix}_LTX_preloaded_symbols[];\
++"
++
++	  if test -s "$nlist"I; then
++	    echo >> "$output_objdir/$my_dlsyms" "\
++static void lt_syminit(void)
++{
++  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
++  for (; symbol->name; ++symbol)
++    {"
++	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
++	    echo >> "$output_objdir/$my_dlsyms" "\
++    }
++}"
++	  fi
++	  echo >> "$output_objdir/$my_dlsyms" "\
 +LT_DLSYM_CONST lt_dlsymlist
 +lt_${my_prefix}_LTX_preloaded_symbols[] =
-+{\
-+  { \"$my_originator\", (void *) 0 },"
++{ {\"$my_originator\", (void *) 0},"
++
++	  if test -s "$nlist"I; then
++	    echo >> "$output_objdir/$my_dlsyms" "\
++  {\"@INIT@\", (void *) &lt_syminit},"
++	  fi
 +
 +	  case $need_lib_prefix in
 +	  no)
@@ -29355,9 +31666,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  *-*-hpux*)
 +	    pic_flag_for_symtable=" $pic_flag"  ;;
 +	  *)
-+	    if test "X$my_pic_p" != Xno; then
-+	      pic_flag_for_symtable=" $pic_flag"
-+	    fi
++	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 +	    ;;
 +	  esac
 +	  ;;
@@ -29374,10 +31683,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 +
 +	# Clean up the generated files.
-+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
++	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 +
 +	# Transform the symbol file into the correct name.
-+	symfileobj="$output_objdir/${my_outputname}S.$objext"
++	symfileobj=$output_objdir/${my_outputname}S.$objext
 +	case $host in
 +	*cygwin* | *mingw* | *cegcc* )
 +	  if test -f "$output_objdir/$my_outputname.def"; then
@@ -29395,7 +31704,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	esac
 +	;;
 +      *)
-+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
++	func_fatal_error "unknown suffix for '$my_dlsyms'"
 +	;;
 +      esac
 +    else
@@ -29409,6 +31718,32 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    fi
 +}
 +
++# func_cygming_gnu_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is a GNU/binutils-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_gnu_implib_p ()
++{
++  $debug_cmd
++
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
++  test -n "$func_cygming_gnu_implib_tmp"
++}
++
++# func_cygming_ms_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is an MS-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_ms_implib_p ()
++{
++  $debug_cmd
++
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
++  test -n "$func_cygming_ms_implib_tmp"
++}
++
 +# func_win32_libid arg
 +# return the library type of file 'arg'
 +#
@@ -29418,8 +31753,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# Despite the name, also deal with 64 bit binaries.
 +func_win32_libid ()
 +{
-+  $opt_debug
-+  win32_libid_type="unknown"
++  $debug_cmd
++
++  win32_libid_type=unknown
 +  win32_fileres=`file -L $1 2>/dev/null`
 +  case $win32_fileres in
 +  *ar\ archive\ import\ library*) # definitely import
@@ -29429,16 +31765,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
 +    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
 +       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-+      func_to_tool_file "$1" func_convert_file_msys_to_w32
-+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-+	$SED -n -e '
++      case $nm_interface in
++      "MS dumpbin")
++	if func_cygming_ms_implib_p "$1" ||
++	   func_cygming_gnu_implib_p "$1"
++	then
++	  win32_nmres=import
++	else
++	  win32_nmres=
++	fi
++	;;
++      *)
++	func_to_tool_file "$1" func_convert_file_msys_to_w32
++	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
++	  $SED -n -e '
 +	    1,100{
 +		/ I /{
-+		    s,.*,import,
++		    s|.*|import|
 +		    p
 +		    q
 +		}
 +	    }'`
++	;;
++      esac
 +      case $win32_nmres in
 +      import*)  win32_libid_type="x86 archive import";;
 +      *)        win32_libid_type="x86 archive static";;
@@ -29470,7 +31819,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#    $sharedlib_from_linklib_result
 +func_cygming_dll_for_implib ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 +}
 +
@@ -29487,7 +31837,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# specified import library.
 +func_cygming_dll_for_implib_fallback_core ()
 +{
-+  $opt_debug
++  $debug_cmd
++
 +  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
 +  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
 +    $SED '/^Contents of section '"$match_literal"':/{
@@ -29523,8 +31874,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      /./p' |
 +    # we now have a list, one entry per line, of the stringified
 +    # contents of the appropriate section of all members of the
-+    # archive which possess that section. Heuristic: eliminate
-+    # all those which have a first or second character that is
++    # archive that possess that section. Heuristic: eliminate
++    # all those that have a first or second character that is
 +    # a '.' (that is, objdump's representation of an unprintable
 +    # character.) This should work for all archives with less than
 +    # 0x302f exports -- but will fail for DLLs whose name actually
@@ -29535,30 +31886,6 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    $SED -e '/^\./d;/^.\./d;q'
 +}
 +
-+# func_cygming_gnu_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is a GNU/binutils-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_gnu_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-+  test -n "$func_cygming_gnu_implib_tmp"
-+}
-+
-+# func_cygming_ms_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is an MS-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_ms_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-+  test -n "$func_cygming_ms_implib_tmp"
-+}
-+
 +# func_cygming_dll_for_implib_fallback ARG
 +# Platform-specific function to extract the
 +# name of the DLL associated with the specified
@@ -29572,16 +31899,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#    $sharedlib_from_linklib_result
 +func_cygming_dll_for_implib_fallback ()
 +{
-+  $opt_debug
-+  if func_cygming_gnu_implib_p "$1" ; then
++  $debug_cmd
++
++  if func_cygming_gnu_implib_p "$1"; then
 +    # binutils import library
 +    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-+  elif func_cygming_ms_implib_p "$1" ; then
++  elif func_cygming_ms_implib_p "$1"; then
 +    # ms-generated import library
 +    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
 +  else
 +    # unknown
-+    sharedlib_from_linklib_result=""
++    sharedlib_from_linklib_result=
 +  fi
 +}
 +
@@ -29589,10 +31917,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_extract_an_archive dir oldlib
 +func_extract_an_archive ()
 +{
-+    $opt_debug
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+    if test "$lock_old_archive_extraction" = yes; then
++    $debug_cmd
++
++    f_ex_an_ar_dir=$1; shift
++    f_ex_an_ar_oldlib=$1
++    if test yes = "$lock_old_archive_extraction"; then
 +      lockfile=$f_ex_an_ar_oldlib.lock
 +      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 +	func_echo "Waiting for $lockfile to be removed"
@@ -29601,7 +31930,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    fi
 +    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 +		   'stat=$?; rm -f "$lockfile"; exit $stat'
-+    if test "$lock_old_archive_extraction" = yes; then
++    if test yes = "$lock_old_archive_extraction"; then
 +      $opt_dry_run || rm -f "$lockfile"
 +    fi
 +    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -29615,22 +31944,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# func_extract_archives gentop oldlib ...
 +func_extract_archives ()
 +{
-+    $opt_debug
-+    my_gentop="$1"; shift
++    $debug_cmd
++
++    my_gentop=$1; shift
 +    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
++    my_oldobjs=
++    my_xlib=
++    my_xabs=
++    my_xdir=
 +
 +    for my_xlib in $my_oldlibs; do
 +      # Extract the objects.
 +      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
 +	*) my_xabs=`pwd`"/$my_xlib" ;;
 +      esac
 +      func_basename "$my_xlib"
-+      my_xlib="$func_basename_result"
++      my_xlib=$func_basename_result
 +      my_xlib_u=$my_xlib
 +      while :; do
 +        case " $extracted_archives " in
@@ -29642,7 +31972,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	esac
 +      done
 +      extracted_archives="$extracted_archives $my_xlib_u"
-+      my_xdir="$my_gentop/$my_xlib_u"
++      my_xdir=$my_gentop/$my_xlib_u
 +
 +      func_mkdir_p "$my_xdir"
 +
@@ -29655,22 +31985,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  cd $my_xdir || exit $?
 +	  darwin_archive=$my_xabs
 +	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`basename "$darwin_archive"`
++	  func_basename "$darwin_archive"
++	  darwin_base_archive=$func_basename_result
 +	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 +	  if test -n "$darwin_arches"; then
 +	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 +	    darwin_arch=
 +	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	    for darwin_arch in  $darwin_arches; do
++	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
++	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
++	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
++	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 +	      cd "$darwin_curdir"
-+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 +	    done # $darwin_arches
 +            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 +	    darwin_file=
 +	    darwin_files=
 +	    for darwin_file in $darwin_filelist; do
@@ -29692,7 +32023,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
 +    done
 +
-+    func_extract_archives_result="$my_oldobjs"
++    func_extract_archives_result=$my_oldobjs
 +}
 +
 +
@@ -29707,7 +32038,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#
 +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 +# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
++# will assume that the directory where it is stored is
 +# the $objdir directory.  This is a cygwin/mingw-specific
 +# behavior.
 +func_emit_wrapper ()
@@ -29718,7 +32049,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#! $SHELL
 +
 +# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 +#
 +# The $output program cannot be directly executed until all the libtool
 +# libraries that it depends on are installed.
@@ -29775,9 +32106,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +# Very basic option parsing. These options are (a) specific to
 +# the libtool wrapper, (b) are identical between the wrapper
-+# /script/ and the wrapper /executable/ which is used only on
++# /script/ and the wrapper /executable/ that is used only on
 +# windows platforms, and (c) all begin with the string "--lt-"
-+# (application programs are unlikely to have options which match
++# (application programs are unlikely to have options that match
 +# this pattern).
 +#
 +# There are only two supported options: --lt-debug and
@@ -29810,7 +32141,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +  # Print the debug banner immediately:
 +  if test -n \"\$lt_option_debug\"; then
-+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
++    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
 +  fi
 +}
 +
@@ -29821,7 +32152,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  lt_dump_args_N=1;
 +  for lt_arg
 +  do
-+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
++    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
 +    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
 +  done
 +}
@@ -29835,7 +32166,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  *-*-mingw | *-*-os2* | *-cegcc*)
 +    $ECHO "\
 +      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
++        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
 +        func_lt_dump_args \${1+\"\$@\"} 1>&2
 +      fi
 +      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -29845,7 +32176,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  *)
 +    $ECHO "\
 +      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
++        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
 +        func_lt_dump_args \${1+\"\$@\"} 1>&2
 +      fi
 +      exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -29920,13 +32251,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  test -n \"\$absdir\" && thisdir=\"\$absdir\"
 +"
 +
-+	if test "$fast_install" = yes; then
++	if test yes = "$fast_install"; then
 +	  $ECHO "\
 +  program=lt-'$outputname'$exeext
 +  progdir=\"\$thisdir/$objdir\"
 +
 +  if test ! -f \"\$progdir/\$program\" ||
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
 +       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 +
 +    file=\"\$\$-\$program\"
@@ -29943,7 +32274,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    if test -n \"\$relink_command\"; then
 +      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
 +      else
-+	$ECHO \"\$relink_command_output\" >&2
++	\$ECHO \"\$relink_command_output\" >&2
 +	$RM \"\$progdir/\$file\"
 +	exit 1
 +      fi
@@ -29978,7 +32309,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 +	  $ECHO "\
 +    # Add our own library path to $shlibpath_var
 +    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -29998,7 +32329,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    fi
 +  else
 +    # The program doesn't exist.
-+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
++    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
 +    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
 +    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
 +    exit 1
@@ -30017,7 +32348,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	cat <<EOF
 +
 +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 +
 +   The $output program cannot be directly executed until all the libtool
 +   libraries that it depends on are installed.
@@ -30052,47 +32383,45 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +#include <fcntl.h>
 +#include <sys/stat.h>
 +
++#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
++
 +/* declarations of non-ANSI functions */
-+#if defined(__MINGW32__)
++#if defined __MINGW32__
 +# ifdef __STRICT_ANSI__
 +int _putenv (const char *);
 +# endif
-+#elif defined(__CYGWIN__)
++#elif defined __CYGWIN__
 +# ifdef __STRICT_ANSI__
 +char *realpath (const char *, char *);
 +int putenv (char *);
 +int setenv (const char *, const char *, int);
 +# endif
-+/* #elif defined (other platforms) ... */
++/* #elif defined other_platform || defined ... */
 +#endif
 +
 +/* portability defines, excluding path handling macros */
-+#if defined(_MSC_VER)
++#if defined _MSC_VER
 +# define setmode _setmode
 +# define stat    _stat
 +# define chmod   _chmod
 +# define getcwd  _getcwd
 +# define putenv  _putenv
 +# define S_IXUSR _S_IEXEC
-+# ifndef _INTPTR_T_DEFINED
-+#  define _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#elif defined(__MINGW32__)
++#elif defined __MINGW32__
 +# define setmode _setmode
 +# define stat    _stat
 +# define chmod   _chmod
 +# define getcwd  _getcwd
 +# define putenv  _putenv
-+#elif defined(__CYGWIN__)
++#elif defined __CYGWIN__
 +# define HAVE_SETENV
 +# define FOPEN_WB "wb"
-+/* #elif defined (other platforms) ... */
++/* #elif defined other platforms ... */
 +#endif
 +
-+#if defined(PATH_MAX)
++#if defined PATH_MAX
 +# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
++#elif defined MAXPATHLEN
 +# define LT_PATHMAX MAXPATHLEN
 +#else
 +# define LT_PATHMAX 1024
@@ -30111,8 +32440,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# define PATH_SEPARATOR ':'
 +#endif
 +
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+  defined (__OS2__)
++#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
++  defined __OS2__
 +# define HAVE_DOS_BASED_FILE_SYSTEM
 +# define FOPEN_WB "wb"
 +# ifndef DIR_SEPARATOR_2
@@ -30145,10 +32474,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 +#define XFREE(stale) do { \
-+  if (stale) { free ((void *) stale); stale = 0; } \
++  if (stale) { free (stale); stale = 0; } \
 +} while (0)
 +
-+#if defined(LT_DEBUGWRAPPER)
++#if defined LT_DEBUGWRAPPER
 +static int lt_debug = 1;
 +#else
 +static int lt_debug = 0;
@@ -30177,11 +32506,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +EOF
 +
 +	    cat <<EOF
-+volatile const char * MAGIC_EXE = "$magic_exe";
++#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
++# define externally_visible volatile
++#else
++# define externally_visible __attribute__((externally_visible)) volatile
++#endif
++externally_visible const char * MAGIC_EXE = "$magic_exe";
 +const char * LIB_PATH_VARNAME = "$shlibpath_var";
 +EOF
 +
-+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 +              func_to_host_path "$temp_rpath"
 +	      cat <<EOF
 +const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
@@ -30205,7 +32539,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +EOF
 +	    fi
 +
-+	    if test "$fast_install" = yes; then
++	    if test yes = "$fast_install"; then
 +	      cat <<EOF
 +const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 +EOF
@@ -30234,12 +32568,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  char *actual_cwrapper_name;
 +  char *target_name;
 +  char *lt_argv_zero;
-+  intptr_t rval = 127;
++  int rval = 127;
 +
 +  int i;
 +
 +  program_name = (char *) xstrdup (base_name (argv[0]));
-+  newargz = XMALLOC (char *, argc + 1);
++  newargz = XMALLOC (char *, (size_t) argc + 1);
 +
 +  /* very simple arg parsing; don't want to rely on getopt
 +   * also, copy all non cwrapper options to newargz, except
@@ -30248,10 +32582,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  newargc=0;
 +  for (i = 1; i < argc; i++)
 +    {
-+      if (strcmp (argv[i], dumpscript_opt) == 0)
++      if (STREQ (argv[i], dumpscript_opt))
 +	{
 +EOF
-+	    case "$host" in
++	    case $host in
 +	      *mingw* | *cygwin* )
 +		# make stdout use "unix" line endings
 +		echo "          setmode(1,_O_BINARY);"
@@ -30262,12 +32596,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  lt_dump_script (stdout);
 +	  return 0;
 +	}
-+      if (strcmp (argv[i], debug_opt) == 0)
++      if (STREQ (argv[i], debug_opt))
 +	{
 +          lt_debug = 1;
 +          continue;
 +	}
-+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
++      if (STREQ (argv[i], ltwrapper_option_prefix))
 +        {
 +          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
 +             namespace, but it is not one of the ones we know about and
@@ -30290,7 +32624,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +EOF
 +	    cat <<EOF
 +  /* The GNU banner must be the first non-error debug message */
-+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
++  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 +EOF
 +	    cat <<"EOF"
 +  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -30401,7 +32735,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		cat <<"EOF"
 +  /* execv doesn't actually work on mingw as expected on unix */
 +  newargz = prepare_spawn (newargz);
-+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
 +  if (rval == -1)
 +    {
 +      /* failed to start process */
@@ -30446,7 +32780,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +{
 +  const char *base;
 +
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++#if defined HAVE_DOS_BASED_FILE_SYSTEM
 +  /* Skip over the disk name in MSDOS pathnames. */
 +  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
 +    name += 2;
@@ -30505,7 +32839,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  const char *p_next;
 +  /* static buffer for getcwd */
 +  char tmp[LT_PATHMAX + 1];
-+  int tmp_len;
++  size_t tmp_len;
 +  char *concat_name;
 +
 +  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -30515,7 +32849,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    return NULL;
 +
 +  /* Absolute path? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++#if defined HAVE_DOS_BASED_FILE_SYSTEM
 +  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
 +    {
 +      concat_name = xstrdup (wrapper);
@@ -30533,7 +32867,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    return concat_name;
 +	  XFREE (concat_name);
 +	}
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++#if defined HAVE_DOS_BASED_FILE_SYSTEM
 +    }
 +#endif
 +
@@ -30556,7 +32890,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      for (q = p; *q; q++)
 +		if (IS_PATH_SEPARATOR (*q))
 +		  break;
-+	      p_len = q - p;
++	      p_len = (size_t) (q - p);
 +	      p_next = (*q == '\0' ? q : q + 1);
 +	      if (p_len == 0)
 +		{
@@ -30675,7 +33009,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  if (patlen <= len)
 +    {
 +      str += len - patlen;
-+      if (strcmp (str, pat) == 0)
++      if (STREQ (str, pat))
 +	*str = '\0';
 +    }
 +  return str;
@@ -30740,7 +33074,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    char *str = xstrdup (value);
 +    setenv (name, str, 1);
 +#else
-+    int len = strlen (name) + 1 + strlen (value) + 1;
++    size_t len = strlen (name) + 1 + strlen (value) + 1;
 +    char *str = XMALLOC (char, len);
 +    sprintf (str, "%s=%s", name, value);
 +    if (putenv (str) != EXIT_SUCCESS)
@@ -30757,8 +33091,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +  char *new_value;
 +  if (orig_value && *orig_value)
 +    {
-+      int orig_value_len = strlen (orig_value);
-+      int add_len = strlen (add);
++      size_t orig_value_len = strlen (orig_value);
++      size_t add_len = strlen (add);
 +      new_value = XMALLOC (char, add_len + orig_value_len + 1);
 +      if (to_end)
 +        {
@@ -30789,10 +33123,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    {
 +      char *new_value = lt_extend_str (getenv (name), value, 0);
 +      /* some systems can't cope with a ':'-terminated path #' */
-+      int len = strlen (new_value);
-+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++      size_t len = strlen (new_value);
++      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
 +        {
-+          new_value[len-1] = '\0';
++          new_value[--len] = '\0';
 +        }
 +      lt_setenv (name, new_value);
 +      XFREE (new_value);
@@ -30959,27 +33293,47 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# True if ARG is an import lib, as indicated by $file_magic_cmd
 +func_win32_import_lib_p ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
 +    *import*) : ;;
 +    *) false ;;
 +    esac
 +}
 +
++# func_suncc_cstd_abi
++# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
++# Several compiler flags select an ABI that is incompatible with the
++# Cstd library. Avoid specifying it if any are in CXXFLAGS.
++func_suncc_cstd_abi ()
++{
++    $debug_cmd
++
++    case " $compile_command " in
++    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
++      suncc_use_cstd_abi=no
++      ;;
++    *)
++      suncc_use_cstd_abi=yes
++      ;;
++    esac
++}
++
 +# func_mode_link arg...
 +func_mode_link ()
 +{
-+    $opt_debug
++    $debug_cmd
++
 +    case $host in
 +    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 +      # It is impossible to link a dll without this setting, and
 +      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
++      # what system we are compiling for in order to pass an extra
 +      # flag for every libtool invocation.
 +      # allow_undefined=no
 +
 +      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
++      # to make a dll that has undefined symbols, in which case not
 +      # even a static library is built.  For now, we need to specify
 +      # -no-undefined on the libtool link line when we can be certain
 +      # that all symbols are satisfied, otherwise we get a static library.
@@ -31023,10 +33377,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    module=no
 +    no_install=no
 +    objs=
++    os2dllname=
 +    non_pic_objects=
 +    precious_files_regex=
 +    prefer_static_libs=no
-+    preload=no
++    preload=false
 +    prev=
 +    prevarg=
 +    release=
@@ -31038,7 +33393,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    vinfo=
 +    vinfo_number=no
 +    weak_libs=
-+    single_module="${wl}-single_module"
++    single_module=$wl-single_module
 +    func_infer_tag $base_compile
 +
 +    # We need to know -static, to get the right output filenames.
@@ -31046,15 +33401,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    do
 +      case $arg in
 +      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
++	test yes != "$build_libtool_libs" \
++	  && func_fatal_configuration "cannot build a shared library"
 +	build_old_libs=no
 +	break
 +	;;
 +      -all-static | -static | -static-libtool-libs)
 +	case $arg in
 +	-all-static)
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 +	    func_warning "complete static linking is impossible in this configuration"
 +	  fi
 +	  if test -n "$link_static_flag"; then
@@ -31087,7 +33442,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    # Go through the arguments, transforming them on the way.
 +    while test "$#" -gt 0; do
-+      arg="$1"
++      arg=$1
 +      shift
 +      func_quote_for_eval "$arg"
 +      qarg=$func_quote_for_eval_unquoted_result
@@ -31104,21 +33459,21 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	case $prev in
 +	bindir)
-+	  bindir="$arg"
++	  bindir=$arg
 +	  prev=
 +	  continue
 +	  ;;
 +	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
++	  $preload || {
 +	    # Add the symbol object into the linking commands.
 +	    func_append compile_command " @SYMFILE@"
 +	    func_append finalize_command " @SYMFILE@"
-+	    preload=yes
-+	  fi
++	    preload=:
++	  }
 +	  case $arg in
 +	  *.la | *.lo) ;;  # We handle these cases below.
 +	  force)
-+	    if test "$dlself" = no; then
++	    if test no = "$dlself"; then
 +	      dlself=needless
 +	      export_dynamic=yes
 +	    fi
@@ -31126,9 +33481,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    continue
 +	    ;;
 +	  self)
-+	    if test "$prev" = dlprefiles; then
++	    if test dlprefiles = "$prev"; then
 +	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 +	      dlself=yes
 +	    else
 +	      dlself=needless
@@ -31138,7 +33493,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    continue
 +	    ;;
 +	  *)
-+	    if test "$prev" = dlfiles; then
++	    if test dlfiles = "$prev"; then
 +	      func_append dlfiles " $arg"
 +	    else
 +	      func_append dlprefiles " $arg"
@@ -31149,14 +33504,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  esac
 +	  ;;
 +	expsyms)
-+	  export_symbols="$arg"
++	  export_symbols=$arg
 +	  test -f "$arg" \
-+	    || func_fatal_error "symbol file \`$arg' does not exist"
++	    || func_fatal_error "symbol file '$arg' does not exist"
 +	  prev=
 +	  continue
 +	  ;;
 +	expsyms_regex)
-+	  export_symbols_regex="$arg"
++	  export_symbols_regex=$arg
 +	  prev=
 +	  continue
 +	  ;;
@@ -31174,7 +33529,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  continue
 +	  ;;
 +	inst_prefix)
-+	  inst_prefix_dir="$arg"
++	  inst_prefix_dir=$arg
++	  prev=
++	  continue
++	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
 +	  prev=
 +	  continue
 +	  ;;
@@ -31198,21 +33559,21 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +		if test -z "$pic_object" ||
 +		   test -z "$non_pic_object" ||
-+		   test "$pic_object" = none &&
-+		   test "$non_pic_object" = none; then
-+		  func_fatal_error "cannot find name of object for \`$arg'"
++		   test none = "$pic_object" &&
++		   test none = "$non_pic_object"; then
++		  func_fatal_error "cannot find name of object for '$arg'"
 +		fi
 +
 +		# Extract subdirectory from the argument.
 +		func_dirname "$arg" "/" ""
-+		xdir="$func_dirname_result"
++		xdir=$func_dirname_result
 +
-+		if test "$pic_object" != none; then
++		if test none != "$pic_object"; then
 +		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
++		  pic_object=$xdir$pic_object
 +
-+		  if test "$prev" = dlfiles; then
-+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		  if test dlfiles = "$prev"; then
++		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 +		      func_append dlfiles " $pic_object"
 +		      prev=
 +		      continue
@@ -31223,7 +33584,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		  fi
 +
 +		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
++		  if test dlprefiles = "$prev"; then
 +		    # Preload the old-style object.
 +		    func_append dlprefiles " $pic_object"
 +		    prev=
@@ -31231,23 +33592,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +		  # A PIC object.
 +		  func_append libobjs " $pic_object"
-+		  arg="$pic_object"
++		  arg=$pic_object
 +		fi
 +
 +		# Non-PIC object.
-+		if test "$non_pic_object" != none; then
++		if test none != "$non_pic_object"; then
 +		  # Prepend the subdirectory the object is found in.
-+		  non_pic_object="$xdir$non_pic_object"
++		  non_pic_object=$xdir$non_pic_object
 +
 +		  # A standard non-PIC object
 +		  func_append non_pic_objects " $non_pic_object"
-+		  if test -z "$pic_object" || test "$pic_object" = none ; then
-+		    arg="$non_pic_object"
++		  if test -z "$pic_object" || test none = "$pic_object"; then
++		    arg=$non_pic_object
 +		  fi
 +		else
 +		  # If the PIC object exists, use it instead.
 +		  # $xdir was prepended to $pic_object above.
-+		  non_pic_object="$pic_object"
++		  non_pic_object=$pic_object
 +		  func_append non_pic_objects " $non_pic_object"
 +		fi
 +	      else
@@ -31255,7 +33616,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		if $opt_dry_run; then
 +		  # Extract subdirectory from the argument.
 +		  func_dirname "$arg" "/" ""
-+		  xdir="$func_dirname_result"
++		  xdir=$func_dirname_result
 +
 +		  func_lo2o "$arg"
 +		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -31263,24 +33624,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		  func_append libobjs " $pic_object"
 +		  func_append non_pic_objects " $non_pic_object"
 +	        else
-+		  func_fatal_error "\`$arg' is not a valid libtool object"
++		  func_fatal_error "'$arg' is not a valid libtool object"
 +		fi
 +	      fi
 +	    done
 +	  else
-+	    func_fatal_error "link input file \`$arg' does not exist"
++	    func_fatal_error "link input file '$arg' does not exist"
 +	  fi
 +	  arg=$save_arg
 +	  prev=
 +	  continue
 +	  ;;
++	os2dllname)
++	  os2dllname=$arg
++	  prev=
++	  continue
++	  ;;
 +	precious_regex)
-+	  precious_files_regex="$arg"
++	  precious_files_regex=$arg
 +	  prev=
 +	  continue
 +	  ;;
 +	release)
-+	  release="-$arg"
++	  release=-$arg
 +	  prev=
 +	  continue
 +	  ;;
@@ -31292,7 +33658,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_fatal_error "only absolute run-paths are allowed"
 +	    ;;
 +	  esac
-+	  if test "$prev" = rpath; then
++	  if test rpath = "$prev"; then
 +	    case "$rpath " in
 +	    *" $arg "*) ;;
 +	    *) func_append rpath " $arg" ;;
@@ -31307,7 +33673,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  continue
 +	  ;;
 +	shrext)
-+	  shrext_cmds="$arg"
++	  shrext_cmds=$arg
 +	  prev=
 +	  continue
 +	  ;;
@@ -31347,7 +33713,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	esac
 +      fi # test -n "$prev"
 +
-+      prevarg="$arg"
++      prevarg=$arg
 +
 +      case $arg in
 +      -all-static)
@@ -31361,7 +33727,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +      -allow-undefined)
 +	# FIXME: remove this flag sometime in the future.
-+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
++	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 +	;;
 +
 +      -avoid-version)
@@ -31393,7 +33759,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 +	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 +	fi
-+	if test "X$arg" = "X-export-symbols"; then
++	if test X-export-symbols = "X$arg"; then
 +	  prev=expsyms
 +	else
 +	  prev=expsyms_regex
@@ -31427,9 +33793,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_stripname "-L" '' "$arg"
 +	if test -z "$func_stripname_result"; then
 +	  if test "$#" -gt 0; then
-+	    func_fatal_error "require no space between \`-L' and \`$1'"
++	    func_fatal_error "require no space between '-L' and '$1'"
 +	  else
-+	    func_fatal_error "need path for \`-L' option"
++	    func_fatal_error "need path for '-L' option"
 +	  fi
 +	fi
 +	func_resolve_sysroot "$func_stripname_result"
@@ -31440,8 +33806,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	*)
 +	  absdir=`cd "$dir" && pwd`
 +	  test -z "$absdir" && \
-+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-+	  dir="$absdir"
++	    func_fatal_error "cannot determine absolute directory name of '$dir'"
++	  dir=$absdir
 +	  ;;
 +	esac
 +	case "$deplibs " in
@@ -31476,7 +33842,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	;;
 +
 +      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 +	  case $host in
 +	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 +	    # These systems don't actually have a C or math library (as such)
@@ -31484,11 +33850,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    ;;
 +	  *-*-os2*)
 +	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 +	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
 +	  *-*-rhapsody* | *-*-darwin1.[012])
 +	    # Rhapsody C and math libraries are in the System framework
@@ -31497,16 +33863,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    ;;
 +	  *-*-sco3.2v5* | *-*-sco5v6*)
 +	    # Causes problems with __ctype
-+	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
 +	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 +	    # Compiler inserts libc in the correct place for threads to work
-+	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
 +	  esac
-+	elif test "X$arg" = "X-lc_r"; then
++	elif test X-lc_r = "X$arg"; then
 +	 case $host in
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 +	   # Do not include libc_r directly, use -pthread flag.
 +	   continue
 +	   ;;
@@ -31516,6 +33882,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	continue
 +	;;
 +
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
 +      -module)
 +	module=yes
 +	continue
@@ -31545,7 +33916,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	;;
 +
 +      -multi_module)
-+	single_module="${wl}-multi_module"
++	single_module=$wl-multi_module
 +	continue
 +	;;
 +
@@ -31559,8 +33930,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 +	  # The PATH hackery in wrapper scripts is required on Windows
 +	  # and Darwin in order for the loader to find any dlls it needs.
-+	  func_warning "\`-no-install' is ignored for $host"
-+	  func_warning "assuming \`-no-fast-install' instead"
++	  func_warning "'-no-install' is ignored for $host"
++	  func_warning "assuming '-no-fast-install' instead"
 +	  fast_install=no
 +	  ;;
 +	*) no_install=yes ;;
@@ -31578,6 +33949,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	continue
 +	;;
 +
++      -os2dllname)
++	prev=os2dllname
++	continue
++	;;
++
 +      -o) prev=output ;;
 +
 +      -precious-files-regex)
@@ -31665,14 +34041,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_stripname '-Wc,' '' "$arg"
 +	args=$func_stripname_result
 +	arg=
-+	save_ifs="$IFS"; IFS=','
++	save_ifs=$IFS; IFS=,
 +	for flag in $args; do
-+	  IFS="$save_ifs"
++	  IFS=$save_ifs
 +          func_quote_for_eval "$flag"
 +	  func_append arg " $func_quote_for_eval_result"
 +	  func_append compiler_flags " $func_quote_for_eval_result"
 +	done
-+	IFS="$save_ifs"
++	IFS=$save_ifs
 +	func_stripname ' ' '' "$arg"
 +	arg=$func_stripname_result
 +	;;
@@ -31681,15 +34057,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	func_stripname '-Wl,' '' "$arg"
 +	args=$func_stripname_result
 +	arg=
-+	save_ifs="$IFS"; IFS=','
++	save_ifs=$IFS; IFS=,
 +	for flag in $args; do
-+	  IFS="$save_ifs"
++	  IFS=$save_ifs
 +          func_quote_for_eval "$flag"
 +	  func_append arg " $wl$func_quote_for_eval_result"
 +	  func_append compiler_flags " $wl$func_quote_for_eval_result"
 +	  func_append linker_flags " $func_quote_for_eval_result"
 +	done
-+	IFS="$save_ifs"
++	IFS=$save_ifs
 +	func_stripname ' ' '' "$arg"
 +	arg=$func_stripname_result
 +	;;
@@ -31712,7 +34088,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # -msg_* for osf cc
 +      -msg_*)
 +	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
++	arg=$func_quote_for_eval_result
 +	;;
 +
 +      # Flags to be passed through unchanged, with rationale:
@@ -31724,25 +34100,52 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
 +      # -F/path              path to uninstalled frameworks, gcc on darwin
 +      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
++      # -fstack-protector*   stack protector flags for GCC
 +      # @file                GCC response files
 +      # -tp=*                Portland pgcc target processor selection
 +      # --sysroot=*          for sysroot support
-+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -specs=*             GCC specs files
++      # -stdlib=*            select c++ std lib with clang
++      # -fsanitize=*         Clang/GCC memory and address sanitizer
++      # -fuse-ld=*           Linker select flags for GCC
++      # -static-*            direct GCC to link specific libraries statically
++      # -fcilkplus           Cilk Plus language extension features for C/C++
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 +      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
 +        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
++	arg=$func_quote_for_eval_result
 +        func_append compile_command " $arg"
 +        func_append finalize_command " $arg"
 +        func_append compiler_flags " $arg"
 +        continue
 +        ;;
 +
++      -Z*)
++        if test os2 = "`expr $host : '.*\(os2\)'`"; then
++          # OS/2 uses -Zxxx to specify OS/2-specific options
++	  compiler_flags="$compiler_flags $arg"
++	  func_append compile_command " $arg"
++	  func_append finalize_command " $arg"
++	  case $arg in
++	  -Zlinker | -Zstack)
++	    prev=xcompiler
++	    ;;
++	  esac
++	  continue
++        else
++	  # Otherwise treat like 'Some other compiler flag' below
++	  func_quote_for_eval "$arg"
++	  arg=$func_quote_for_eval_result
++        fi
++	;;
++
 +      # Some other compiler flag.
 +      -* | +*)
 +        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
++	arg=$func_quote_for_eval_result
 +	;;
 +
 +      *.$objext)
@@ -31763,21 +34166,21 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	  if test -z "$pic_object" ||
 +	     test -z "$non_pic_object" ||
-+	     test "$pic_object" = none &&
-+	     test "$non_pic_object" = none; then
-+	    func_fatal_error "cannot find name of object for \`$arg'"
++	     test none = "$pic_object" &&
++	     test none = "$non_pic_object"; then
++	    func_fatal_error "cannot find name of object for '$arg'"
 +	  fi
 +
 +	  # Extract subdirectory from the argument.
 +	  func_dirname "$arg" "/" ""
-+	  xdir="$func_dirname_result"
++	  xdir=$func_dirname_result
 +
-+	  if test "$pic_object" != none; then
++	  test none = "$pic_object" || {
 +	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
++	    pic_object=$xdir$pic_object
 +
-+	    if test "$prev" = dlfiles; then
-+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++	    if test dlfiles = "$prev"; then
++	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 +		func_append dlfiles " $pic_object"
 +		prev=
 +		continue
@@ -31788,7 +34191,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    fi
 +
 +	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
++	    if test dlprefiles = "$prev"; then
 +	      # Preload the old-style object.
 +	      func_append dlprefiles " $pic_object"
 +	      prev=
@@ -31796,23 +34199,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	    # A PIC object.
 +	    func_append libobjs " $pic_object"
-+	    arg="$pic_object"
-+	  fi
++	    arg=$pic_object
++	  }
 +
 +	  # Non-PIC object.
-+	  if test "$non_pic_object" != none; then
++	  if test none != "$non_pic_object"; then
 +	    # Prepend the subdirectory the object is found in.
-+	    non_pic_object="$xdir$non_pic_object"
++	    non_pic_object=$xdir$non_pic_object
 +
 +	    # A standard non-PIC object
 +	    func_append non_pic_objects " $non_pic_object"
-+	    if test -z "$pic_object" || test "$pic_object" = none ; then
-+	      arg="$non_pic_object"
++	    if test -z "$pic_object" || test none = "$pic_object"; then
++	      arg=$non_pic_object
 +	    fi
 +	  else
 +	    # If the PIC object exists, use it instead.
 +	    # $xdir was prepended to $pic_object above.
-+	    non_pic_object="$pic_object"
++	    non_pic_object=$pic_object
 +	    func_append non_pic_objects " $non_pic_object"
 +	  fi
 +	else
@@ -31820,7 +34223,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  if $opt_dry_run; then
 +	    # Extract subdirectory from the argument.
 +	    func_dirname "$arg" "/" ""
-+	    xdir="$func_dirname_result"
++	    xdir=$func_dirname_result
 +
 +	    func_lo2o "$arg"
 +	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -31828,7 +34231,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_append libobjs " $pic_object"
 +	    func_append non_pic_objects " $non_pic_object"
 +	  else
-+	    func_fatal_error "\`$arg' is not a valid libtool object"
++	    func_fatal_error "'$arg' is not a valid libtool object"
 +	  fi
 +	fi
 +	;;
@@ -31844,11 +34247,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# A libtool-controlled library.
 +
 +	func_resolve_sysroot "$arg"
-+	if test "$prev" = dlfiles; then
++	if test dlfiles = "$prev"; then
 +	  # This library was specified with -dlopen.
 +	  func_append dlfiles " $func_resolve_sysroot_result"
 +	  prev=
-+	elif test "$prev" = dlprefiles; then
++	elif test dlprefiles = "$prev"; then
 +	  # The library was specified with -dlpreopen.
 +	  func_append dlprefiles " $func_resolve_sysroot_result"
 +	  prev=
@@ -31863,7 +34266,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
 +	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
++	arg=$func_quote_for_eval_result
 +	;;
 +      esac # arg
 +
@@ -31875,9 +34278,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    done # argument parsing loop
 +
 +    test -n "$prev" && \
-+      func_fatal_help "the \`$prevarg' option requires an argument"
++      func_fatal_help "the '$prevarg' option requires an argument"
 +
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
 +      eval arg=\"$export_dynamic_flag_spec\"
 +      func_append compile_command " $arg"
 +      func_append finalize_command " $arg"
@@ -31886,20 +34289,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    oldlibs=
 +    # calculate the name of the file, without its directory
 +    func_basename "$output"
-+    outputname="$func_basename_result"
-+    libobjs_save="$libobjs"
++    outputname=$func_basename_result
++    libobjs_save=$libobjs
 +
 +    if test -n "$shlibpath_var"; then
 +      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
++      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
 +    else
 +      shlib_search_path=
 +    fi
 +    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
 +    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 +
++    # Definition is injected by LT_CONFIG during libtool generation.
++    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
++
 +    func_dirname "$output" "/" ""
-+    output_objdir="$func_dirname_result$objdir"
++    output_objdir=$func_dirname_result$objdir
 +    func_to_tool_file "$output_objdir/"
 +    tool_output_objdir=$func_to_tool_file_result
 +    # Create the object directory.
@@ -31922,7 +34328,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    # Find all interdependent deplibs by searching for libraries
 +    # that are linked more than once (e.g. -la -lb -la)
 +    for deplib in $deplibs; do
-+      if $opt_preserve_dup_deps ; then
++      if $opt_preserve_dup_deps; then
 +	case "$libs " in
 +	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 +	esac
@@ -31930,7 +34336,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_append libs " $deplib"
 +    done
 +
-+    if test "$linkmode" = lib; then
++    if test lib = "$linkmode"; then
 +      libs="$predeps $libs $compiler_lib_search_path $postdeps"
 +
 +      # Compute libraries that are listed more than once in $predeps
@@ -31962,7 +34368,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  case $file in
 +	  *.la) ;;
 +	  *)
-+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
++	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 +	    ;;
 +	  esac
 +	done
@@ -31970,7 +34376,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    prog)
 +	compile_deplibs=
 +	finalize_deplibs=
-+	alldeplibs=no
++	alldeplibs=false
 +	newdlfiles=
 +	newdlprefiles=
 +	passes="conv scan dlopen dlpreopen link"
@@ -31982,29 +34388,32 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    for pass in $passes; do
 +      # The preopen pass in lib mode reverses $deplibs; put it back here
 +      # so that -L comes before libs that need it for instance...
-+      if test "$linkmode,$pass" = "lib,link"; then
++      if test lib,link = "$linkmode,$pass"; then
 +	## FIXME: Find the place where the list is rebuilt in the wrong
 +	##        order, and fix it there properly
 +        tmp_deplibs=
 +	for deplib in $deplibs; do
 +	  tmp_deplibs="$deplib $tmp_deplibs"
 +	done
-+	deplibs="$tmp_deplibs"
++	deplibs=$tmp_deplibs
 +      fi
 +
-+      if test "$linkmode,$pass" = "lib,link" ||
-+	 test "$linkmode,$pass" = "prog,scan"; then
-+	libs="$deplibs"
++      if test lib,link = "$linkmode,$pass" ||
++	 test prog,scan = "$linkmode,$pass"; then
++	libs=$deplibs
 +	deplibs=
 +      fi
-+      if test "$linkmode" = prog; then
++      if test prog = "$linkmode"; then
 +	case $pass in
-+	dlopen) libs="$dlfiles" ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	dlopen) libs=$dlfiles ;;
++	dlpreopen) libs=$dlprefiles ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
 +	esac
 +      fi
-+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
++      if test lib,dlpreopen = "$linkmode,$pass"; then
 +	# Collect and forward deplibs of preopened libtool libs
 +	for lib in $dlprefiles; do
 +	  # Ignore non-libtool-libs
@@ -32025,26 +34434,26 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    esac
 +	  done
 +	done
-+	libs="$dlprefiles"
++	libs=$dlprefiles
 +      fi
-+      if test "$pass" = dlopen; then
++      if test dlopen = "$pass"; then
 +	# Collect dlpreopened libraries
-+	save_deplibs="$deplibs"
++	save_deplibs=$deplibs
 +	deplibs=
 +      fi
 +
 +      for deplib in $libs; do
 +	lib=
-+	found=no
++	found=false
 +	case $deplib in
 +	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 +        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-+	  if test "$linkmode,$pass" = "prog,link"; then
++	  if test prog,link = "$linkmode,$pass"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    func_append compiler_flags " $deplib"
-+	    if test "$linkmode" = lib ; then
++	    if test lib = "$linkmode"; then
 +		case "$new_inherited_linker_flags " in
 +		    *" $deplib "*) ;;
 +		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -32054,13 +34463,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  continue
 +	  ;;
 +	-l*)
-+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-+	    func_warning "\`-l' is ignored for archives/objects"
++	  if test lib != "$linkmode" && test prog != "$linkmode"; then
++	    func_warning "'-l' is ignored for archives/objects"
 +	    continue
 +	  fi
 +	  func_stripname '-l' '' "$deplib"
 +	  name=$func_stripname_result
-+	  if test "$linkmode" = lib; then
++	  if test lib = "$linkmode"; then
 +	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 +	  else
 +	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -32068,31 +34477,22 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  for searchdir in $searchdirs; do
 +	    for search_ext in .la $std_shrext .so .a; do
 +	      # Search the libtool library
-+	      lib="$searchdir/lib${name}${search_ext}"
++	      lib=$searchdir/lib$name$search_ext
 +	      if test -f "$lib"; then
-+		if test "$search_ext" = ".la"; then
-+		  found=yes
++		if test .la = "$search_ext"; then
++		  found=:
 +		else
-+		  found=no
++		  found=false
 +		fi
 +		break 2
 +	      fi
 +	    done
 +	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	  else # deplib is a libtool library
++	  if $found; then
++	    # deplib is a libtool library
 +	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 +	    # We need to do some special things here, and not later.
-+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 +	      case " $predeps $postdeps " in
 +	      *" $deplib "*)
 +		if func_lalib_p "$lib"; then
@@ -32100,19 +34500,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		  old_library=
 +		  func_source "$lib"
 +		  for l in $old_library $library_names; do
-+		    ll="$l"
++		    ll=$l
 +		  done
-+		  if test "X$ll" = "X$old_library" ; then # only static version available
-+		    found=no
++		  if test "X$ll" = "X$old_library"; then # only static version available
++		    found=false
 +		    func_dirname "$lib" "" "."
-+		    ladir="$func_dirname_result"
++		    ladir=$func_dirname_result
 +		    lib=$ladir/$old_library
-+		    if test "$linkmode,$pass" = "prog,link"; then
++		    if test prog,link = "$linkmode,$pass"; then
 +		      compile_deplibs="$deplib $compile_deplibs"
 +		      finalize_deplibs="$deplib $finalize_deplibs"
 +		    else
 +		      deplibs="$deplib $deplibs"
-+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 +		    fi
 +		    continue
 +		  fi
@@ -32121,15 +34521,25 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      *) ;;
 +	      esac
 +	    fi
++	  else
++	    # deplib doesn't seem to be a libtool library
++	    if test prog,link = "$linkmode,$pass"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
 +	  fi
 +	  ;; # -l
 +	*.ltframework)
-+	  if test "$linkmode,$pass" = "prog,link"; then
++	  if test prog,link = "$linkmode,$pass"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    deplibs="$deplib $deplibs"
-+	    if test "$linkmode" = lib ; then
++	    if test lib = "$linkmode"; then
 +		case "$new_inherited_linker_flags " in
 +		    *" $deplib "*) ;;
 +		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -32142,18 +34552,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  case $linkmode in
 +	  lib)
 +	    deplibs="$deplib $deplibs"
-+	    test "$pass" = conv && continue
++	    test conv = "$pass" && continue
 +	    newdependency_libs="$deplib $newdependency_libs"
 +	    func_stripname '-L' '' "$deplib"
 +	    func_resolve_sysroot "$func_stripname_result"
 +	    func_append newlib_search_path " $func_resolve_sysroot_result"
 +	    ;;
 +	  prog)
-+	    if test "$pass" = conv; then
++	    if test conv = "$pass"; then
 +	      deplibs="$deplib $deplibs"
 +	      continue
 +	    fi
-+	    if test "$pass" = scan; then
++	    if test scan = "$pass"; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      compile_deplibs="$deplib $compile_deplibs"
@@ -32164,13 +34574,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_append newlib_search_path " $func_resolve_sysroot_result"
 +	    ;;
 +	  *)
-+	    func_warning "\`-L' is ignored for archives/objects"
++	    func_warning "'-L' is ignored for archives/objects"
 +	    ;;
 +	  esac # linkmode
 +	  continue
 +	  ;; # -L
 +	-R*)
-+	  if test "$pass" = link; then
++	  if test link = "$pass"; then
 +	    func_stripname '-R' '' "$deplib"
 +	    func_resolve_sysroot "$func_stripname_result"
 +	    dir=$func_resolve_sysroot_result
@@ -32188,7 +34598,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  lib=$func_resolve_sysroot_result
 +	  ;;
 +	*.$libext)
-+	  if test "$pass" = conv; then
++	  if test conv = "$pass"; then
 +	    deplibs="$deplib $deplibs"
 +	    continue
 +	  fi
@@ -32199,21 +34609,26 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    case " $dlpreconveniencelibs " in
 +	    *" $deplib "*) ;;
 +	    *)
-+	      valid_a_lib=no
++	      valid_a_lib=false
 +	      case $deplibs_check_method in
 +		match_pattern*)
 +		  set dummy $deplibs_check_method; shift
 +		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 +		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 +		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		    valid_a_lib=yes
++		    valid_a_lib=:
 +		  fi
 +		;;
 +		pass_all)
-+		  valid_a_lib=yes
++		  valid_a_lib=:
 +		;;
 +	      esac
-+	      if test "$valid_a_lib" != yes; then
++	      if $valid_a_lib; then
++		echo
++		$ECHO "*** Warning: Linking the shared library $output against the"
++		$ECHO "*** static library $deplib is not portable!"
++		deplibs="$deplib $deplibs"
++	      else
 +		echo
 +		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 +		echo "*** I have the capability to make that library automatically link in when"
@@ -32221,18 +34636,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because the file extensions .$libext of this argument makes me believe"
 +		echo "*** that it is just a static archive that I should not use here."
-+	      else
-+		echo
-+		$ECHO "*** Warning: Linking the shared library $output against the"
-+		$ECHO "*** static library $deplib is not portable!"
-+		deplibs="$deplib $deplibs"
 +	      fi
 +	      ;;
 +	    esac
 +	    continue
 +	    ;;
 +	  prog)
-+	    if test "$pass" != link; then
++	    if test link != "$pass"; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      compile_deplibs="$deplib $compile_deplibs"
@@ -32243,10 +34653,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  esac # linkmode
 +	  ;; # *.$libext
 +	*.lo | *.$objext)
-+	  if test "$pass" = conv; then
++	  if test conv = "$pass"; then
 +	    deplibs="$deplib $deplibs"
-+	  elif test "$linkmode" = prog; then
-+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  elif test prog = "$linkmode"; then
++	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 +	      # If there is no dlopen support or we're linking statically,
 +	      # we need to preload.
 +	      func_append newdlprefiles " $deplib"
@@ -32259,22 +34669,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  continue
 +	  ;;
 +	%DEPLIBS%)
-+	  alldeplibs=yes
++	  alldeplibs=:
 +	  continue
 +	  ;;
 +	esac # case $deplib
 +
-+	if test "$found" = yes || test -f "$lib"; then :
-+	else
-+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-+	fi
++	$found || test -f "$lib" \
++	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$lib" \
-+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
++	  || func_fatal_error "'$lib' is not a valid libtool archive"
 +
 +	func_dirname "$lib" "" "."
-+	ladir="$func_dirname_result"
++	ladir=$func_dirname_result
 +
 +	dlname=
 +	dlopen=
@@ -32304,36 +34712,36 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  done
 +	fi
 +	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
++	if test lib,link = "$linkmode,$pass" ||
++	   test prog,scan = "$linkmode,$pass" ||
++	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 +	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 +	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 +	fi
 +
-+	if test "$pass" = conv; then
++	if test conv = "$pass"; then
 +	  # Only check for convenience libraries
 +	  deplibs="$lib $deplibs"
 +	  if test -z "$libdir"; then
 +	    if test -z "$old_library"; then
-+	      func_fatal_error "cannot find name of link library for \`$lib'"
++	      func_fatal_error "cannot find name of link library for '$lib'"
 +	    fi
 +	    # It is a libtool convenience library, so add in its objects.
 +	    func_append convenience " $ladir/$objdir/$old_library"
 +	    func_append old_convenience " $ladir/$objdir/$old_library"
-+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-+	    func_fatal_error "\`$lib' is not a convenience library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++	      if $opt_preserve_dup_deps; then
++		case "$tmp_libs " in
++		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
++		esac
++	      fi
++	      func_append tmp_libs " $deplib"
++	    done
++	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
++	    func_fatal_error "'$lib' is not a convenience library"
 +	  fi
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    deplibs="$deplib $deplibs"
-+	    if $opt_preserve_dup_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-+	      esac
-+	    fi
-+	    func_append tmp_libs " $deplib"
-+	  done
 +	  continue
 +	fi # $pass = conv
 +
@@ -32341,26 +34749,26 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# Get the name of the library we link against.
 +	linklib=
 +	if test -n "$old_library" &&
-+	   { test "$prefer_static_libs" = yes ||
-+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
++	   { test yes = "$prefer_static_libs" ||
++	     test built,no = "$prefer_static_libs,$installed"; }; then
 +	  linklib=$old_library
 +	else
 +	  for l in $old_library $library_names; do
-+	    linklib="$l"
++	    linklib=$l
 +	  done
 +	fi
 +	if test -z "$linklib"; then
-+	  func_fatal_error "cannot find name of link library for \`$lib'"
++	  func_fatal_error "cannot find name of link library for '$lib'"
 +	fi
 +
 +	# This library was specified with -dlopen.
-+	if test "$pass" = dlopen; then
-+	  if test -z "$libdir"; then
-+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-+	  fi
++	if test dlopen = "$pass"; then
++	  test -z "$libdir" \
++	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 +	  if test -z "$dlname" ||
-+	     test "$dlopen_support" != yes ||
-+	     test "$build_libtool_libs" = no; then
++	     test yes != "$dlopen_support" ||
++	     test no = "$build_libtool_libs"
++	  then
 +	    # If there is no dlname, no dlopen support or we're linking
 +	    # statically, we need to preload.  We also need to preload any
 +	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -32374,40 +34782,40 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	# We need an absolute path.
 +	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
 +	*)
 +	  abs_ladir=`cd "$ladir" && pwd`
 +	  if test -z "$abs_ladir"; then
-+	    func_warning "cannot determine absolute directory name of \`$ladir'"
++	    func_warning "cannot determine absolute directory name of '$ladir'"
 +	    func_warning "passing it literally to the linker, although it might fail"
-+	    abs_ladir="$ladir"
++	    abs_ladir=$ladir
 +	  fi
 +	  ;;
 +	esac
 +	func_basename "$lib"
-+	laname="$func_basename_result"
++	laname=$func_basename_result
 +
 +	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
++	if test yes = "$installed"; then
 +	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    func_warning "library \`$lib' was moved."
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
++	    func_warning "library '$lib' was moved."
++	    dir=$ladir
++	    absdir=$abs_ladir
++	    libdir=$abs_ladir
 +	  else
-+	    dir="$lt_sysroot$libdir"
-+	    absdir="$lt_sysroot$libdir"
++	    dir=$lt_sysroot$libdir
++	    absdir=$lt_sysroot$libdir
 +	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
++	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 +	else
 +	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
++	    dir=$ladir
++	    absdir=$abs_ladir
 +	    # Remove this search path later
 +	    func_append notinst_path " $abs_ladir"
 +	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
++	    dir=$ladir/$objdir
++	    absdir=$abs_ladir/$objdir
 +	    # Remove this search path later
 +	    func_append notinst_path " $abs_ladir"
 +	  fi
@@ -32416,11 +34824,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	name=$func_stripname_result
 +
 +	# This library was specified with -dlpreopen.
-+	if test "$pass" = dlpreopen; then
-+	  if test -z "$libdir" && test "$linkmode" = prog; then
-+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
++	if test dlpreopen = "$pass"; then
++	  if test -z "$libdir" && test prog = "$linkmode"; then
++	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 +	  fi
-+	  case "$host" in
++	  case $host in
 +	    # special handling for platforms with PE-DLLs.
 +	    *cygwin* | *mingw* | *cegcc* )
 +	      # Linker will automatically link against shared library if both
@@ -32464,9 +34872,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	if test -z "$libdir"; then
 +	  # Link the convenience library
-+	  if test "$linkmode" = lib; then
++	  if test lib = "$linkmode"; then
 +	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
++	  elif test prog,link = "$linkmode,$pass"; then
 +	    compile_deplibs="$dir/$old_library $compile_deplibs"
 +	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 +	  else
@@ -32476,14 +34884,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +
-+	if test "$linkmode" = prog && test "$pass" != link; then
++	if test prog = "$linkmode" && test link != "$pass"; then
 +	  func_append newlib_search_path " $ladir"
 +	  deplibs="$lib $deplibs"
 +
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
++	  linkalldeplibs=false
++	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
++	     test no = "$build_libtool_libs"; then
++	    linkalldeplibs=:
 +	  fi
 +
 +	  tmp_libs=
@@ -32495,14 +34903,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		 ;;
 +	    esac
 +	    # Need to link against all dependency_libs?
-+	    if test "$linkalldeplibs" = yes; then
++	    if $linkalldeplibs; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      # Need to hardcode shared library paths
 +	      # or/and link against static libraries
 +	      newdependency_libs="$deplib $newdependency_libs"
 +	    fi
-+	    if $opt_preserve_dup_deps ; then
++	    if $opt_preserve_dup_deps; then
 +	      case "$tmp_libs " in
 +	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 +	      esac
@@ -32512,15 +34920,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  continue
 +	fi # $linkmode = prog...
 +
-+	if test "$linkmode,$pass" = "prog,link"; then
++	if test prog,link = "$linkmode,$pass"; then
 +	  if test -n "$library_names" &&
-+	     { { test "$prefer_static_libs" = no ||
-+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	     { { test no = "$prefer_static_libs" ||
++	         test built,yes = "$prefer_static_libs,$installed"; } ||
 +	       test -z "$old_library"; }; then
 +	    # We need to hardcode the library path
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 +	      # Make sure the rpath contains only unique directories.
-+	      case "$temp_rpath:" in
++	      case $temp_rpath: in
 +	      *"$absdir:"*) ;;
 +	      *) func_append temp_rpath "$absdir:" ;;
 +	      esac
@@ -32549,9 +34957,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    esac
 +	  fi # $linkmode,$pass = prog,link...
 +
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
++	  if $alldeplibs &&
++	     { test pass_all = "$deplibs_check_method" ||
++	       { test yes = "$build_libtool_libs" &&
 +		 test -n "$library_names"; }; }; then
 +	    # We only need to search for static libraries
 +	    continue
@@ -32560,19 +34968,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	link_static=no # Whether the deplib will be linked statically
 +	use_static_libs=$prefer_static_libs
-+	if test "$use_static_libs" = built && test "$installed" = yes; then
++	if test built = "$use_static_libs" && test yes = "$installed"; then
 +	  use_static_libs=no
 +	fi
 +	if test -n "$library_names" &&
-+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
++	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 +	  case $host in
-+	  *cygwin* | *mingw* | *cegcc*)
++	  *cygwin* | *mingw* | *cegcc* | *os2*)
 +	      # No point in relinking DLLs because paths are not encoded
 +	      func_append notinst_deplibs " $lib"
 +	      need_relink=no
 +	    ;;
 +	  *)
-+	    if test "$installed" = no; then
++	    if test no = "$installed"; then
 +	      func_append notinst_deplibs " $lib"
 +	      need_relink=yes
 +	    fi
@@ -32582,24 +34990,24 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	  # Warn about portability, can't link against -module's on some
 +	  # systems (darwin).  Don't bleat about dlopened modules though!
-+	  dlopenmodule=""
++	  dlopenmodule=
 +	  for dlpremoduletest in $dlprefiles; do
 +	    if test "X$dlpremoduletest" = "X$lib"; then
-+	      dlopenmodule="$dlpremoduletest"
++	      dlopenmodule=$dlpremoduletest
 +	      break
 +	    fi
 +	  done
-+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
++	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 +	    echo
-+	    if test "$linkmode" = prog; then
++	    if test prog = "$linkmode"; then
 +	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 +	    else
 +	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 +	    fi
 +	    $ECHO "*** $linklib is not portable!"
 +	  fi
-+	  if test "$linkmode" = lib &&
-+	     test "$hardcode_into_libs" = yes; then
++	  if test lib = "$linkmode" &&
++	     test yes = "$hardcode_into_libs"; then
 +	    # Hardcode the library path.
 +	    # Skip directories that are in the system default run-time
 +	    # search path.
@@ -32627,43 +35035,43 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    # figure out the soname
 +	    set dummy $library_names
 +	    shift
-+	    realname="$1"
++	    realname=$1
 +	    shift
 +	    libname=`eval "\\$ECHO \"$libname_spec\""`
 +	    # use dlname if we got it. it's perfectly good, no?
 +	    if test -n "$dlname"; then
-+	      soname="$dlname"
++	      soname=$dlname
 +	    elif test -n "$soname_spec"; then
 +	      # bleh windows
 +	      case $host in
-+	      *cygwin* | mingw* | *cegcc*)
++	      *cygwin* | mingw* | *cegcc* | *os2*)
 +	        func_arith $current - $age
 +		major=$func_arith_result
-+		versuffix="-$major"
++		versuffix=-$major
 +		;;
 +	      esac
 +	      eval soname=\"$soname_spec\"
 +	    else
-+	      soname="$realname"
++	      soname=$realname
 +	    fi
 +
 +	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
++	    soroot=$soname
 +	    func_basename "$soroot"
-+	    soname="$func_basename_result"
++	    soname=$func_basename_result
 +	    func_stripname 'lib' '.dll' "$soname"
 +	    newlib=libimp-$func_stripname_result.a
 +
 +	    # If the library has no export list, then create one now
 +	    if test -f "$output_objdir/$soname-def"; then :
 +	    else
-+	      func_verbose "extracting exported symbol list from \`$soname'"
++	      func_verbose "extracting exported symbol list from '$soname'"
 +	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 +	    fi
 +
 +	    # Create $newlib
 +	    if test -f "$output_objdir/$newlib"; then :; else
-+	      func_verbose "generating import library for \`$soname'"
++	      func_verbose "generating import library for '$soname'"
 +	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 +	    fi
 +	    # make sure the library variables are pointing to the new library
@@ -32671,58 +35079,58 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    linklib=$newlib
 +	  fi # test -n "$old_archive_from_expsyms_cmds"
 +
-+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
++	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    lib_linked=yes
 +	    case $hardcode_action in
 +	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
++	      if test no = "$hardcode_direct"; then
++		add=$dir/$linklib
 +		case $host in
-+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
++		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 +		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+		    *-*-unixware7*) add_dir="-L$dir" ;;
++		    *-*-unixware7*) add_dir=-L$dir ;;
 +		  *-*-darwin* )
-+		    # if the lib is a (non-dlopened) module then we can not
++		    # if the lib is a (non-dlopened) module then we cannot
 +		    # link against it, someone is ignoring the earlier warnings
 +		    if /usr/bin/file -L $add 2> /dev/null |
-+			 $GREP ": [^:]* bundle" >/dev/null ; then
++			 $GREP ": [^:]* bundle" >/dev/null; then
 +		      if test "X$dlopenmodule" != "X$lib"; then
 +			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-+			if test -z "$old_library" ; then
++			if test -z "$old_library"; then
 +			  echo
 +			  echo "*** And there doesn't seem to be a static archive available"
 +			  echo "*** The link will probably fail, sorry"
 +			else
-+			  add="$dir/$old_library"
++			  add=$dir/$old_library
 +			fi
 +		      elif test -n "$old_library"; then
-+			add="$dir/$old_library"
++			add=$dir/$old_library
 +		      fi
 +		    fi
 +		esac
-+	      elif test "$hardcode_minus_L" = no; then
++	      elif test no = "$hardcode_minus_L"; then
 +		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
++		*-*-sunos*) add_shlibpath=$dir ;;
 +		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
++		add_dir=-L$dir
++		add=-l$name
++	      elif test no = "$hardcode_shlibpath_var"; then
++		add_shlibpath=$dir
++		add=-l$name
 +	      else
 +		lib_linked=no
 +	      fi
 +	      ;;
 +	    relink)
-+	      if test "$hardcode_direct" = yes &&
-+	         test "$hardcode_direct_absolute" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$absdir"
++	      if test yes = "$hardcode_direct" &&
++	         test no = "$hardcode_direct_absolute"; then
++		add=$dir/$linklib
++	      elif test yes = "$hardcode_minus_L"; then
++		add_dir=-L$absdir
 +		# Try looking first in the location we're being installed to.
 +		if test -n "$inst_prefix_dir"; then
 +		  case $libdir in
@@ -32731,10 +35139,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		      ;;
 +		  esac
 +		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
++		add=-l$name
++	      elif test yes = "$hardcode_shlibpath_var"; then
++		add_shlibpath=$dir
++		add=-l$name
 +	      else
 +		lib_linked=no
 +	      fi
@@ -32742,7 +35150,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    *) lib_linked=no ;;
 +	    esac
 +
-+	    if test "$lib_linked" != yes; then
++	    if test yes != "$lib_linked"; then
 +	      func_fatal_configuration "unsupported hardcode properties"
 +	    fi
 +
@@ -32752,15 +35160,15 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 +	      esac
 +	    fi
-+	    if test "$linkmode" = prog; then
++	    if test prog = "$linkmode"; then
 +	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 +	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 +	    else
 +	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 +	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes &&
-+		 test "$hardcode_minus_L" != yes &&
-+		 test "$hardcode_shlibpath_var" = yes; then
++	      if test yes != "$hardcode_direct" &&
++		 test yes != "$hardcode_minus_L" &&
++		 test yes = "$hardcode_shlibpath_var"; then
 +		case :$finalize_shlibpath: in
 +		*":$libdir:"*) ;;
 +		*) func_append finalize_shlibpath "$libdir:" ;;
@@ -32769,33 +35177,33 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    fi
 +	  fi
 +
-+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
++	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes &&
-+	       test "$hardcode_direct_absolute" = no; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
++	    if test yes = "$hardcode_direct" &&
++	       test no = "$hardcode_direct_absolute"; then
++	      add=$libdir/$linklib
++	    elif test yes = "$hardcode_minus_L"; then
++	      add_dir=-L$libdir
++	      add=-l$name
++	    elif test yes = "$hardcode_shlibpath_var"; then
 +	      case :$finalize_shlibpath: in
 +	      *":$libdir:"*) ;;
 +	      *) func_append finalize_shlibpath "$libdir:" ;;
 +	      esac
-+	      add="-l$name"
-+	    elif test "$hardcode_automatic" = yes; then
++	      add=-l$name
++	    elif test yes = "$hardcode_automatic"; then
 +	      if test -n "$inst_prefix_dir" &&
-+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+		add="$inst_prefix_dir$libdir/$linklib"
++		 test -f "$inst_prefix_dir$libdir/$linklib"; then
++		add=$inst_prefix_dir$libdir/$linklib
 +	      else
-+		add="$libdir/$linklib"
++		add=$libdir/$linklib
 +	      fi
 +	    else
 +	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
++	      add_dir=-L$libdir
 +	      # Try looking first in the location we're being installed to.
 +	      if test -n "$inst_prefix_dir"; then
 +		case $libdir in
@@ -32804,10 +35212,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		    ;;
 +		esac
 +	      fi
-+	      add="-l$name"
++	      add=-l$name
 +	    fi
 +
-+	    if test "$linkmode" = prog; then
++	    if test prog = "$linkmode"; then
 +	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 +	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 +	    else
@@ -32815,43 +35223,43 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      test -n "$add" && deplibs="$add $deplibs"
 +	    fi
 +	  fi
-+	elif test "$linkmode" = prog; then
++	elif test prog = "$linkmode"; then
 +	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 +	  # is not unsupported.  This is valid on all known static and
 +	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
++	  if test unsupported != "$hardcode_direct"; then
++	    test -n "$old_library" && linklib=$old_library
 +	    compile_deplibs="$dir/$linklib $compile_deplibs"
 +	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 +	  else
 +	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 +	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 +	  fi
-+	elif test "$build_libtool_libs" = yes; then
++	elif test yes = "$build_libtool_libs"; then
 +	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
++	  if test pass_all != "$deplibs_check_method"; then
 +	    # We're trying link a shared library against a static one
 +	    # but the system doesn't support it.
 +
 +	    # Just print a warning and add the library to dependency_libs so
 +	    # that the program can be linked against the static library.
 +	    echo
-+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
++	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
 +	    echo "*** I have the capability to make that library automatically link in when"
 +	    echo "*** you link to this library.  But I can only do this if you have a"
 +	    echo "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
++	    if test yes = "$module"; then
 +	      echo "*** But as you try to build a module library, libtool will still create "
 +	      echo "*** a static module, that should work as long as the dlopening application"
 +	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 +	      if test -z "$global_symbol_pipe"; then
 +		echo
 +		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 +		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
++		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 +	      fi
-+	      if test "$build_old_libs" = no; then
++	      if test no = "$build_old_libs"; then
 +		build_libtool_libs=module
 +		build_old_libs=yes
 +	      else
@@ -32864,11 +35272,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  fi
 +	fi # link shared/static library?
 +
-+	if test "$linkmode" = lib; then
++	if test lib = "$linkmode"; then
 +	  if test -n "$dependency_libs" &&
-+	     { test "$hardcode_into_libs" != yes ||
-+	       test "$build_old_libs" = yes ||
-+	       test "$link_static" = yes; }; then
++	     { test yes != "$hardcode_into_libs" ||
++	       test yes = "$build_old_libs" ||
++	       test yes = "$link_static"; }; then
 +	    # Extract -R from dependency_libs
 +	    temp_deplibs=
 +	    for libdir in $dependency_libs; do
@@ -32882,12 +35290,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      *) func_append temp_deplibs " $libdir";;
 +	      esac
 +	    done
-+	    dependency_libs="$temp_deplibs"
++	    dependency_libs=$temp_deplibs
 +	  fi
 +
 +	  func_append newlib_search_path " $absdir"
 +	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 +	  # ... and its dependency_libs
 +	  tmp_libs=
 +	  for deplib in $dependency_libs; do
@@ -32897,7 +35305,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +                   func_resolve_sysroot "$func_stripname_result";;
 +              *) func_resolve_sysroot "$deplib" ;;
 +            esac
-+	    if $opt_preserve_dup_deps ; then
++	    if $opt_preserve_dup_deps; then
 +	      case "$tmp_libs " in
 +	      *" $func_resolve_sysroot_result "*)
 +                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -32906,12 +35314,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_append tmp_libs " $func_resolve_sysroot_result"
 +	  done
 +
-+	  if test "$link_all_deplibs" != no; then
++	  if test no != "$link_all_deplibs"; then
 +	    # Add the search paths of all dependency libraries
 +	    for deplib in $dependency_libs; do
 +	      path=
 +	      case $deplib in
-+	      -L*) path="$deplib" ;;
++	      -L*) path=$deplib ;;
 +	      *.la)
 +	        func_resolve_sysroot "$deplib"
 +	        deplib=$func_resolve_sysroot_result
@@ -32919,12 +35327,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		dir=$func_dirname_result
 +		# We need an absolute path.
 +		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
 +		*)
 +		  absdir=`cd "$dir" && pwd`
 +		  if test -z "$absdir"; then
-+		    func_warning "cannot determine absolute directory name of \`$dir'"
-+		    absdir="$dir"
++		    func_warning "cannot determine absolute directory name of '$dir'"
++		    absdir=$dir
 +		  fi
 +		  ;;
 +		esac
@@ -32932,35 +35340,35 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		case $host in
 +		*-*-darwin*)
 +		  depdepl=
-+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+		  if test -n "$deplibrary_names" ; then
-+		    for tmp in $deplibrary_names ; do
++		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  if test -n "$deplibrary_names"; then
++		    for tmp in $deplibrary_names; do
 +		      depdepl=$tmp
 +		    done
-+		    if test -f "$absdir/$objdir/$depdepl" ; then
-+		      depdepl="$absdir/$objdir/$depdepl"
-+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++		    if test -f "$absdir/$objdir/$depdepl"; then
++		      depdepl=$absdir/$objdir/$depdepl
++		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
 +                      if test -z "$darwin_install_name"; then
-+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
++                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
 +                      fi
-+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
++		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
++		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 +		      path=
 +		    fi
 +		  fi
 +		  ;;
 +		*)
-+		  path="-L$absdir/$objdir"
++		  path=-L$absdir/$objdir
 +		  ;;
 +		esac
 +		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 +		  test -z "$libdir" && \
-+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
++		    func_fatal_error "'$deplib' is not a valid libtool archive"
 +		  test "$absdir" != "$libdir" && \
-+		    func_warning "\`$deplib' seems to be moved"
++		    func_warning "'$deplib' seems to be moved"
 +
-+		  path="-L$absdir"
++		  path=-L$absdir
 +		fi
 +		;;
 +	      esac
@@ -32972,23 +35380,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  fi # link_all_deplibs != no
 +	fi # linkmode = lib
 +      done # for deplib in $libs
-+      if test "$pass" = link; then
-+	if test "$linkmode" = "prog"; then
++      if test link = "$pass"; then
++	if test prog = "$linkmode"; then
 +	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 +	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 +	else
 +	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	fi
 +      fi
-+      dependency_libs="$newdependency_libs"
-+      if test "$pass" = dlpreopen; then
++      dependency_libs=$newdependency_libs
++      if test dlpreopen = "$pass"; then
 +	# Link the dlpreopened libraries before other libraries
 +	for deplib in $save_deplibs; do
 +	  deplibs="$deplib $deplibs"
 +	done
 +      fi
-+      if test "$pass" != dlopen; then
-+	if test "$pass" != conv; then
++      if test dlopen != "$pass"; then
++	test conv = "$pass" || {
 +	  # Make sure lib_search_path contains only unique directories.
 +	  lib_search_path=
 +	  for dir in $newlib_search_path; do
@@ -32998,12 +35406,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    esac
 +	  done
 +	  newlib_search_path=
-+	fi
++	}
 +
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
++	if test prog,link = "$linkmode,$pass"; then
 +	  vars="compile_deplibs finalize_deplibs"
++	else
++	  vars=deplibs
 +	fi
 +	for var in $vars dependency_libs; do
 +	  # Add libraries to $var in reverse order
@@ -33061,62 +35469,93 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  eval $var=\"$tmp_libs\"
 +	done # for var
 +      fi
++
++      # Add Sun CC postdeps if required:
++      test CXX = "$tagname" && {
++        case $host_os in
++        linux*)
++          case `$CC -V 2>&1 | sed 5q` in
++          *Sun\ C*) # Sun C++ 5.9
++            func_suncc_cstd_abi
++
++            if test no != "$suncc_use_cstd_abi"; then
++              func_append postdeps ' -library=Cstd -library=Crun'
++            fi
++            ;;
++          esac
++          ;;
++
++        solaris*)
++          func_cc_basename "$CC"
++          case $func_cc_basename_result in
++          CC* | sunCC*)
++            func_suncc_cstd_abi
++
++            if test no != "$suncc_use_cstd_abi"; then
++              func_append postdeps ' -library=Cstd -library=Crun'
++            fi
++            ;;
++          esac
++          ;;
++        esac
++      }
++
 +      # Last step: remove runtime libs from dependency_libs
 +      # (they stay in deplibs)
 +      tmp_libs=
-+      for i in $dependency_libs ; do
++      for i in $dependency_libs; do
 +	case " $predeps $postdeps $compiler_lib_search_path " in
 +	*" $i "*)
-+	  i=""
++	  i=
 +	  ;;
 +	esac
-+	if test -n "$i" ; then
++	if test -n "$i"; then
 +	  func_append tmp_libs " $i"
 +	fi
 +      done
 +      dependency_libs=$tmp_libs
 +    done # for pass
-+    if test "$linkmode" = prog; then
-+      dlfiles="$newdlfiles"
++    if test prog = "$linkmode"; then
++      dlfiles=$newdlfiles
 +    fi
-+    if test "$linkmode" = prog || test "$linkmode" = lib; then
-+      dlprefiles="$newdlprefiles"
++    if test prog = "$linkmode" || test lib = "$linkmode"; then
++      dlprefiles=$newdlprefiles
 +    fi
 +
 +    case $linkmode in
 +    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for archives"
++      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
++	func_warning "'-dlopen' is ignored for archives"
 +      fi
 +
 +      case " $deplibs" in
 +      *\ -l* | *\ -L*)
-+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
++	func_warning "'-l' and '-L' are ignored for archives" ;;
 +      esac
 +
 +      test -n "$rpath" && \
-+	func_warning "\`-rpath' is ignored for archives"
++	func_warning "'-rpath' is ignored for archives"
 +
 +      test -n "$xrpath" && \
-+	func_warning "\`-R' is ignored for archives"
++	func_warning "'-R' is ignored for archives"
 +
 +      test -n "$vinfo" && \
-+	func_warning "\`-version-info/-version-number' is ignored for archives"
++	func_warning "'-version-info/-version-number' is ignored for archives"
 +
 +      test -n "$release" && \
-+	func_warning "\`-release' is ignored for archives"
++	func_warning "'-release' is ignored for archives"
 +
 +      test -n "$export_symbols$export_symbols_regex" && \
-+	func_warning "\`-export-symbols' is ignored for archives"
++	func_warning "'-export-symbols' is ignored for archives"
 +
 +      # Now set the variables for building old libraries.
 +      build_libtool_libs=no
-+      oldlibs="$output"
++      oldlibs=$output
 +      func_append objs "$old_deplibs"
 +      ;;
 +
 +    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
++      # Make sure we only generate libraries of the form 'libNAME.la'.
 +      case $outputname in
 +      lib*)
 +	func_stripname 'lib' '.la' "$outputname"
@@ -33125,10 +35564,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	eval libname=\"$libname_spec\"
 +	;;
 +      *)
-+	test "$module" = no && \
-+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
++	test no = "$module" \
++	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 +
-+	if test "$need_lib_prefix" != no; then
++	if test no != "$need_lib_prefix"; then
 +	  # Add the "lib" prefix for modules if required
 +	  func_stripname '' '.la' "$outputname"
 +	  name=$func_stripname_result
@@ -33142,8 +35581,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      esac
 +
 +      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
++	if test pass_all != "$deplibs_check_method"; then
++	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 +	else
 +	  echo
 +	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -33152,21 +35591,21 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +      fi
 +
-+      test "$dlself" != no && \
-+	func_warning "\`-dlopen self' is ignored for libtool libraries"
++      test no = "$dlself" \
++	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 +
 +      set dummy $rpath
 +      shift
-+      test "$#" -gt 1 && \
-+	func_warning "ignoring multiple \`-rpath's for a libtool library"
++      test 1 -lt "$#" \
++	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 +
-+      install_libdir="$1"
++      install_libdir=$1
 +
 +      oldlibs=
 +      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
++	if test yes = "$build_libtool_libs"; then
 +	  # Building a libtool convenience library.
-+	  # Some compilers have problems with a `.al' extension so
++	  # Some compilers have problems with a '.al' extension so
 +	  # convenience libraries should have the same extension an
 +	  # archive normally would.
 +	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -33175,20 +35614,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	test -n "$vinfo" && \
-+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
++	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 +
 +	test -n "$release" && \
-+	  func_warning "\`-release' is ignored for convenience libraries"
++	  func_warning "'-release' is ignored for convenience libraries"
 +      else
 +
 +	# Parse the version information argument.
-+	save_ifs="$IFS"; IFS=':'
++	save_ifs=$IFS; IFS=:
 +	set dummy $vinfo 0 0 0
 +	shift
-+	IFS="$save_ifs"
++	IFS=$save_ifs
 +
 +	test -n "$7" && \
-+	  func_fatal_help "too many parameters to \`-version-info'"
++	  func_fatal_help "too many parameters to '-version-info'"
 +
 +	# convert absolute version numbers to libtool ages
 +	# this retains compatibility with .la files and attempts
@@ -33196,42 +35635,45 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	case $vinfo_number in
 +	yes)
-+	  number_major="$1"
-+	  number_minor="$2"
-+	  number_revision="$3"
++	  number_major=$1
++	  number_minor=$2
++	  number_revision=$3
 +	  #
 +	  # There are really only two kinds -- those that
 +	  # use the current revision as the major version
 +	  # and those that subtract age and use age as
 +	  # a minor version.  But, then there is irix
-+	  # which has an extra 1 added just for fun
++	  # that has an extra 1 added just for fun
 +	  #
 +	  case $version_type in
 +	  # correct linux to gnu/linux during the next big refactor
-+	  darwin|linux|osf|windows|none)
++	  darwin|freebsd-elf|linux|osf|windows|none)
 +	    func_arith $number_major + $number_minor
 +	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_revision"
++	    age=$number_minor
++	    revision=$number_revision
 +	    ;;
-+	  freebsd-aout|freebsd-elf|qnx|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
++	  freebsd-aout|qnx|sunos)
++	    current=$number_major
++	    revision=$number_minor
++	    age=0
 +	    ;;
 +	  irix|nonstopux)
 +	    func_arith $number_major + $number_minor
 +	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_minor"
++	    age=$number_minor
++	    revision=$number_minor
 +	    lt_irix_increment=no
 +	    ;;
++	  *)
++	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
++	    ;;
 +	  esac
 +	  ;;
 +	no)
-+	  current="$1"
-+	  revision="$2"
-+	  age="$3"
++	  current=$1
++	  revision=$2
++	  age=$3
 +	  ;;
 +	esac
 +
@@ -33239,30 +35681,30 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	case $current in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  func_error "CURRENT \`$current' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
++	  func_error "CURRENT '$current' must be a nonnegative integer"
++	  func_fatal_error "'$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	case $revision in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  func_error "REVISION \`$revision' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
++	  func_error "REVISION '$revision' must be a nonnegative integer"
++	  func_fatal_error "'$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	case $age in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  func_error "AGE \`$age' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
++	  func_error "AGE '$age' must be a nonnegative integer"
++	  func_fatal_error "'$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	if test "$age" -gt "$current"; then
-+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
++	  func_error "AGE '$age' is greater than the current interface number '$current'"
++	  func_fatal_error "'$vinfo' is not valid version information"
 +	fi
 +
 +	# Calculate the version variables.
@@ -33277,26 +35719,36 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  # verstring for coding it into the library header
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
++	  versuffix=$major.$age.$revision
 +	  # Darwin ld doesn't like 0 for these options...
 +	  func_arith $current + 1
 +	  minor_current=$func_arith_result
-+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 +	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++          # On Darwin other compilers
++          case $CC in
++              nagfor*)
++                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
++                  ;;
++              *)
++                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++                  ;;
++          esac
 +	  ;;
 +
 +	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
++	  major=.$current
++	  versuffix=.$current.$revision
 +	  ;;
 +
 +	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current"
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix=$major.$age.$revision
 +	  ;;
 +
 +	irix | nonstopux)
-+	  if test "X$lt_irix_increment" = "Xno"; then
++	  if test no = "$lt_irix_increment"; then
 +	    func_arith $current - $age
 +	  else
 +	    func_arith $current - $age + 1
@@ -33307,69 +35759,74 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    nonstopux) verstring_prefix=nonstopux ;;
 +	    *)         verstring_prefix=sgi ;;
 +	  esac
-+	  verstring="$verstring_prefix$major.$revision"
++	  verstring=$verstring_prefix$major.$revision
 +
 +	  # Add in all the interfaces that we are compatible with.
 +	  loop=$revision
-+	  while test "$loop" -ne 0; do
++	  while test 0 -ne "$loop"; do
 +	    func_arith $revision - $loop
 +	    iface=$func_arith_result
 +	    func_arith $loop - 1
 +	    loop=$func_arith_result
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
++	    verstring=$verstring_prefix$major.$iface:$verstring
 +	  done
 +
-+	  # Before this point, $major must not contain `.'.
++	  # Before this point, $major must not contain '.'.
 +	  major=.$major
-+	  versuffix="$major.$revision"
++	  versuffix=$major.$revision
 +	  ;;
 +
 +	linux) # correct to gnu/linux during the next big refactor
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
++	  versuffix=$major.$age.$revision
 +	  ;;
 +
 +	osf)
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
++	  versuffix=.$current.$age.$revision
++	  verstring=$current.$age.$revision
 +
 +	  # Add in all the interfaces that we are compatible with.
 +	  loop=$age
-+	  while test "$loop" -ne 0; do
++	  while test 0 -ne "$loop"; do
 +	    func_arith $current - $loop
 +	    iface=$func_arith_result
 +	    func_arith $loop - 1
 +	    loop=$func_arith_result
-+	    verstring="$verstring:${iface}.0"
++	    verstring=$verstring:$iface.0
 +	  done
 +
 +	  # Make executables depend on our current version.
-+	  func_append verstring ":${current}.0"
++	  func_append verstring ":$current.0"
 +	  ;;
 +
 +	qnx)
-+	  major=".$current"
-+	  versuffix=".$current"
++	  major=.$current
++	  versuffix=.$current
++	  ;;
++
++	sco)
++	  major=.$current
++	  versuffix=.$current
 +	  ;;
 +
 +	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
++	  major=.$current
++	  versuffix=.$current.$revision
 +	  ;;
 +
 +	windows)
 +	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
++	  # extension on DOS 8.3 file systems.
 +	  func_arith $current - $age
 +	  major=$func_arith_result
-+	  versuffix="-$major"
++	  versuffix=-$major
 +	  ;;
 +
 +	*)
-+	  func_fatal_configuration "unknown library version type \`$version_type'"
++	  func_fatal_configuration "unknown library version type '$version_type'"
 +	  ;;
 +	esac
 +
@@ -33383,42 +35840,45 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    verstring=
 +	    ;;
 +	  *)
-+	    verstring="0.0"
++	    verstring=0.0
 +	    ;;
 +	  esac
-+	  if test "$need_version" = no; then
++	  if test no = "$need_version"; then
 +	    versuffix=
 +	  else
-+	    versuffix=".0.0"
++	    versuffix=.0.0
 +	  fi
 +	fi
 +
 +	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
++	if test yes,no = "$avoid_version,$need_version"; then
 +	  major=
 +	  versuffix=
-+	  verstring=""
++	  verstring=
 +	fi
 +
 +	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    func_warning "undefined symbols not allowed in $host shared libraries"
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
++	if test yes = "$allow_undefined"; then
++	  if test unsupported = "$allow_undefined_flag"; then
++	    if test yes = "$build_old_libs"; then
++	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
++	      build_libtool_libs=no
++	    else
++	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
++	    fi
 +	  fi
 +	else
 +	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
++	  allow_undefined_flag=$no_undefined_flag
 +	fi
 +
 +      fi
 +
-+      func_generate_dlsyms "$libname" "$libname" "yes"
++      func_generate_dlsyms "$libname" "$libname" :
 +      func_append libobjs " $symfileobj"
-+      test "X$libobjs" = "X " && libobjs=
++      test " " = "$libobjs" && libobjs=
 +
-+      if test "$opt_mode" != relink; then
++      if test relink != "$opt_mode"; then
 +	# Remove our outputs, but don't remove object files since they
 +	# may have been created when compiling PIC objects.
 +	removelist=
@@ -33427,8 +35887,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  case $p in
 +	    *.$objext | *.gcno)
 +	       ;;
-+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+	       if test "X$precious_files_regex" != "X"; then
++	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
++	       if test -n "$precious_files_regex"; then
 +		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 +		 then
 +		   continue
@@ -33444,11 +35904,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      fi
 +
 +      # Now set the variables for building old libraries.
-+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
 +	func_append oldlibs " $output_objdir/$libname.$libext"
 +
 +	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
++	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
 +      fi
 +
 +      # Eliminate all temporary directories.
@@ -33469,13 +35929,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  *) func_append finalize_rpath " $libdir" ;;
 +	  esac
 +	done
-+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 +	  dependency_libs="$temp_xrpath $dependency_libs"
 +	fi
 +      fi
 +
 +      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
++      old_dlfiles=$dlfiles
 +      dlfiles=
 +      for lib in $old_dlfiles; do
 +	case " $dlprefiles $dlfiles " in
@@ -33485,7 +35945,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      done
 +
 +      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
++      old_dlprefiles=$dlprefiles
 +      dlprefiles=
 +      for lib in $old_dlprefiles; do
 +	case "$dlprefiles " in
@@ -33494,7 +35954,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	esac
 +      done
 +
-+      if test "$build_libtool_libs" = yes; then
++      if test yes = "$build_libtool_libs"; then
 +	if test -n "$rpath"; then
 +	  case $host in
 +	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -33518,7 +35978,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    ;;
 +	  *)
 +	    # Add libc to deplibs on all other systems if necessary.
-+	    if test "$build_libtool_need_lc" = "yes"; then
++	    if test yes = "$build_libtool_need_lc"; then
 +	      func_append deplibs " -lc"
 +	    fi
 +	    ;;
@@ -33534,9 +35994,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# I'm not sure if I'm treating the release correctly.  I think
 +	# release should show up in the -l (ie -lgmp5) so we don't want to
 +	# add it in twice.  Is that correct?
-+	release=""
-+	versuffix=""
-+	major=""
++	release=
++	versuffix=
++	major=
 +	newdeplibs=
 +	droppeddeps=no
 +	case $deplibs_check_method in
@@ -33565,20 +36025,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      -l*)
 +		func_stripname -l '' "$i"
 +		name=$func_stripname_result
-+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 +		  case " $predeps $postdeps " in
 +		  *" $i "*)
 +		    func_append newdeplibs " $i"
-+		    i=""
++		    i=
 +		    ;;
 +		  esac
 +		fi
-+		if test -n "$i" ; then
++		if test -n "$i"; then
 +		  libname=`eval "\\$ECHO \"$libname_spec\""`
 +		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 +		  set dummy $deplib_matches; shift
 +		  deplib_match=$1
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 +		    func_append newdeplibs " $i"
 +		  else
 +		    droppeddeps=yes
@@ -33608,20 +36068,20 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		$opt_dry_run || $RM conftest
 +		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 +		  ldd_output=`ldd conftest`
-+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 +		    case " $predeps $postdeps " in
 +		    *" $i "*)
 +		      func_append newdeplibs " $i"
-+		      i=""
++		      i=
 +		      ;;
 +		    esac
 +		  fi
-+		  if test -n "$i" ; then
++		  if test -n "$i"; then
 +		    libname=`eval "\\$ECHO \"$libname_spec\""`
 +		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 +		    set dummy $deplib_matches; shift
 +		    deplib_match=$1
-+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 +		      func_append newdeplibs " $i"
 +		    else
 +		      droppeddeps=yes
@@ -33658,24 +36118,24 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    -l*)
 +	      func_stripname -l '' "$a_deplib"
 +	      name=$func_stripname_result
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
 +		  func_append newdeplibs " $a_deplib"
-+		  a_deplib=""
++		  a_deplib=
 +		  ;;
 +		esac
 +	      fi
-+	      if test -n "$a_deplib" ; then
++	      if test -n "$a_deplib"; then
 +		libname=`eval "\\$ECHO \"$libname_spec\""`
 +		if test -n "$file_magic_glob"; then
 +		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 +		else
 +		  libnameglob=$libname
 +		fi
-+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
++		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  if test "$want_nocaseglob" = yes; then
++		  if test yes = "$want_nocaseglob"; then
 +		    shopt -s nocaseglob
 +		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 +		    $nocaseglob
@@ -33693,25 +36153,25 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		      # We might still enter an endless loop, since a link
 +		      # loop can be closed while we follow links,
 +		      # but so what?
-+		      potlib="$potent_lib"
++		      potlib=$potent_lib
 +		      while test -h "$potlib" 2>/dev/null; do
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
++			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 +			case $potliblink in
-+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
++			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
++			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
 +			esac
 +		      done
 +		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 +			 $SED -e 10q |
 +			 $EGREP "$file_magic_regex" > /dev/null; then
 +			func_append newdeplibs " $a_deplib"
-+			a_deplib=""
++			a_deplib=
 +			break 2
 +		      fi
 +		  done
 +		done
 +	      fi
-+	      if test -n "$a_deplib" ; then
++	      if test -n "$a_deplib"; then
 +		droppeddeps=yes
 +		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -33719,7 +36179,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		echo "*** you link to this library.  But I can only do this if you have a"
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
++		if test -z "$potlib"; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 +		else
 +		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -33742,30 +36202,30 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    -l*)
 +	      func_stripname -l '' "$a_deplib"
 +	      name=$func_stripname_result
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
 +		  func_append newdeplibs " $a_deplib"
-+		  a_deplib=""
++		  a_deplib=
 +		  ;;
 +		esac
 +	      fi
-+	      if test -n "$a_deplib" ; then
++	      if test -n "$a_deplib"; then
 +		libname=`eval "\\$ECHO \"$libname_spec\""`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 +		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 +		  for potent_lib in $potential_libs; do
-+		    potlib="$potent_lib" # see symlink-check above in file_magic test
++		    potlib=$potent_lib # see symlink-check above in file_magic test
 +		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 +		       $EGREP "$match_pattern_regex" > /dev/null; then
 +		      func_append newdeplibs " $a_deplib"
-+		      a_deplib=""
++		      a_deplib=
 +		      break 2
 +		    fi
 +		  done
 +		done
 +	      fi
-+	      if test -n "$a_deplib" ; then
++	      if test -n "$a_deplib"; then
 +		droppeddeps=yes
 +		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -33773,7 +36233,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		echo "*** you link to this library.  But I can only do this if you have a"
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
++		if test -z "$potlib"; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 +		else
 +		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -33789,18 +36249,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  done # Gone through all deplibs.
 +	  ;;
 +	none | unknown | *)
-+	  newdeplibs=""
++	  newdeplibs=
 +	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	    for i in $predeps $postdeps ; do
++	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++	    for i in $predeps $postdeps; do
 +	      # can't use Xsed below, because $i might contain '/'
-+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
++	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 +	    done
 +	  fi
 +	  case $tmp_deplibs in
 +	  *[!\	\ ]*)
 +	    echo
-+	    if test "X$deplibs_check_method" = "Xnone"; then
++	    if test none = "$deplibs_check_method"; then
 +	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 +	    else
 +	      echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -33824,8 +36284,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  ;;
 +	esac
 +
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
++	if test yes = "$droppeddeps"; then
++	  if test yes = "$module"; then
 +	    echo
 +	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 +	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
@@ -33834,12 +36294,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    if test -z "$global_symbol_pipe"; then
 +	      echo
 +	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 +	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 +	    fi
-+	    if test "$build_old_libs" = no; then
-+	      oldlibs="$output_objdir/$libname.$libext"
++	    if test no = "$build_old_libs"; then
++	      oldlibs=$output_objdir/$libname.$libext
 +	      build_libtool_libs=module
 +	      build_old_libs=yes
 +	    else
@@ -33850,14 +36310,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    echo "*** automatically added whenever a program is linked with this library"
 +	    echo "*** or is declared to -dlopen it."
 +
-+	    if test "$allow_undefined" = no; then
++	    if test no = "$allow_undefined"; then
 +	      echo
 +	      echo "*** Since this library must not contain undefined symbols,"
 +	      echo "*** because either the platform does not support them or"
 +	      echo "*** it was explicitly requested with -no-undefined,"
 +	      echo "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
++	      if test no = "$build_old_libs"; then
++		oldlibs=$output_objdir/$libname.$libext
 +		build_libtool_libs=module
 +		build_old_libs=yes
 +	      else
@@ -33903,7 +36363,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
-+      deplibs="$new_libs"
++      deplibs=$new_libs
 +
 +      # All the library-specific variables (install_libdir is set above).
 +      library_names=
@@ -33911,25 +36371,25 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      dlname=
 +
 +      # Test again, we may have decided not to build it any more
-+      if test "$build_libtool_libs" = yes; then
-+	# Remove ${wl} instances when linking with ld.
++      if test yes = "$build_libtool_libs"; then
++	# Remove $wl instances when linking with ld.
 +	# FIXME: should test the right _cmds variable.
 +	case $archive_cmds in
 +	  *\$LD\ *) wl= ;;
 +        esac
-+	if test "$hardcode_into_libs" = yes; then
++	if test yes = "$hardcode_into_libs"; then
 +	  # Hardcode the library paths
 +	  hardcode_libdirs=
 +	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
++	  rpath=$finalize_rpath
++	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 +	  for libdir in $rpath; do
 +	    if test -n "$hardcode_libdir_flag_spec"; then
 +	      if test -n "$hardcode_libdir_separator"; then
 +		func_replace_sysroot "$libdir"
 +		libdir=$func_replace_sysroot_result
 +		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
++		  hardcode_libdirs=$libdir
 +		else
 +		  # Just accumulate the unique libdirs.
 +		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -33954,7 +36414,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  # Substitute the hardcoded libdirs into the rpath.
 +	  if test -n "$hardcode_libdir_separator" &&
 +	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
++	    libdir=$hardcode_libdirs
 +	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 +	  fi
 +	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -33968,8 +36428,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 +	fi
 +
-+	shlibpath="$finalize_shlibpath"
-+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	shlibpath=$finalize_shlibpath
++	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 +	if test -n "$shlibpath"; then
 +	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 +	fi
@@ -33979,19 +36439,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	eval library_names=\"$library_names_spec\"
 +	set dummy $library_names
 +	shift
-+	realname="$1"
++	realname=$1
 +	shift
 +
 +	if test -n "$soname_spec"; then
 +	  eval soname=\"$soname_spec\"
 +	else
-+	  soname="$realname"
++	  soname=$realname
 +	fi
 +	if test -z "$dlname"; then
 +	  dlname=$soname
 +	fi
 +
-+	lib="$output_objdir/$realname"
++	lib=$output_objdir/$realname
 +	linknames=
 +	for link
 +	do
@@ -34005,7 +36465,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	delfiles=
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-+	  export_symbols="$output_objdir/$libname.uexp"
++	  export_symbols=$output_objdir/$libname.uexp
 +	  func_append delfiles " $export_symbols"
 +	fi
 +
@@ -34014,31 +36474,31 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	cygwin* | mingw* | cegcc*)
 +	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 +	    # exporting using user supplied symfile
-+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
++	    func_dll_def_p "$export_symbols" || {
 +	      # and it's NOT already a .def file. Must figure out
 +	      # which of the given symbols are data symbols and tag
 +	      # them as such. So, trigger use of export_symbols_cmds.
 +	      # export_symbols gets reassigned inside the "prepare
 +	      # the list of exported symbols" if statement, so the
 +	      # include_expsyms logic still works.
-+	      orig_export_symbols="$export_symbols"
++	      orig_export_symbols=$export_symbols
 +	      export_symbols=
 +	      always_export_symbols=yes
-+	    fi
++	    }
 +	  fi
 +	  ;;
 +	esac
 +
 +	# Prepare the list of exported symbols
 +	if test -z "$export_symbols"; then
-+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+	    func_verbose "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
++	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
++	    func_verbose "generating symbol list for '$libname.la'"
++	    export_symbols=$output_objdir/$libname.exp
 +	    $opt_dry_run || $RM $export_symbols
 +	    cmds=$export_symbols_cmds
-+	    save_ifs="$IFS"; IFS='~'
++	    save_ifs=$IFS; IFS='~'
 +	    for cmd1 in $cmds; do
-+	      IFS="$save_ifs"
++	      IFS=$save_ifs
 +	      # Take the normal branch if the nm_file_list_spec branch
 +	      # doesn't work or if tool conversion is not needed.
 +	      case $nm_file_list_spec~$to_tool_file_cmd in
@@ -34052,7 +36512,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		  try_normal_branch=no
 +		  ;;
 +	      esac
-+	      if test "$try_normal_branch" = yes \
++	      if test yes = "$try_normal_branch" \
 +		 && { test "$len" -lt "$max_cmd_len" \
 +		      || test "$max_cmd_len" -le -1; }
 +	      then
@@ -34063,7 +36523,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		output_la=$func_basename_result
 +		save_libobjs=$libobjs
 +		save_output=$output
-+		output=${output_objdir}/${output_la}.nm
++		output=$output_objdir/$output_la.nm
 +		func_to_tool_file "$output"
 +		libobjs=$nm_file_list_spec$func_to_tool_file_result
 +		func_append delfiles " $output"
@@ -34086,8 +36546,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		break
 +	      fi
 +	    done
-+	    IFS="$save_ifs"
-+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
++	    IFS=$save_ifs
++	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 +	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 +	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 +	    fi
@@ -34095,16 +36555,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  tmp_export_symbols="$export_symbols"
-+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
++	  tmp_export_symbols=$export_symbols
++	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 +	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	fi
 +
-+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
++	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 +	  # The given exports_symbols file has to be filtered, so filter it.
-+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
++	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 +	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+	  # 's' commands which not all seds can handle. GNU sed should be fine
++	  # 's' commands, which not all seds can handle. GNU sed should be fine
 +	  # though. Also, the filter scales superlinearly with the number of
 +	  # global variables. join(1) would be nice here, but unfortunately
 +	  # isn't a blessed tool.
@@ -34123,11 +36583,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    ;;
 +	  esac
 +	done
-+	deplibs="$tmp_deplibs"
++	deplibs=$tmp_deplibs
 +
 +	if test -n "$convenience"; then
 +	  if test -n "$whole_archive_flag_spec" &&
-+	    test "$compiler_needs_object" = yes &&
++	    test yes = "$compiler_needs_object" &&
 +	    test -z "$libobjs"; then
 +	    # extract the archives, so we have objects to list.
 +	    # TODO: could optimize this to just extract one archive.
@@ -34138,7 +36598,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
 +	  else
-+	    gentop="$output_objdir/${outputname}x"
++	    gentop=$output_objdir/${outputname}x
 +	    func_append generated " $gentop"
 +
 +	    func_extract_archives $gentop $convenience
@@ -34147,18 +36607,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  fi
 +	fi
 +
-+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 +	  eval flag=\"$thread_safe_flag_spec\"
 +	  func_append linker_flags " $flag"
 +	fi
 +
 +	# Make a backup of the uninstalled library when relinking
-+	if test "$opt_mode" = relink; then
++	if test relink = "$opt_mode"; then
 +	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 +	fi
 +
 +	# Do each of the archive commands.
-+	if test "$module" = yes && test -n "$module_cmds" ; then
++	if test yes = "$module" && test -n "$module_cmds"; then
 +	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 +	    eval test_cmds=\"$module_expsym_cmds\"
 +	    cmds=$module_expsym_cmds
@@ -34176,7 +36636,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  fi
 +	fi
 +
-+	if test "X$skipped_export" != "X:" &&
++	if test : != "$skipped_export" &&
 +	   func_len " $test_cmds" &&
 +	   len=$func_len_result &&
 +	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -34209,8 +36669,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  last_robj=
 +	  k=1
 +
-+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-+	    output=${output_objdir}/${output_la}.lnkscript
++	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
++	    output=$output_objdir/$output_la.lnkscript
 +	    func_verbose "creating GNU ld script: $output"
 +	    echo 'INPUT (' > $output
 +	    for obj in $save_libobjs
@@ -34222,14 +36682,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_append delfiles " $output"
 +	    func_to_tool_file "$output"
 +	    output=$func_to_tool_file_result
-+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-+	    output=${output_objdir}/${output_la}.lnk
++	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
++	    output=$output_objdir/$output_la.lnk
 +	    func_verbose "creating linker input file list: $output"
 +	    : > $output
 +	    set x $save_libobjs
 +	    shift
 +	    firstobj=
-+	    if test "$compiler_needs_object" = yes; then
++	    if test yes = "$compiler_needs_object"; then
 +	      firstobj="$1 "
 +	      shift
 +	    fi
@@ -34244,7 +36704,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  else
 +	    if test -n "$save_libobjs"; then
 +	      func_verbose "creating reloadable object files..."
-+	      output=$output_objdir/$output_la-${k}.$objext
++	      output=$output_objdir/$output_la-$k.$objext
 +	      eval test_cmds=\"$reload_cmds\"
 +	      func_len " $test_cmds"
 +	      len0=$func_len_result
@@ -34256,13 +36716,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		func_len " $obj"
 +		func_arith $len + $func_len_result
 +		len=$func_arith_result
-+		if test "X$objlist" = X ||
++		if test -z "$objlist" ||
 +		   test "$len" -lt "$max_cmd_len"; then
 +		  func_append objlist " $obj"
 +		else
 +		  # The command $test_cmds is almost too long, add a
 +		  # command to the queue.
-+		  if test "$k" -eq 1 ; then
++		  if test 1 -eq "$k"; then
 +		    # The first file doesn't have a previous command to add.
 +		    reload_objs=$objlist
 +		    eval concat_cmds=\"$reload_cmds\"
@@ -34272,10 +36732,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		    reload_objs="$objlist $last_robj"
 +		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 +		  fi
-+		  last_robj=$output_objdir/$output_la-${k}.$objext
++		  last_robj=$output_objdir/$output_la-$k.$objext
 +		  func_arith $k + 1
 +		  k=$func_arith_result
-+		  output=$output_objdir/$output_la-${k}.$objext
++		  output=$output_objdir/$output_la-$k.$objext
 +		  objlist=" $obj"
 +		  func_len " $last_robj"
 +		  func_arith $len0 + $func_len_result
@@ -34287,9 +36747,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      # files will link in the last one created.
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 +	      reload_objs="$objlist $last_robj"
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
++	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 +	      if test -n "$last_robj"; then
-+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
++	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 +	      fi
 +	      func_append delfiles " $output"
 +
@@ -34297,9 +36757,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      output=
 +	    fi
 +
-+	    if ${skipped_export-false}; then
-+	      func_verbose "generating symbol list for \`$libname.la'"
-+	      export_symbols="$output_objdir/$libname.exp"
++	    ${skipped_export-false} && {
++	      func_verbose "generating symbol list for '$libname.la'"
++	      export_symbols=$output_objdir/$libname.exp
 +	      $opt_dry_run || $RM $export_symbols
 +	      libobjs=$output
 +	      # Append the command to create the export file.
@@ -34308,16 +36768,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      if test -n "$last_robj"; then
 +		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 +	      fi
-+	    fi
++	    }
 +
 +	    test -n "$save_libobjs" &&
 +	      func_verbose "creating a temporary reloadable object file: $output"
 +
 +	    # Loop through the commands generated above and execute them.
-+	    save_ifs="$IFS"; IFS='~'
++	    save_ifs=$IFS; IFS='~'
 +	    for cmd in $concat_cmds; do
-+	      IFS="$save_ifs"
-+	      $opt_silent || {
++	      IFS=$save_ifs
++	      $opt_quiet || {
 +		  func_quote_for_expand "$cmd"
 +		  eval "func_echo $func_quote_for_expand_result"
 +	      }
@@ -34325,7 +36785,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		lt_exit=$?
 +
 +		# Restore the uninstalled library and exit
-+		if test "$opt_mode" = relink; then
++		if test relink = "$opt_mode"; then
 +		  ( cd "$output_objdir" && \
 +		    $RM "${realname}T" && \
 +		    $MV "${realname}U" "$realname" )
@@ -34334,7 +36794,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		exit $lt_exit
 +	      }
 +	    done
-+	    IFS="$save_ifs"
++	    IFS=$save_ifs
 +
 +	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 +	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -34342,18 +36802,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    fi
 +	  fi
 +
-+          if ${skipped_export-false}; then
++          ${skipped_export-false} && {
 +	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	      tmp_export_symbols="$export_symbols"
-+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
++	      tmp_export_symbols=$export_symbols
++	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 +	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	    fi
 +
 +	    if test -n "$orig_export_symbols"; then
 +	      # The given exports_symbols file has to be filtered, so filter it.
-+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
++	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 +	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+	      # 's' commands which not all seds can handle. GNU sed should be fine
++	      # 's' commands, which not all seds can handle. GNU sed should be fine
 +	      # though. Also, the filter scales superlinearly with the number of
 +	      # global variables. join(1) would be nice here, but unfortunately
 +	      # isn't a blessed tool.
@@ -34362,7 +36822,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      export_symbols=$output_objdir/$libname.def
 +	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 +	    fi
-+	  fi
++	  }
 +
 +	  libobjs=$output
 +	  # Restore the value of output.
@@ -34376,7 +36836,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  # value of $libobjs for piecewise linking.
 +
 +	  # Do each of the archive commands.
-+	  if test "$module" = yes && test -n "$module_cmds" ; then
++	  if test yes = "$module" && test -n "$module_cmds"; then
 +	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 +	      cmds=$module_expsym_cmds
 +	    else
@@ -34398,7 +36858,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
++	  gentop=$output_objdir/${outputname}x
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $dlprefiles
@@ -34406,11 +36866,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  test "X$libobjs" = "X " && libobjs=
 +	fi
 +
-+	save_ifs="$IFS"; IFS='~'
++	save_ifs=$IFS; IFS='~'
 +	for cmd in $cmds; do
-+	  IFS="$save_ifs"
++	  IFS=$sp$nl
 +	  eval cmd=\"$cmd\"
-+	  $opt_silent || {
++	  IFS=$save_ifs
++	  $opt_quiet || {
 +	    func_quote_for_expand "$cmd"
 +	    eval "func_echo $func_quote_for_expand_result"
 +	  }
@@ -34418,7 +36879,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    lt_exit=$?
 +
 +	    # Restore the uninstalled library and exit
-+	    if test "$opt_mode" = relink; then
++	    if test relink = "$opt_mode"; then
 +	      ( cd "$output_objdir" && \
 +	        $RM "${realname}T" && \
 +		$MV "${realname}U" "$realname" )
@@ -34427,10 +36888,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    exit $lt_exit
 +	  }
 +	done
-+	IFS="$save_ifs"
++	IFS=$save_ifs
 +
 +	# Restore the uninstalled library and exit
-+	if test "$opt_mode" = relink; then
++	if test relink = "$opt_mode"; then
 +	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 +
 +	  if test -n "$convenience"; then
@@ -34450,39 +36911,39 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	done
 +
 +	# If -module or -export-dynamic was specified, set the dlname.
-+	if test "$module" = yes || test "$export_dynamic" = yes; then
++	if test yes = "$module" || test yes = "$export_dynamic"; then
 +	  # On all known operating systems, these are identical.
-+	  dlname="$soname"
++	  dlname=$soname
 +	fi
 +      fi
 +      ;;
 +
 +    obj)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for objects"
++      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
++	func_warning "'-dlopen' is ignored for objects"
 +      fi
 +
 +      case " $deplibs" in
 +      *\ -l* | *\ -L*)
-+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
++	func_warning "'-l' and '-L' are ignored for objects" ;;
 +      esac
 +
 +      test -n "$rpath" && \
-+	func_warning "\`-rpath' is ignored for objects"
++	func_warning "'-rpath' is ignored for objects"
 +
 +      test -n "$xrpath" && \
-+	func_warning "\`-R' is ignored for objects"
++	func_warning "'-R' is ignored for objects"
 +
 +      test -n "$vinfo" && \
-+	func_warning "\`-version-info' is ignored for objects"
++	func_warning "'-version-info' is ignored for objects"
 +
 +      test -n "$release" && \
-+	func_warning "\`-release' is ignored for objects"
++	func_warning "'-release' is ignored for objects"
 +
 +      case $output in
 +      *.lo)
 +	test -n "$objs$old_deplibs" && \
-+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
++	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 +
 +	libobj=$output
 +	func_lo2o "$libobj"
@@ -34490,7 +36951,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	;;
 +      *)
 +	libobj=
-+	obj="$output"
++	obj=$output
 +	;;
 +      esac
 +
@@ -34503,17 +36964,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # the extraction.
 +      reload_conv_objs=
 +      gentop=
-+      # reload_cmds runs $LD directly, so let us get rid of
-+      # -Wl from whole_archive_flag_spec and hope we can get by with
-+      # turning comma into space..
-+      wl=
-+
++      # if reload_cmds runs $LD directly, get rid of -Wl from
++      # whole_archive_flag_spec and hope we can get by with turning comma
++      # into space.
++      case $reload_cmds in
++        *\$LD[\ \$]*) wl= ;;
++      esac
 +      if test -n "$convenience"; then
 +	if test -n "$whole_archive_flag_spec"; then
 +	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
++	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
++	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 +	else
-+	  gentop="$output_objdir/${obj}x"
++	  gentop=$output_objdir/${obj}x
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $convenience
@@ -34522,12 +36985,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      fi
 +
 +      # If we're not building shared, we need to use non_pic_objs
-+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
++      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 +
 +      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 +
-+      output="$obj"
++      output=$obj
 +      func_execute_cmds "$reload_cmds" 'exit $?'
 +
 +      # Exit if we aren't doing a library object file.
@@ -34539,7 +37002,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	exit $EXIT_SUCCESS
 +      fi
 +
-+      if test "$build_libtool_libs" != yes; then
++      test yes = "$build_libtool_libs" || {
 +	if test -n "$gentop"; then
 +	  func_show_eval '${RM}r "$gentop"'
 +	fi
@@ -34549,12 +37012,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	# $show "echo timestamp > $libobj"
 +	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 +	exit $EXIT_SUCCESS
-+      fi
++      }
 +
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
++      if test -n "$pic_flag" || test default != "$pic_mode"; then
 +	# Only do commands if we really have different PIC objects.
 +	reload_objs="$libobjs $reload_conv_objs"
-+	output="$libobj"
++	output=$libobj
 +	func_execute_cmds "$reload_cmds" 'exit $?'
 +      fi
 +
@@ -34571,16 +37034,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	          output=$func_stripname_result.exe;;
 +      esac
 +      test -n "$vinfo" && \
-+	func_warning "\`-version-info' is ignored for programs"
++	func_warning "'-version-info' is ignored for programs"
 +
 +      test -n "$release" && \
-+	func_warning "\`-release' is ignored for programs"
++	func_warning "'-release' is ignored for programs"
 +
-+      test "$preload" = yes \
-+        && test "$dlopen_support" = unknown \
-+	&& test "$dlopen_self" = unknown \
-+	&& test "$dlopen_self_static" = unknown && \
-+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
++      $preload \
++	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
++	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 +
 +      case $host in
 +      *-*-rhapsody* | *-*-darwin1.[012])
@@ -34594,11 +37055,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      *-*-darwin*)
 +	# Don't allow lazy linking, it breaks C++ global constructors
 +	# But is supposedly fixed on 10.4 or later (yay!).
-+	if test "$tagname" = CXX ; then
++	if test CXX = "$tagname"; then
 +	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 +	    10.[0123])
-+	      func_append compile_command " ${wl}-bind_at_load"
-+	      func_append finalize_command " ${wl}-bind_at_load"
++	      func_append compile_command " $wl-bind_at_load"
++	      func_append finalize_command " $wl-bind_at_load"
 +	    ;;
 +	  esac
 +	fi
@@ -34634,7 +37095,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
-+      compile_deplibs="$new_libs"
++      compile_deplibs=$new_libs
 +
 +
 +      func_append compile_command " $compile_deplibs"
@@ -34658,7 +37119,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if test -n "$hardcode_libdir_flag_spec"; then
 +	  if test -n "$hardcode_libdir_separator"; then
 +	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
++	      hardcode_libdirs=$libdir
 +	    else
 +	      # Just accumulate the unique libdirs.
 +	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -34681,7 +37142,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +	case $host in
 +	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
++	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 +	  case :$dllsearchpath: in
 +	  *":$libdir:"*) ;;
 +	  ::) dllsearchpath=$libdir;;
@@ -34698,10 +37159,10 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # Substitute the hardcoded libdirs into the rpath.
 +      if test -n "$hardcode_libdir_separator" &&
 +	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
++	libdir=$hardcode_libdirs
 +	eval rpath=\" $hardcode_libdir_flag_spec\"
 +      fi
-+      compile_rpath="$rpath"
++      compile_rpath=$rpath
 +
 +      rpath=
 +      hardcode_libdirs=
@@ -34709,7 +37170,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	if test -n "$hardcode_libdir_flag_spec"; then
 +	  if test -n "$hardcode_libdir_separator"; then
 +	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
++	      hardcode_libdirs=$libdir
 +	    else
 +	      # Just accumulate the unique libdirs.
 +	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -34734,45 +37195,43 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      # Substitute the hardcoded libdirs into the rpath.
 +      if test -n "$hardcode_libdir_separator" &&
 +	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
++	libdir=$hardcode_libdirs
 +	eval rpath=\" $hardcode_libdir_flag_spec\"
 +      fi
-+      finalize_rpath="$rpath"
++      finalize_rpath=$rpath
 +
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 +	# Transform all the library objects into standard objects.
 +	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +      fi
 +
-+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
++      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 +
 +      # template prelinking step
 +      if test -n "$prelink_cmds"; then
 +	func_execute_cmds "$prelink_cmds" 'exit $?'
 +      fi
 +
-+      wrappers_required=yes
++      wrappers_required=:
 +      case $host in
 +      *cegcc* | *mingw32ce*)
 +        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-+        wrappers_required=no
++        wrappers_required=false
 +        ;;
 +      *cygwin* | *mingw* )
-+        if test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
-+        fi
++        test yes = "$build_libtool_libs" || wrappers_required=false
 +        ;;
 +      *)
-+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
++        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
++          wrappers_required=false
 +        fi
 +        ;;
 +      esac
-+      if test "$wrappers_required" = no; then
++      $wrappers_required || {
 +	# Replace the output file specification.
 +	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
++	link_command=$compile_command$compile_rpath
 +
 +	# We have no uninstalled library dependencies, so finalize right now.
 +	exit_status=0
@@ -34785,12 +37244,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +
 +	# Delete the generated files.
-+	if test -f "$output_objdir/${outputname}S.${objext}"; then
-+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
++	if test -f "$output_objdir/${outputname}S.$objext"; then
++	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 +	fi
 +
 +	exit $exit_status
-+      fi
++      }
 +
 +      if test -n "$compile_shlibpath$finalize_shlibpath"; then
 +	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -34820,9 +37279,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +      fi
 +
-+      if test "$no_install" = yes; then
++      if test yes = "$no_install"; then
 +	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
++	link_command=$compile_var$compile_command$compile_rpath
 +	# Replace the output file specification.
 +	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 +	# Delete the old output file.
@@ -34839,27 +37298,28 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	exit $EXIT_SUCCESS
 +      fi
 +
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
++      case $hardcode_action,$fast_install in
++        relink,*)
++	  # Fast installation is not supported
++	  link_command=$compile_var$compile_command$compile_rpath
++	  relink_command=$finalize_var$finalize_command$finalize_rpath
 +
-+	func_warning "this platform does not like uninstalled shared libraries"
-+	func_warning "\`$output' will be relinked during installation"
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
-+      fi
++	  func_warning "this platform does not like uninstalled shared libraries"
++	  func_warning "'$output' will be relinked during installation"
++	  ;;
++        *,yes)
++	  link_command=$finalize_var$compile_command$finalize_rpath
++	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++          ;;
++	*,no)
++	  link_command=$compile_var$compile_command$compile_rpath
++	  relink_command=$finalize_var$finalize_command$finalize_rpath
++          ;;
++	*,needless)
++	  link_command=$finalize_var$compile_command$finalize_rpath
++	  relink_command=
++          ;;
++      esac
 +
 +      # Replace the output file specification.
 +      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -34916,8 +37376,8 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    func_dirname_and_basename "$output" "" "."
 +	    output_name=$func_basename_result
 +	    output_path=$func_dirname_result
-+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-+	    cwrapper="$output_path/$output_name.exe"
++	    cwrappersource=$output_path/$objdir/lt-$output_name.c
++	    cwrapper=$output_path/$output_name.exe
 +	    $RM $cwrappersource $cwrapper
 +	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 +
@@ -34938,7 +37398,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 +	    $opt_dry_run || {
 +	      # note: this script will not be executed, so do not chmod.
-+	      if test "x$build" = "x$host" ; then
++	      if test "x$build" = "x$host"; then
 +		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 +	      else
 +		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -34961,25 +37421,27 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    # See if we need to build an old-fashioned archive.
 +    for oldlib in $oldlibs; do
 +
-+      if test "$build_libtool_libs" = convenience; then
-+	oldobjs="$libobjs_save $symfileobj"
-+	addlibs="$convenience"
-+	build_libtool_libs=no
-+      else
-+	if test "$build_libtool_libs" = module; then
-+	  oldobjs="$libobjs_save"
++      case $build_libtool_libs in
++        convenience)
++	  oldobjs="$libobjs_save $symfileobj"
++	  addlibs=$convenience
 +	  build_libtool_libs=no
-+	else
++	  ;;
++	module)
++	  oldobjs=$libobjs_save
++	  addlibs=$old_convenience
++	  build_libtool_libs=no
++          ;;
++	*)
 +	  oldobjs="$old_deplibs $non_pic_objects"
-+	  if test "$preload" = yes && test -f "$symfileobj"; then
-+	    func_append oldobjs " $symfileobj"
-+	  fi
-+	fi
-+	addlibs="$old_convenience"
-+      fi
++	  $preload && test -f "$symfileobj" \
++	    && func_append oldobjs " $symfileobj"
++	  addlibs=$old_convenience
++	  ;;
++      esac
 +
 +      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
++	gentop=$output_objdir/${outputname}x
 +	func_append generated " $gentop"
 +
 +	func_extract_archives $gentop $addlibs
@@ -34987,13 +37449,13 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      fi
 +
 +      # Do each command in the archive commands.
-+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
++      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 +	cmds=$old_archive_from_new_cmds
 +      else
 +
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
++	  gentop=$output_objdir/${outputname}x
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $dlprefiles
@@ -35014,7 +37476,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  :
 +	else
 +	  echo "copying selected object files to avoid basename conflicts..."
-+	  gentop="$output_objdir/${outputname}x"
++	  gentop=$output_objdir/${outputname}x
 +	  func_append generated " $gentop"
 +	  func_mkdir_p "$gentop"
 +	  save_oldobjs=$oldobjs
@@ -35023,7 +37485,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  for obj in $save_oldobjs
 +	  do
 +	    func_basename "$obj"
-+	    objbase="$func_basename_result"
++	    objbase=$func_basename_result
 +	    case " $oldobjs " in
 +	    " ") oldobjs=$obj ;;
 +	    *[\ /]"$objbase "*)
@@ -35092,18 +37554,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	    else
 +	      # the above command should be used before it gets too long
 +	      oldobjs=$objlist
-+	      if test "$obj" = "$last_oldobj" ; then
++	      if test "$obj" = "$last_oldobj"; then
 +		RANLIB=$save_RANLIB
 +	      fi
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
++	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 +	      objlist=
 +	      len=$len0
 +	    fi
 +	  done
 +	  RANLIB=$save_RANLIB
 +	  oldobjs=$objlist
-+	  if test "X$oldobjs" = "X" ; then
++	  if test -z "$oldobjs"; then
 +	    eval cmds=\"\$concat_cmds\"
 +	  else
 +	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -35120,7 +37582,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    case $output in
 +    *.la)
 +      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
++      test yes = "$build_old_libs" && old_library=$libname.$libext
 +      func_verbose "creating $output"
 +
 +      # Preserve any variables that may affect compiler behavior
@@ -35135,31 +37597,31 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	fi
 +      done
 +      # Quote the link command for shipping.
-+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
 +      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+      if test "$hardcode_automatic" = yes ; then
++      if test yes = "$hardcode_automatic"; then
 +	relink_command=
 +      fi
 +
 +      # Only create the output if not a dry run.
 +      $opt_dry_run || {
 +	for installed in no yes; do
-+	  if test "$installed" = yes; then
++	  if test yes = "$installed"; then
 +	    if test -z "$install_libdir"; then
 +	      break
 +	    fi
-+	    output="$output_objdir/$outputname"i
++	    output=$output_objdir/${outputname}i
 +	    # Replace all uninstalled libtool libraries with the installed ones
 +	    newdependency_libs=
 +	    for deplib in $dependency_libs; do
 +	      case $deplib in
 +	      *.la)
 +		func_basename "$deplib"
-+		name="$func_basename_result"
++		name=$func_basename_result
 +		func_resolve_sysroot "$deplib"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
++		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 +		test -z "$libdir" && \
-+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
++		  func_fatal_error "'$deplib' is not a valid libtool archive"
 +		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      -L*)
@@ -35175,23 +37637,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	      *) func_append newdependency_libs " $deplib" ;;
 +	      esac
 +	    done
-+	    dependency_libs="$newdependency_libs"
++	    dependency_libs=$newdependency_libs
 +	    newdlfiles=
 +
 +	    for lib in $dlfiles; do
 +	      case $lib in
 +	      *.la)
 +	        func_basename "$lib"
-+		name="$func_basename_result"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++		name=$func_basename_result
++		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
-+		  func_fatal_error "\`$lib' is not a valid libtool archive"
++		  func_fatal_error "'$lib' is not a valid libtool archive"
 +		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      *) func_append newdlfiles " $lib" ;;
 +	      esac
 +	    done
-+	    dlfiles="$newdlfiles"
++	    dlfiles=$newdlfiles
 +	    newdlprefiles=
 +	    for lib in $dlprefiles; do
 +	      case $lib in
@@ -35201,34 +37663,34 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +		# didn't already link the preopened objects directly into
 +		# the library:
 +		func_basename "$lib"
-+		name="$func_basename_result"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++		name=$func_basename_result
++		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
-+		  func_fatal_error "\`$lib' is not a valid libtool archive"
++		  func_fatal_error "'$lib' is not a valid libtool archive"
 +		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      esac
 +	    done
-+	    dlprefiles="$newdlprefiles"
++	    dlprefiles=$newdlprefiles
 +	  else
 +	    newdlfiles=
 +	    for lib in $dlfiles; do
 +	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
 +	      func_append newdlfiles " $abs"
 +	    done
-+	    dlfiles="$newdlfiles"
++	    dlfiles=$newdlfiles
 +	    newdlprefiles=
 +	    for lib in $dlprefiles; do
 +	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
 +	      func_append newdlprefiles " $abs"
 +	    done
-+	    dlprefiles="$newdlprefiles"
++	    dlprefiles=$newdlprefiles
 +	  fi
 +	  $RM $output
 +	  # place dlname in correct position for cygwin
@@ -35244,10 +37706,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  case $host,$output,$installed,$module,$dlname in
 +	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 +	      # If a -bindir argument was supplied, place the dll there.
-+	      if test "x$bindir" != x ;
-+	      then
++	      if test -n "$bindir"; then
 +		func_relative_path "$install_libdir" "$bindir"
-+		tdlname=$func_relative_path_result$dlname
++		tdlname=$func_relative_path_result/$dlname
 +	      else
 +		# Otherwise fall back on heuristic.
 +		tdlname=../bin/$dlname
@@ -35256,7 +37717,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  esac
 +	  $ECHO > $output "\
 +# $outputname - a libtool library file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 +#
 +# Please DO NOT delete this file!
 +# It is necessary for linking the library.
@@ -35270,7 +37731,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# The name of the static archive.
 +old_library='$old_library'
 +
-+# Linker flags that can not go in dependency_libs.
++# Linker flags that cannot go in dependency_libs.
 +inherited_linker_flags='$new_inherited_linker_flags'
 +
 +# Libraries that this one depends upon.
@@ -35296,7 +37757,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +# Directory that this library needs to be installed in:
 +libdir='$install_libdir'"
-+	  if test "$installed" = no && test "$need_relink" = yes; then
++	  if test no,yes = "$installed,$need_relink"; then
 +	    $ECHO >> $output "\
 +relink_command=\"$relink_command\""
 +	  fi
@@ -35311,27 +37772,29 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    exit $EXIT_SUCCESS
 +}
 +
-+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-+    func_mode_link ${1+"$@"}
++if test link = "$opt_mode" || test relink = "$opt_mode"; then
++  func_mode_link ${1+"$@"}
++fi
 +
 +
 +# func_mode_uninstall arg...
 +func_mode_uninstall ()
 +{
-+    $opt_debug
-+    RM="$nonopt"
++    $debug_cmd
++
++    RM=$nonopt
 +    files=
-+    rmforce=
++    rmforce=false
 +    exit_status=0
 +
 +    # This variable tells wrapper scripts just to set variables rather
 +    # than running their programs.
-+    libtool_install_magic="$magic"
++    libtool_install_magic=$magic
 +
 +    for arg
 +    do
 +      case $arg in
-+      -f) func_append RM " $arg"; rmforce=yes ;;
++      -f) func_append RM " $arg"; rmforce=: ;;
 +      -*) func_append RM " $arg" ;;
 +      *) func_append files " $arg" ;;
 +      esac
@@ -35344,18 +37807,18 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +    for file in $files; do
 +      func_dirname "$file" "" "."
-+      dir="$func_dirname_result"
-+      if test "X$dir" = X.; then
-+	odir="$objdir"
++      dir=$func_dirname_result
++      if test . = "$dir"; then
++	odir=$objdir
 +      else
-+	odir="$dir/$objdir"
++	odir=$dir/$objdir
 +      fi
 +      func_basename "$file"
-+      name="$func_basename_result"
-+      test "$opt_mode" = uninstall && odir="$dir"
++      name=$func_basename_result
++      test uninstall = "$opt_mode" && odir=$dir
 +
 +      # Remember odir for removal later, being careful to avoid duplicates
-+      if test "$opt_mode" = clean; then
++      if test clean = "$opt_mode"; then
 +	case " $rmdirs " in
 +	  *" $odir "*) ;;
 +	  *) func_append rmdirs " $odir" ;;
@@ -35370,11 +37833,11 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      elif test -d "$file"; then
 +	exit_status=1
 +	continue
-+      elif test "$rmforce" = yes; then
++      elif $rmforce; then
 +	continue
 +      fi
 +
-+      rmfiles="$file"
++      rmfiles=$file
 +
 +      case $name in
 +      *.la)
@@ -35388,7 +37851,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  done
 +	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 +
-+	  case "$opt_mode" in
++	  case $opt_mode in
 +	  clean)
 +	    case " $library_names " in
 +	    *" $dlname "*) ;;
@@ -35399,12 +37862,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  uninstall)
 +	    if test -n "$library_names"; then
 +	      # Do each command in the postuninstall commands.
-+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
++	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 +	    fi
 +
 +	    if test -n "$old_library"; then
 +	      # Do each command in the old_postuninstall commands.
-+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
++	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 +	    fi
 +	    # FIXME: should reinstall the best remaining shared library.
 +	    ;;
@@ -35420,21 +37883,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +	  func_source $dir/$name
 +
 +	  # Add PIC object to the list of files to remove.
-+	  if test -n "$pic_object" &&
-+	     test "$pic_object" != none; then
++	  if test -n "$pic_object" && test none != "$pic_object"; then
 +	    func_append rmfiles " $dir/$pic_object"
 +	  fi
 +
 +	  # Add non-PIC object to the list of files to remove.
-+	  if test -n "$non_pic_object" &&
-+	     test "$non_pic_object" != none; then
++	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 +	    func_append rmfiles " $dir/$non_pic_object"
 +	  fi
 +	fi
 +	;;
 +
 +      *)
-+	if test "$opt_mode" = clean ; then
++	if test clean = "$opt_mode"; then
 +	  noexename=$name
 +	  case $file in
 +	  *.exe)
@@ -35461,12 +37922,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +	    # note $name still contains .exe if it was in $file originally
 +	    # as does the version of $file that was added into $rmfiles
-+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-+	    if test "$fast_install" = yes && test -n "$relink_command"; then
++	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
++	    if test yes = "$fast_install" && test -n "$relink_command"; then
 +	      func_append rmfiles " $odir/lt-$name"
 +	    fi
-+	    if test "X$noexename" != "X$name" ; then
-+	      func_append rmfiles " $odir/lt-${noexename}.c"
++	    if test "X$noexename" != "X$name"; then
++	      func_append rmfiles " $odir/lt-$noexename.c"
 +	    fi
 +	  fi
 +	fi
@@ -35475,7 +37936,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +      func_show_eval "$RM $rmfiles" 'exit_status=1'
 +    done
 +
-+    # Try to remove the ${objdir}s in the directories where we deleted files
++    # Try to remove the $objdir's in the directories where we deleted files
 +    for dir in $rmdirs; do
 +      if test -d "$dir"; then
 +	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -35485,16 +37946,17 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +    exit $exit_status
 +}
 +
-+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-+    func_mode_uninstall ${1+"$@"}
++if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
++  func_mode_uninstall ${1+"$@"}
++fi
 +
 +test -z "$opt_mode" && {
-+  help="$generic_help"
++  help=$generic_help
 +  func_fatal_help "you must specify a MODE"
 +}
 +
 +test -z "$exec_cmd" && \
-+  func_fatal_help "invalid operation mode \`$opt_mode'"
++  func_fatal_help "invalid operation mode '$opt_mode'"
 +
 +if test -n "$exec_cmd"; then
 +  eval exec "$exec_cmd"
@@ -35505,7 +37967,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +
 +
 +# The TAGs below are defined such that we never get into a situation
-+# in which we disable both kinds of libraries.  Given conflicting
++# where we disable both kinds of libraries.  Given conflicting
 +# choices, we go for a static library, that is the most portable,
 +# since we can't tell whether shared libraries were disabled because
 +# the user asked for that or because the platform doesn't support
@@ -35528,18 +37990,16 @@ diff -ruN arpack-ng-3.9.0/build-aux/ltmain.sh arpack-ng-3.9.0-patch/build-aux/lt
 +# mode:shell-script
 +# sh-indentation:2
 +# End:
-+# vi:sw=2
-+
-diff -ruN arpack-ng-3.9.0/build-aux/missing arpack-ng-3.9.0-patch/build-aux/missing
---- arpack-ng-3.9.0/build-aux/missing	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/missing	2023-02-12 10:13:44.645181620 +0000
+diff -ruN arpack-ng-3.9.1/build-aux/missing arpack-ng-3.9.1-patch/build-aux/missing
+--- arpack-ng-3.9.1/build-aux/missing	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/missing	2023-11-11 16:51:20.889932944 +0900
 @@ -0,0 +1,215 @@
 +#! /bin/sh
 +# Common wrapper for a few potentially missing GNU programs.
 +
-+scriptversion=2012-06-26.16; # UTC
++scriptversion=2018-03-07.03; # UTC
 +
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -35553,7 +38013,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/missing arpack-ng-3.9.0-patch/build-aux/miss
 +# GNU General Public License for more details.
 +
 +# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 +
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -35637,9 +38097,9 @@ diff -ruN arpack-ng-3.9.0/build-aux/missing arpack-ng-3.9.0-patch/build-aux/miss
 +  exit $st
 +fi
 +
-+perl_URL=http://www.perl.org/
-+flex_URL=http://flex.sourceforge.net/
-+gnu_software_URL=http://www.gnu.org/software
++perl_URL=https://www.perl.org/
++flex_URL=https://github.com/westes/flex
++gnu_software_URL=https://www.gnu.org/software
 +
 +program_details ()
 +{
@@ -35696,7 +38156,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/missing arpack-ng-3.9.0-patch/build-aux/miss
 +      ;;
 +   autom4te*)
 +      echo "You might have modified some maintainer files that require"
-+      echo "the 'automa4te' program to be rebuilt."
++      echo "the 'autom4te' program to be rebuilt."
 +      program_details 'autom4te'
 +      ;;
 +    bison*|yacc*)
@@ -35743,22 +38203,22 @@ diff -ruN arpack-ng-3.9.0/build-aux/missing arpack-ng-3.9.0-patch/build-aux/miss
 +exit $st
 +
 +# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
++# time-stamp-time-zone: "UTC0"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/test-driver
---- arpack-ng-3.9.0/build-aux/test-driver	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/build-aux/test-driver	2023-02-12 10:13:46.526189242 +0000
-@@ -0,0 +1,127 @@
+diff -ruN arpack-ng-3.9.1/build-aux/test-driver arpack-ng-3.9.1-patch/build-aux/test-driver
+--- arpack-ng-3.9.1/build-aux/test-driver	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/build-aux/test-driver	2023-11-11 16:51:21.682936006 +0900
+@@ -0,0 +1,148 @@
 +#! /bin/sh
 +# test-driver - basic testsuite driver script.
 +
-+scriptversion=2012-06-27.10; # UTC
++scriptversion=2018-03-07.03; # UTC
 +
-+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
++# Copyright (C) 2011-2018 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -35771,7 +38231,7 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 +
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -35799,13 +38259,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +Usage:
 +  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
 +              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
++              [--enable-hard-errors={yes|no}] [--]
++              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 +The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 +END
 +}
 +
-+# TODO: better error handling in option parsing (in particular, ensure
-+# TODO: $log_file, $trs_file and $test_name are defined).
 +test_name= # Used for reporting.
 +log_file=  # Where to save the output of the test script.
 +trs_file=  # Where to save the metadata of the test run.
@@ -35824,10 +38283,23 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +  --enable-hard-errors) enable_hard_errors=$2; shift;;
 +  --) shift; break;;
 +  -*) usage_error "invalid option: '$1'";;
++   *) break;;
 +  esac
 +  shift
 +done
 +
++missing_opts=
++test x"$test_name" = x && missing_opts="$missing_opts --test-name"
++test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
++test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
++if test x"$missing_opts" != x; then
++  usage_error "the following mandatory options are missing:$missing_opts"
++fi
++
++if test $# -eq 0; then
++  usage_error "missing argument"
++fi
++
 +if test $color_tests = yes; then
 +  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
 +  red='' # Red.
@@ -35849,11 +38321,14 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +# Test script is run here.
 +"$@" >$log_file 2>&1
 +estatus=$?
++
 +if test $enable_hard_errors = no && test $estatus -eq 99; then
-+  estatus=1
++  tweaked_estatus=1
++else
++  tweaked_estatus=$estatus
 +fi
 +
-+case $estatus:$expect_failure in
++case $tweaked_estatus:$expect_failure in
 +  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
 +  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
 +  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -35862,6 +38337,12 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 +esac
 +
++# Report the test outcome and exit status in the logs, so that one can
++# know whether the test passed or failed simply by looking at the '.log'
++# file, without the need of also peaking into the corresponding '.trs'
++# file (automake bug#11814).
++echo "$res $test_name (exit status: $estatus)" >>$log_file
++
 +# Report outcome to console.
 +echo "${col}${res}${std}: $test_name"
 +
@@ -35874,19 +38355,19 @@ diff -ruN arpack-ng-3.9.0/build-aux/test-driver arpack-ng-3.9.0-patch/build-aux/
 +# Local Variables:
 +# mode: shell-script
 +# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
++# time-stamp-time-zone: "UTC0"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
---- arpack-ng-3.9.0/configure	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/configure	2023-02-12 10:13:43.807178224 +0000
-@@ -0,0 +1,30587 @@
+diff -ruN arpack-ng-3.9.1/configure arpack-ng-3.9.1-patch/configure
+--- arpack-ng-3.9.1/configure	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/configure	2023-11-11 16:51:20.212930330 +0900
+@@ -0,0 +1,31742 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.69 for ARPACK-NG 3.9.0.
++# Generated by GNU Autoconf 2.69 for ARPACK-NG 3.9.1.
 +#
 +# Report bugs to <https://github.com/opencollab/arpack-ng/issues/>.
 +#
@@ -36476,8 +38957,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Identity of this package.
 +PACKAGE_NAME='ARPACK-NG'
 +PACKAGE_TARNAME='arpack-ng'
-+PACKAGE_VERSION='3.9.0'
-+PACKAGE_STRING='ARPACK-NG 3.9.0'
++PACKAGE_VERSION='3.9.1'
++PACKAGE_STRING='ARPACK-NG 3.9.1'
 +PACKAGE_BUGREPORT='https://github.com/opencollab/arpack-ng/issues/'
 +PACKAGE_URL='https://github.com/opencollab/arpack-ng/'
 +
@@ -36525,8 +39006,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +PARPACK_PC_LIBS_PRIVATE
 +ARPACK_PC_LIBS_PRIVATE
 +pkgconfigdir
-+ICBEXMM_FALSE
-+ICBEXMM_TRUE
++EIGEN_FALSE
++EIGEN_TRUE
 +ICB_FALSE
 +ICB_TRUE
 +BLACS_FALSE
@@ -36547,6 +39028,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +EIGEN3_CFLAGS
 +CXXCPP
 +CPP
++LT_SYS_LIBRARY_PATH
 +OTOOL64
 +OTOOL
 +LIPO
@@ -36603,7 +39085,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +AMDEPBACKSLASH
 +AMDEP_FALSE
 +AMDEP_TRUE
-+am__quote
 +am__include
 +DEPDIR
 +ac_ct_CC
@@ -36665,6 +39146,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +docdir
 +oldincludedir
 +includedir
++runstatedir
 +localstatedir
 +sharedstatedir
 +sysconfdir
@@ -36683,7 +39165,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +PACKAGE_TARNAME
 +PACKAGE_NAME
 +PATH_SEPARATOR
-+SHELL'
++SHELL
++am__quote'
 +ac_subst_files=''
 +ac_user_opts='
 +enable_option_checking
@@ -36696,11 +39179,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +enable_shared
 +with_pic
 +enable_fast_install
++with_aix_soname
 +with_gnu_ld
 +with_sysroot
 +enable_libtool_lock
 +enable_icb
-+enable_icb_exmm
++enable_eigen
 +enable_mpi
 +with_pkgconfigdir
 +'
@@ -36726,6 +39210,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +LIBSUFFIX
 +ITF64SUFFIX
 +SYMBOLSUFFIX
++LT_SYS_LIBRARY_PATH
 +CPP
 +CXXCPP
 +EIGEN3_CFLAGS
@@ -36772,6 +39257,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +sysconfdir='${prefix}/etc'
 +sharedstatedir='${prefix}/com'
 +localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
 +includedir='${prefix}/include'
 +oldincludedir='/usr/include'
 +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -37024,6 +39510,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  | -silent | --silent | --silen | --sile | --sil)
 +    silent=yes ;;
 +
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
 +  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 +    ac_prev=sbindir ;;
 +  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -37161,7 +39656,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 +		datadir sysconfdir sharedstatedir localstatedir includedir \
 +		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
++		libdir localedir mandir runstatedir
 +do
 +  eval ac_val=\$$ac_var
 +  # Remove trailing slashes.
@@ -37274,7 +39769,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Omit some internal or obsolete options to make the list less imposing.
 +  # This message is too long to be a string in the A/UX 3.1 sh.
 +  cat <<_ACEOF
-+\`configure' configures ARPACK-NG 3.9.0 to adapt to many kinds of systems.
++\`configure' configures ARPACK-NG 3.9.1 to adapt to many kinds of systems.
 +
 +Usage: $0 [OPTION]... [VAR=VALUE]...
 +
@@ -37314,6 +39809,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  --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]
@@ -37344,7 +39840,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +if test -n "$ac_init_help"; then
 +  case $ac_init_help in
-+     short | recursive ) echo "Configuration of ARPACK-NG 3.9.0:";;
++     short | recursive ) echo "Configuration of ARPACK-NG 3.9.1:";;
 +   esac
 +  cat <<\_ACEOF
 +
@@ -37367,7 +39863,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +                          optimize for fast installation [default=yes]
 +  --disable-libtool-lock  avoid locking (might break parallel builds)
 +  --enable-icb            build support for *[ae]upd_c with ISO_C_BINDING
-+  --enable-icb-exmm       matrix market example based on ISO_C_BINDING
++  --enable-eigen          build eigenvalue-problems solver based on ICB and
++                          eigen
 +  --enable-mpi            build parallel version of arpack with MPI
 +
 +Optional Packages:
@@ -37377,9 +39874,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  --with-lapack=<lib>     use LAPACK library <lib>
 +  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
 +                          both]
++  --with-aix-soname=aix|svr4|both
++                          shared library versioning (aka "SONAME") variant to
++                          provide on AIX, [default=aix].
 +  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-+  --with-sysroot=DIR Search for dependent libraries within DIR
-+                        (or the compiler's sysroot if not specified).
++  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
++                          compiler's sysroot if not specified).
 +  --with-pkgconfigdir     pkg-config installation directory
 +                          ['${libdir}/pkgconfig']
 +
@@ -37409,6 +39909,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +              (use with INTERFACE64)
 +  SYMBOLSUFFIX
 +              suffix to add to ARPACK, BLAS and LAPACK function names
++  LT_SYS_LIBRARY_PATH
++              User-defined run-time library search path.
 +  CPP         C preprocessor
 +  CXXCPP      C++ preprocessor
 +  EIGEN3_CFLAGS
@@ -37486,7 +39988,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +test -n "$ac_init_help" && exit $ac_status
 +if $ac_init_version; then
 +  cat <<\_ACEOF
-+ARPACK-NG configure 3.9.0
++ARPACK-NG configure 3.9.1
 +generated by GNU Autoconf 2.69
 +
 +Copyright (C) 2012 Free Software Foundation, Inc.
@@ -38227,7 +40729,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +This file contains any messages produced by compilers while
 +running configure, to aid debugging if configure makes a mistake.
 +
-+It was created by ARPACK-NG $as_me 3.9.0, which was
++It was created by ARPACK-NG $as_me 3.9.1, which was
 +generated by GNU Autoconf 2.69.  Invocation command line was
 +
 +  $ $0 $@
@@ -38606,7 +41108,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+am__api_version='1.13'
++am__api_version='1.16'
 +
 +# Find a good install program.  We prefer a C program (faster),
 +# so one script is as good as another.  But avoid the broken or
@@ -38778,8 +41280,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 +
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
++# Expand $ac_aux_dir to an absolute path.
++am_aux_dir=`cd "$ac_aux_dir" && pwd`
 +
 +if test x"${MISSING+set}" != xset; then
 +  case $am_aux_dir in
@@ -38798,7 +41300,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 +fi
 +
-+if test x"${install_sh}" != xset; then
++if test x"${install_sh+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -39092,7 +41594,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +# Define the identity of the package.
 + PACKAGE='arpack-ng'
-+ VERSION='3.9.0'
++ VERSION='3.9.1'
 +
 +
 +cat >>confdefs.h <<_ACEOF
@@ -39122,12 +41624,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +# For better backward compatibility.  To be removed once Automake 1.9.x
 +# dies out for good.  For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 +mkdir_p='$(MKDIR_P)'
 +
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
++# We need awk for the "check" target (and possibly the TAP driver).  The
++# system "awk" is bad on some platforms.
 +# Always define AMTAR for backward compatibility.  Yes, it's still used
 +# in the wild :-(  We should find a proper way to deprecate it ...
 +AMTAR='$${TAR-tar}'
@@ -39143,6 +41645,48 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make that assumption in our Makefile
++# recipes.  So use an aggressive probe to check that the usage we want is
++# actually supported "in the wild" to an acceptable degree.
++# See automake bug#10828.
++# To make any issue more visible, cause the running configure to be aborted
++# by default if the 'rm' program in use doesn't match our expectations; the
++# user can still override this though.
++if rm -f && rm -fr && rm -rf; then : OK; else
++  cat >&2 <<'END'
++Oops!
++
++Your 'rm' program seems unable to run without file operands specified
++on the command line, even when the '-f' option is present.  This is contrary
++to the behaviour of most rm programs out there, and not conforming with
++the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake@gnu.org about your system, including the value
++of your $PATH and any error possibly output before this message.  This
++can help us improve future automake versions.
++
++END
++  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
++    echo 'Configuration will proceed anyway, since you have set the' >&2
++    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
++    echo >&2
++  else
++    cat >&2 <<'END'
++Aborting the configuration process, to ensure you take notice of the issue.
++
++You can download and install GNU coreutils to get an 'rm' implementation
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
++
++If you want to complete the configuration process using your problematic
++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
++to "yes", and re-run configure.
++
++END
++    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
++  fi
++fi
++
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -40148,49 +42692,108 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++  # Make sure it works both with $CC and with simple cc.
++  # Following AC_PROG_CC_C_O, we do the test twice because some
++  # compilers refuse to overwrite an existing .o file with -o,
++  # though they will create one.
++  am_cv_prog_cc_c_o=yes
++  for am_i in 1 2; do
++    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } \
++         && test -f conftest2.$ac_objext; then
++      : OK
++    else
++      am_cv_prog_cc_c_o=no
++      break
++    fi
++  done
++  rm -f core conftest*
++  unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
 +DEPDIR="${am__leading_dot}deps"
 +
 +ac_config_commands="$ac_config_commands depfiles"
 +
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
++$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
++cat > confinc.mk << 'END'
 +am__doit:
-+	@echo this is the am__doit target
++	@echo this is the am__doit target >confinc.out
 +.PHONY: am__doit
 +END
-+# If we don't find an include directive, just comment out the code.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 +am__include="#"
 +am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from 'make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
++# BSD make does it like this.
++echo '.include "confinc.mk" # ignored' > confmf.BSD
++# Other make implementations (GNU, Solaris 10, AIX) do it like this.
++echo 'include confinc.mk # ignored' > confmf.GNU
++_am_result=no
++for s in GNU BSD; do
++  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
++   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); }
++  case $?:`cat confinc.out 2>/dev/null` in #(
++  '0:this is the am__doit target') :
++    case $s in #(
++  BSD) :
++    am__include='.include' am__quote='"' ;; #(
++  *) :
++    am__include='include' am__quote='' ;;
++esac ;; #(
++  *) :
 +     ;;
-+   esac
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
-+rm -f confinc confmf
++esac
++  if test "$am__include" != "#"; then
++    _am_result="yes ($s style)"
++    break
++  fi
++done
++rm -f confinc.* confmf.*
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
++$as_echo "${_am_result}" >&6; }
 +
 +# Check whether --enable-dependency-tracking was given.
 +if test "${enable_dependency_tracking+set}" = set; then :
@@ -43406,8 +46009,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+macro_version='2.4.2'
-+macro_revision='1.3337'
++macro_version='2.4.6'
++macro_revision='2.4.6'
 +
 +
 +
@@ -43421,7 +46024,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+ltmain="$ac_aux_dir/ltmain.sh"
++ltmain=$ac_aux_dir/ltmain.sh
 +
 +# Backslashify metacharacters that are still active within
 +# double-quoted strings.
@@ -43470,7 +46073,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    $ECHO ""
 +}
 +
-+case "$ECHO" in
++case $ECHO in
 +  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 +$as_echo "printf" >&6; } ;;
 +  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -43793,19 +46396,19 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +# Check whether --with-gnu-ld was given.
 +if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 +else
 +  with_gnu_ld=no
 +fi
 +
 +ac_prog=ld
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  # Check if gcc -print-prog-name=ld gives a path.
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 +$as_echo_n "checking for ld used by $CC... " >&6; }
 +  case $host in
 +  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
++    # gcc leaves a trailing carriage return, which upsets mingw
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 +  *)
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -43819,7 +46422,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 +	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 +      done
-+      test -z "$LD" && LD="$ac_prog"
++      test -z "$LD" && LD=$ac_prog
 +      ;;
 +  "")
 +    # If it fails, then pretend we aren't using GCC.
@@ -43830,7 +46433,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    with_gnu_ld=unknown
 +    ;;
 +  esac
-+elif test "$with_gnu_ld" = yes; then
++elif test yes = "$with_gnu_ld"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 +$as_echo_n "checking for GNU ld... " >&6; }
 +else
@@ -43841,32 +46444,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
++      lt_cv_path_LD=$ac_dir/$ac_prog
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
 +      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
++	test no != "$with_gnu_ld" && break
 +	;;
 +      *)
-+	test "$with_gnu_ld" != yes && break
++	test yes != "$with_gnu_ld" && break
 +	;;
 +      esac
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
++  IFS=$lt_save_ifs
 +else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  lt_cv_path_LD=$LD # Let the user override the test with a path.
 +fi
 +fi
 +
-+LD="$lt_cv_path_LD"
++LD=$lt_cv_path_LD
 +if test -n "$LD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 +$as_echo "$LD" >&6; }
@@ -43909,33 +46512,38 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +else
 +  if test -n "$NM"; then
 +  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
++  lt_cv_path_NM=$NM
 +else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
++  lt_nm_to_check=${ac_tool_prefix}nm
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 +    lt_nm_to_check="$lt_nm_to_check nm"
 +  fi
 +  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      tmp_nm=$ac_dir/$lt_tmp_nm
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 +	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 +	#   nm: unknown option "B" ignored
 +	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
++	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
++	case $build_os in
++	mingw*) lt_bad_file=conftest.nm/nofile ;;
++	*) lt_bad_file=/dev/null ;;
++	esac
++	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
++	*$lt_bad_file* | *'Invalid file or object type'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
++	  break 2
 +	  ;;
 +	*)
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
++	    break 2
 +	    ;;
 +	  *)
 +	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -43946,15 +46554,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	esac
 +      fi
 +    done
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +  done
 +  : ${lt_cv_path_NM=no}
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 +$as_echo "$lt_cv_path_NM" >&6; }
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
++if test no != "$lt_cv_path_NM"; then
++  NM=$lt_cv_path_NM
 +else
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
 +  if test -n "$DUMPBIN"; then :
@@ -44060,9 +46668,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +fi
 +
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 +    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
++      DUMPBIN="$DUMPBIN -symbols -headers"
 +      ;;
 +    *)
 +      DUMPBIN=:
@@ -44070,8 +46678,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +  fi
 +
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
++  if test : != "$DUMPBIN"; then
++    NM=$DUMPBIN
 +  fi
 +fi
 +test -z "$NM" && NM=nm
@@ -44122,7 +46730,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +    i=0
-+  teststring="ABCD"
++  teststring=ABCD
 +
 +  case $build_os in
 +  msdosdjgpp*)
@@ -44162,7 +46770,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  bitrig* | darwin* | dragonfly* | 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`
@@ -44212,22 +46820,23 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    ;;
 +  *)
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
++    if test -n "$lt_cv_sys_max_cmd_len" && \
++       test undefined != "$lt_cv_sys_max_cmd_len"; then
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 +    else
 +      # Make teststring a little bigger before we do anything with it.
 +      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
++      for i in 1 2 3 4 5 6 7 8; do
 +        teststring=$teststring$teststring
 +      done
 +      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +      # If test is not a shell built-in, we'll probably end up computing a
 +      # maximum length that is only half of the actual maximum length, but
 +      # we can't tell.
-+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
++      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 +	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
++	      test 17 != "$i" # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
 +        teststring=$teststring$teststring
@@ -44245,7 +46854,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +fi
 +
-+if test -n $lt_cv_sys_max_cmd_len ; then
++if test -n "$lt_cv_sys_max_cmd_len"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 +else
@@ -44263,30 +46872,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,b/c, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
-+
-+
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
@@ -44409,13 +46994,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  cygwin* | mingw* | pw32* | cegcc*)
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      reload_cmds=false
 +    fi
 +    ;;
 +  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    if test yes = "$GCC"; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
@@ -44540,13 +47125,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Need to set the preceding variable on all platforms that support
 +# interlibrary dependencies.
 +# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
++# 'unknown' -- same as none, but documents that we really don't know.
 +# 'pass_all' -- all dependencies passed with no checks.
 +# 'test_compile' -- check by making test program.
 +# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
++# that responds to the $file_magic_cmd with a given extended regex.
++# If you have 'file' or equivalent on your system and you're not sure
++# whether 'pass_all' will *always* work, you probably want this one.
 +
 +case $host_os in
 +aix[4-9]*)
@@ -44573,8 +47158,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump',
 +  # unless we find 'file', for example because we are cross-compiling.
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++  if ( file / ) >/dev/null 2>&1; then
 +    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +    lt_cv_file_magic_cmd='func_win32_libid'
 +  else
@@ -44610,10 +47194,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +  ;;
 +
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
 +haiku*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
@@ -44652,11 +47232,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+netbsd*)
++netbsd* | netbsdelf*-gnu)
 +  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
@@ -44674,8 +47254,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++openbsd* | bitrig*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
 +  else
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -44728,6 +47308,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +tpf*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
++os2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
 +esac
 +
 +fi
@@ -44882,8 +47465,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +case $host_os in
 +cygwin* | mingw* | pw32* | cegcc*)
-+  # two different shell functions defined in ltmain.sh
-+  # decide which to use based on capabilities of $DLLTOOL
++  # two different shell functions defined in ltmain.sh;
++  # decide which one to use based on capabilities of $DLLTOOL
 +  case `$DLLTOOL --help 2>&1` in
 +  *--identify-strict*)
 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -44895,7 +47478,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +*)
 +  # fallback: assume linklib IS sharedlib
-+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++  lt_cv_sharedlib_from_linklib_cmd=$ECHO
 +  ;;
 +esac
 +
@@ -45012,7 +47595,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +
 +: ${AR=ar}
-+: ${AR_FLAGS=cru}
++: ${AR_FLAGS=cr}
 +
 +
 +
@@ -45057,7 +47640,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
-+      if test "$ac_status" -eq 0; then
++      if test 0 -eq "$ac_status"; then
 +	# Ensure the archiver fails upon bogus file names.
 +	rm -f conftest.$ac_objext libconftest.a
 +	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -45065,7 +47648,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
-+	if test "$ac_status" -ne 0; then
++	if test 0 -ne "$ac_status"; then
 +          lt_cv_ar_at_file=@
 +        fi
 +      fi
@@ -45078,7 +47661,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
 +
-+if test "x$lt_cv_ar_at_file" = xno; then
++if test no = "$lt_cv_ar_at_file"; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
@@ -45295,7 +47878,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +if test -n "$RANLIB"; then
 +  case $host_os in
-+  openbsd*)
++  bitrig* | openbsd*)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 +    ;;
 +  *)
@@ -45385,7 +47968,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  symcode='[ABCDGISTW]'
 +  ;;
 +hpux*)
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    symcode='[ABCDEGRST]'
 +  fi
 +  ;;
@@ -45418,14 +48001,44 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  symcode='[ABCDGIRSTW]' ;;
 +esac
 +
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++  # Gets list of data symbols to import.
++  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
++  # Adjust the below global symbol transforms to fixup imported variables.
++  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
++  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
++  lt_c_name_lib_hook="\
++  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
++  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
++else
++  # Disable hooks by default.
++  lt_cv_sys_global_symbol_to_import=
++  lt_cdecl_hook=
++  lt_c_name_hook=
++  lt_c_name_lib_hook=
++fi
++
 +# Transform an extracted symbol line into a proper C declaration.
 +# Some systems (esp. on ia64) link data and code symbols differently,
 +# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++lt_cv_sys_global_symbol_to_cdecl="sed -n"\
++$lt_cdecl_hook\
++" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 +
 +# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
++$lt_c_name_hook\
++" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
++
++# Transform an extracted symbol line into symbol name with lib prefix and
++# symbol address.
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
++$lt_c_name_lib_hook\
++" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
++" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 +
 +# Handle CRLF in mingw tool chain
 +opt_cr=
@@ -45443,21 +48056,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  # Write the raw and C identifiers.
 +  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
++    # Fake it for dumpbin and say T for any non-static function,
++    # D for any global variable and I for any imported variable.
 +    # Also find C++ and __fastcall symbols from MSVC++,
 +    # which start with @ or ?.
 +    lt_cv_sys_global_symbol_pipe="$AWK '"\
 +"     {last_section=section; section=\$ 3};"\
 +"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 +"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
++"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
++"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 +"     \$ 0!~/External *\|/{next};"\
 +"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 +"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
++"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
++"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 +"     ' prfx=^$ac_symprfx"
 +  else
 +    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -45488,11 +48104,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  test $ac_status = 0; }; then
 +    # Now try to grab the symbols.
 +    nlist=conftest.nm
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s "$nlist"; then
++    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
++    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
 +      # Try sorting and uniquifying the output.
 +      if sort "$nlist" | uniq > "$nlist"T; then
 +	mv -f "$nlist"T "$nlist"
@@ -45505,11 +48118,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 +	  cat <<_LT_EOF > conftest.$ac_ext
 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
++/* DATA imports from DLLs on WIN32 can't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT_DLSYM_CONST
-+#elif defined(__osf__)
++#elif defined __osf__
 +/* This system does not cope well with relocations in const data.  */
 +# define LT_DLSYM_CONST
 +#else
@@ -45535,7 +48148,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{
 +  { "@PROGRAM@", (void *) 0 },
 +_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 +	  cat <<\_LT_EOF >> conftest.$ac_ext
 +  {0, (void *) 0}
 +};
@@ -45555,13 +48168,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  mv conftest.$ac_objext conftstm.$ac_objext
 +	  lt_globsym_save_LIBS=$LIBS
 +	  lt_globsym_save_CFLAGS=$CFLAGS
-+	  LIBS="conftstm.$ac_objext"
++	  LIBS=conftstm.$ac_objext
 +	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 +	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
++  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 +	    pipe_works=yes
 +	  fi
 +	  LIBS=$lt_globsym_save_LIBS
@@ -45582,7 +48195,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  rm -rf conftest* conftst*
 +
 +  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
++  if test yes = "$pipe_works"; then
 +    break
 +  else
 +    lt_cv_sys_global_symbol_pipe=
@@ -45635,6 +48248,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
++
++
++
++
++
++
++
++
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
@@ -45647,9 +48270,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +lt_sysroot=
-+case ${with_sysroot} in #(
++case $with_sysroot in #(
 + yes)
-+   if test "$GCC" = yes; then
++   if test yes = "$GCC"; then
 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 +   fi
 +   ;; #(
@@ -45659,8 +48282,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 + no|'')
 +   ;; #(
 + *)
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-+$as_echo "${with_sysroot}" >&6; }
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
++$as_echo "$with_sysroot" >&6; }
 +   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
 +   ;;
 +esac
@@ -45672,18 +48295,99 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
++$as_echo_n "checking for a working dd... " >&6; }
++if ${ac_cv_path_lt_DD+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  printf 0123456789abcdef0123456789abcdef >conftest.i
++cat conftest.i conftest.i >conftest2.i
++: ${lt_DD:=$DD}
++if test -z "$lt_DD"; then
++  ac_path_lt_DD_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in dd; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
++      as_fn_executable_p "$ac_path_lt_DD" || continue
++if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
++  cmp -s conftest.i conftest.out \
++  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
++fi
++      $ac_path_lt_DD_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_lt_DD"; then
++    :
++  fi
++else
++  ac_cv_path_lt_DD=$lt_DD
++fi
++
++rm -f conftest.i conftest2.i conftest.out
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
++$as_echo "$ac_cv_path_lt_DD" >&6; }
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
++$as_echo_n "checking how to truncate binary pipes... " >&6; }
++if ${lt_cv_truncate_bin+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  printf 0123456789abcdef0123456789abcdef >conftest.i
++cat conftest.i conftest.i >conftest2.i
++lt_cv_truncate_bin=
++if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
++  cmp -s conftest.i conftest.out \
++  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
++fi
++rm -f conftest.i conftest2.i conftest.out
++test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
++$as_echo "$lt_cv_truncate_bin" >&6; }
++
++
++
++
++
++
++
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++func_cc_basename ()
++{
++    for cc_temp in $*""; do
++      case $cc_temp in
++        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++        \-*) ;;
++        *) break;;
++      esac
++    done
++    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++}
++
 +# Check whether --enable-libtool-lock was given.
 +if test "${enable_libtool_lock+set}" = set; then :
 +  enableval=$enable_libtool_lock;
 +fi
 +
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 +
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
 +ia64-*-hpux*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set mode
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
@@ -45692,24 +48396,25 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  test $ac_status = 0; }; then
 +    case `/usr/bin/file conftest.$ac_objext` in
 +      *ELF-32*)
-+	HPUX_IA64_MODE="32"
++	HPUX_IA64_MODE=32
 +	;;
 +      *ELF-64*)
-+	HPUX_IA64_MODE="64"
++	HPUX_IA64_MODE=64
 +	;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
++    if test yes = "$lt_cv_prog_gnu_ld"; then
 +      case `/usr/bin/file conftest.$ac_objext` in
 +	*32-bit*)
 +	  LD="${LD-ld} -melf32bsmip"
@@ -45738,9 +48443,50 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  rm -rf conftest*
 +  ;;
 +
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++mips64*-*linux*)
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
++  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++    emul=elf
++    case `/usr/bin/file conftest.$ac_objext` in
++      *32-bit*)
++	emul="${emul}32"
++	;;
++      *64-bit*)
++	emul="${emul}64"
++	;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *MSB*)
++	emul="${emul}btsmip"
++	;;
++      *LSB*)
++	emul="${emul}ltsmip"
++	;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *N32*)
++	emul="${emul}n32"
++	;;
++    esac
++    LD="${LD-ld} -m $emul"
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.  Note that the listed cases only cover the
++  # situations where additional linker options are needed (such as when
++  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
++  # vice versa); the common cases where no linker options are needed do
++  # not appear in the list.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
@@ -45754,9 +48500,19 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    LD="${LD-ld} -m elf_i386_fbsd"
 +	    ;;
 +	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
++	    case `/usr/bin/file conftest.o` in
++	      *x86-64*)
++		LD="${LD-ld} -m elf32_x86_64"
++		;;
++	      *)
++		LD="${LD-ld} -m elf_i386"
++		;;
++	    esac
++	    ;;
++	  powerpc64le-*linux*)
++	    LD="${LD-ld} -m elf32lppclinux"
 +	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
++	  powerpc64-*linux*)
 +	    LD="${LD-ld} -m elf32ppclinux"
 +	    ;;
 +	  s390x-*linux*)
@@ -45775,7 +48531,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  x86_64-*linux*)
 +	    LD="${LD-ld} -m elf_x86_64"
 +	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
++	  powerpcle-*linux*)
++	    LD="${LD-ld} -m elf64lppc"
++	    ;;
++	  powerpc-*linux*)
 +	    LD="${LD-ld} -m elf64ppc"
 +	    ;;
 +	  s390*-*linux*|s390*-*tpf*)
@@ -45793,7 +48552,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
++  SAVE_CFLAGS=$CFLAGS
 +  CFLAGS="$CFLAGS -belf"
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -45841,13 +48600,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 +$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++  if test yes != "$lt_cv_cc_needs_belf"; then
 +    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
++    CFLAGS=$SAVE_CFLAGS
 +  fi
 +  ;;
 +*-*solaris*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
@@ -45859,7 +48619,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $lt_cv_prog_gnu_ld in
 +      yes*)
 +        case $host in
-+        i?86-*-solaris*)
++        i?86-*-solaris*|x86_64-*-solaris*)
 +          LD="${LD-ld} -m elf_x86_64"
 +          ;;
 +        sparc*-*-solaris*)
@@ -45868,7 +48628,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        esac
 +        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
 +        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+          LD="${LD-ld}_sol2"
++          LD=${LD-ld}_sol2
 +        fi
 +        ;;
 +      *)
@@ -45884,7 +48644,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +esac
 +
-+need_locks="$enable_libtool_lock"
++need_locks=$enable_libtool_lock
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -45995,7 +48755,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
++if test yes != "$lt_cv_path_mainfest_tool"; then
 +  MANIFEST_TOOL=:
 +fi
 +
@@ -46498,7 +49258,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
++      if test -z "$LT_MULTI_MODULE"; then
 +	# By default we will add the -single_module flag. You can override
 +	# by either setting the environment variable LT_MULTI_MODULE
 +	# non-empty at configure time, or by adding -multi_module to the
@@ -46516,7 +49276,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  cat conftest.err >&5
 +	# Otherwise, if the output was created with a 0 exit code from
 +	# the compiler, it worked.
-+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
++	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 +	  lt_cv_apple_cc_single_mod=yes
 +	else
 +	  cat conftest.err >&5
@@ -46563,7 +49323,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
++	LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -46580,8 +49340,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +_LT_EOF
 +      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-+      echo "$AR cru libconftest.a conftest.o" >&5
-+      $AR cru libconftest.a conftest.o 2>&5
++      echo "$AR cr libconftest.a conftest.o" >&5
++      $AR cr libconftest.a conftest.o 2>&5
 +      echo "$RANLIB libconftest.a" >&5
 +      $RANLIB libconftest.a 2>&5
 +      cat > conftest.c << _LT_EOF
@@ -46592,7 +49352,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      _lt_result=$?
 +      if test -s conftest.err && $GREP force_load conftest.err; then
 +	cat conftest.err >&5
-+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 +	lt_cv_ld_force_load=yes
 +      else
 +	cat conftest.err >&5
@@ -46605,32 +49365,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +$as_echo "$lt_cv_ld_force_load" >&6; }
 +    case $host_os in
 +    rhapsody* | darwin1.[012])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 +    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 +    darwin*) # darwin 5.x on
 +      # if running on 10.5 or later, the deployment target defaults
 +      # to the OS version, if on x86, and 10.4, the deployment
 +      # target defaults to 10.4. Don't you love it?
 +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 +	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[012]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++	10.[012][,.]*)
++	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 +	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 +      esac
 +    ;;
 +  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++    if test yes = "$lt_cv_apple_cc_single_mod"; then
 +      _lt_dar_single_mod='$single_module'
 +    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    if test yes = "$lt_cv_ld_exported_symbols_list"; then
++      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
 +    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
 +    fi
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
@@ -46638,6 +49398,41 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    ;;
 +  esac
 +
++# func_munge_path_list VARIABLE PATH
++# -----------------------------------
++# VARIABLE is name of variable containing _space_ separated list of
++# directories to be munged by the contents of PATH, which is string
++# having a format:
++# "DIR[:DIR]:"
++#       string "DIR[ DIR]" will be prepended to VARIABLE
++# ":DIR[:DIR]"
++#       string "DIR[ DIR]" will be appended to VARIABLE
++# "DIRP[:DIRP]::[DIRA:]DIRA"
++#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
++#       "DIRA[ DIRA]" will be appended to VARIABLE
++# "DIR[:DIR]"
++#       VARIABLE will be replaced by "DIR[ DIR]"
++func_munge_path_list ()
++{
++    case x$2 in
++    x)
++        ;;
++    *:)
++        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
++        ;;
++    x:*)
++        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
++        ;;
++    *::*)
++        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
++        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
++        ;;
++    *)
++        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
++        ;;
++    esac
++}
++
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -46931,9 +49726,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +func_stripname_cnf ()
 +{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  case $2 in
++  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
++  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
 +  esac
 +} # func_stripname_cnf
 +
@@ -47251,14 +50046,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *)
 +     enable_static=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_static=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac
 +else
@@ -47287,14 +50082,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *)
 +      enable_shared=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_shared=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac
 +else
@@ -47319,14 +50114,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *)
 +      pic_mode=default
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for lt_pkg in $withval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$lt_pkg" = "X$lt_p"; then
 +	  pic_mode=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac
 +else
@@ -47334,8 +50129,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +
 +
-+test -z "$pic_mode" && pic_mode=default
-+
 +
 +
 +
@@ -47351,14 +50144,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *)
 +      enable_fast_install=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_fast_install=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac
 +else
@@ -47372,11 +50165,63 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
++  shared_archive_member_spec=
++case $host,$enable_shared in
++power*-*-aix[5-9]*,yes)
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
++$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
++
++# Check whether --with-aix-soname was given.
++if test "${with_aix_soname+set}" = set; then :
++  withval=$with_aix_soname; case $withval in
++    aix|svr4|both)
++      ;;
++    *)
++      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
++      ;;
++    esac
++    lt_cv_with_aix_soname=$with_aix_soname
++else
++  if ${lt_cv_with_aix_soname+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_with_aix_soname=aix
++fi
++
++    with_aix_soname=$lt_cv_with_aix_soname
++fi
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
++$as_echo "$with_aix_soname" >&6; }
++  if test aix != "$with_aix_soname"; then
++    # For the AIX way of multilib, we name the shared archive member
++    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
++    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
++    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
++    # the AIX toolchain works better with OBJECT_MODE set (default 32).
++    if test 64 = "${OBJECT_MODE-32}"; then
++      shared_archive_member_spec=shr_64
++    else
++      shared_archive_member_spec=shr
++    fi
++  fi
++  ;;
++*)
++  with_aix_soname=aix
++  ;;
++esac
++
++
++
++
++
++
++
 +
 +
 +
 +# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
++LIBTOOL_DEPS=$ltmain
 +
 +# Always use our own libtool.
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -47425,7 +50270,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+if test -n "${ZSH_VERSION+set}" ; then
++if test -n "${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +
@@ -47464,7 +50309,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
 +  # reason, if we set the COLLECT_NAMES environment variable, the problems
 +  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
++  if test set != "${COLLECT_NAMES+set}"; then
 +    COLLECT_NAMES=
 +    export COLLECT_NAMES
 +  fi
@@ -47475,14 +50320,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ofile=libtool
 +can_build_shared=yes
 +
-+# All known linkers require a `.a' archive for static linking (except MSVC,
++# All known linkers require a '.a' archive for static linking (except MSVC,
 +# which needs '.lib').
 +libext=a
 +
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++with_gnu_ld=$lt_cv_prog_gnu_ld
 +
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
++old_CC=$CC
++old_CFLAGS=$CFLAGS
 +
 +# Set sane defaults for various variables
 +test -z "$CC" && CC=cc
@@ -47491,15 +50336,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +test -z "$LD" && LD=ld
 +test -z "$ac_objext" && ac_objext=o
 +
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++func_cc_basename $compiler
++cc_basename=$func_cc_basename_result
 +
 +
 +# Only perform the check for file, if the check method requires it
@@ -47514,22 +50352,22 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +else
 +  case $MAGIC_CMD in
 +[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 +  ;;
 +*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_MAGIC_CMD=$MAGIC_CMD
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 +  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++    if test -f "$ac_dir/${ac_tool_prefix}file"; then
++      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
 +	    :
@@ -47552,13 +50390,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      break
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  IFS=$lt_save_ifs
++  MAGIC_CMD=$lt_save_MAGIC_CMD
 +  ;;
 +esac
 +fi
 +
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +if test -n "$MAGIC_CMD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 +$as_echo "$MAGIC_CMD" >&6; }
@@ -47580,22 +50418,22 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +else
 +  case $MAGIC_CMD in
 +[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 +  ;;
 +*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_MAGIC_CMD=$MAGIC_CMD
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 +  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++    if test -f "$ac_dir/file"; then
++      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
 +	    :
@@ -47618,13 +50456,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      break
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  IFS=$lt_save_ifs
++  MAGIC_CMD=$lt_save_MAGIC_CMD
 +  ;;
 +esac
 +fi
 +
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +if test -n "$MAGIC_CMD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 +$as_echo "$MAGIC_CMD" >&6; }
@@ -47645,7 +50483,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +# Use C for the default configuration in the libtool script
 +
-+lt_save_CC="$CC"
++lt_save_CC=$CC
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -47707,7 +50545,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +lt_prog_compiler_no_builtin_flag=
 +
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $cc_basename in
 +  nvcc*)
 +    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -47723,7 +50561,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_prog_compiler_rtti_exceptions=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -47753,7 +50591,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
 +    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 +else
 +    :
@@ -47771,17 +50609,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +lt_prog_compiler_static=
 +
 +
-+  if test "$GCC" = yes; then
++  if test yes = "$GCC"; then
 +    lt_prog_compiler_wl='-Wl,'
 +    lt_prog_compiler_static='-static'
 +
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static='-Bstatic'
 +      fi
++      lt_prog_compiler_pic='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -47792,8 +50631,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -47809,6 +50648,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
@@ -47879,7 +50723,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix*)
 +      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static='-Bstatic'
 +      else
@@ -47887,10 +50731,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      case $cc_basename in
++      nagfor*)
++        # NAG Fortran compiler
++        lt_prog_compiler_wl='-Wl,-Wl,,'
++        lt_prog_compiler_pic='-PIC'
++        lt_prog_compiler_static='-Bstatic'
++        ;;
++      esac
++      ;;
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    hpux9* | hpux10* | hpux11*)
@@ -47906,7 +50769,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	;;
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      lt_prog_compiler_static='$wl-a ${wl}archive'
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
@@ -47915,14 +50778,20 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      lt_prog_compiler_static='-non_shared'
 +      ;;
 +
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
++      # old Intel for x86_64, which still supported -KPIC.
 +      ecc*)
 +	lt_prog_compiler_wl='-Wl,'
 +	lt_prog_compiler_pic='-KPIC'
 +	lt_prog_compiler_static='-static'
 +        ;;
++      # flang / f18. f95 an alias for gfortran or flang on Debian
++      flang* | f18* | f95*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fPIC'
++	lt_prog_compiler_static='-static'
++        ;;
 +      # icc used to be incompatible with GCC.
 +      # ICC 10 doesn't accept -KPIC any more.
 +      icc* | ifort*)
@@ -47942,6 +50811,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lt_prog_compiler_pic='-PIC'
 +	lt_prog_compiler_static='-Bstatic'
 +	;;
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fPIC'
++	lt_prog_compiler_static='-static'
++	;;
 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -48039,7 +50914,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*MP*)
-+      if test -d /usr/nec ;then
++      if test -d /usr/nec; then
 +	lt_prog_compiler_pic='-Kconform_pic'
 +	lt_prog_compiler_static='-Bstatic'
 +      fi
@@ -48068,7 +50943,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic=
 +    ;;
@@ -48100,7 +50975,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_prog_compiler_pic_works=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -48130,7 +51005,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
++if test yes = "$lt_cv_prog_compiler_pic_works"; then
 +    case $lt_prog_compiler_pic in
 +     "" | " "*) ;;
 +     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -48162,7 +51037,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -48181,13 +51056,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
++if test yes = "$lt_cv_prog_compiler_static_works"; then
 +    :
 +else
 +    lt_prog_compiler_static=
@@ -48307,8 +51182,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 +$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -48320,9 +51195,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 +$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++  if test no = "$hard_links"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 +    need_locks=warn
 +  fi
 +else
@@ -48365,9 +51240,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # included in the symbol list
 +  include_expsyms=
 +  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
++  # it will be wrapped by ' (' and ')$', so one must not match beginning or
++  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
++  # as well as any symbol that contains 'd'.
 +  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 +  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 +  # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -48382,7 +51257,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 +    # When not using gcc, we currently assume that we are using
 +    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      with_gnu_ld=no
 +    fi
 +    ;;
@@ -48390,9 +51265,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
++  openbsd* | bitrig*)
 +    with_gnu_ld=no
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs=no
++    ;;
 +  esac
 +
 +  ld_shlibs=yes
@@ -48400,7 +51278,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # On some targets, GNU ld is compatible enough with the native linker
 +  # that we're better off using the native interface for both.
 +  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    case $host_os in
 +      aix*)
 +	# The AIX port of GNU ld has always aspired to compatibility
@@ -48422,24 +51300,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +  fi
 +
-+  if test "$lt_use_gnu_ld_interface" = yes; then
++  if test yes = "$lt_use_gnu_ld_interface"; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
++    wlarc='$wl'
 +
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
 +    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
++    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++    export_dynamic_flag_spec='$wl--export-dynamic'
 +    # ancient GNU ld didn't support --whole-archive et. al.
 +    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +    else
 +      whole_archive_flag_spec=
 +    fi
 +    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
++    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -48452,7 +51330,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix[3-9]*)
 +      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
++      if test ia64 != "$host_cpu"; then
 +	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
 +
@@ -48471,7 +51349,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds=''
 +        ;;
 +      m68k)
@@ -48487,7 +51365,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	allow_undefined_flag=unsupported
 +	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      else
 +	ld_shlibs=no
 +      fi
@@ -48497,7 +51375,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      hardcode_libdir_flag_spec='-L$libdir'
-+      export_dynamic_flag_spec='${wl}--export-all-symbols'
++      export_dynamic_flag_spec='$wl--export-all-symbols'
 +      allow_undefined_flag=unsupported
 +      always_export_symbols=no
 +      enable_shared_with_static_runtimes=yes
@@ -48505,61 +51383,89 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 +
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file, use it as
++	# is; otherwise, prepend EXPORTS...
++	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++          cp $export_symbols $output_objdir/$soname.def;
++        else
++          echo EXPORTS > $output_objdir/$soname.def;
++          cat $export_symbols >> $output_objdir/$soname.def;
++        fi~
++        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	ld_shlibs=no
 +      fi
 +      ;;
 +
 +    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      link_all_deplibs=yes
 +      ;;
 +
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      shrext_cmds=.dll
++      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes=yes
++      ;;
++
 +    interix[3-9]*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
++      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++      export_dynamic_flag_spec='$wl-E'
 +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +      # Instead, shared libraries are loaded at an image base (0x10000000 by
 +      # default) and relocated if they conflict, which is a slow very memory
 +      # consuming and fragmenting process.  To avoid this, we pick a random,
 +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
++      if test linux-dietlibc = "$host_os"; then
 +	case $cc_basename in
 +	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 +	esac
 +      fi
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
++	 && test no = "$tmp_diet"
 +      then
 +	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 +					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
@@ -48570,42 +51476,47 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lf95*)				# Lahey Fortran 8.1
 +	  whole_archive_flag_spec=
 +	  tmp_sharedflag='--shared' ;;
++        nagfor*)                        # NAGFOR 5.3
++          tmp_sharedflag='-Wl,-shared' ;;
 +	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
 +	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object=yes
 +	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
 +	  tmp_sharedflag='-G' ;;
 +	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +
-+        if test "x$supports_anon_versioning" = xyes; then
++        if test yes = "$supports_anon_versioning"; then
 +          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++            echo "local: *; };" >> $output_objdir/$libname.ver~
++            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +        fi
 +
 +	case $cc_basename in
++	tcc*)
++	  export_dynamic_flag_spec='-rdynamic'
++	  ;;
 +	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 +	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
++	  if test yes = "$supports_anon_versioning"; then
 +	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++              echo "local: *; };" >> $output_objdir/$libname.ver~
++              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
@@ -48614,13 +51525,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
-+    netbsd*)
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 +	wlarc=
 +      else
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      fi
 +      ;;
 +
@@ -48638,8 +51549,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	ld_shlibs=no
 +      fi
@@ -48651,7 +51562,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
 +
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -48666,9 +51577,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  # DT_RUNPATH tag from executables and libraries.  But doing so
 +	  # requires that you compile everything twice, which is a pain.
 +	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	  else
 +	    ld_shlibs=no
 +	  fi
@@ -48685,15 +51596,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	ld_shlibs=no
 +      fi
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs" = no; then
++    if test no = "$ld_shlibs"; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec=
 +      export_dynamic_flag_spec=
@@ -48709,7 +51620,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Note: this linker hardcodes the directories in LIBPATH if there
 +      # are no directories specified by -L.
 +      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 +	# Neither direct hardcoding nor static linking is supported with a
 +	# broken collect2.
 +	hardcode_direct=unsupported
@@ -48717,34 +51628,57 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
++	no_entry_flag=
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
++	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
++	# Without the "-l" option, or with the "-B" option, AIX nm treats
++	# weak defined symbols like other global defined symbols, whereas
++	# GNU nm marks them as "W".
++	# While the 'weak' keyword is ignored in the Export File, we need
++	# it in the Import File for the 'aix-soname' feature, so we have
++	# to replace the "-B" option with "-P" for AIX nm.
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +	else
-+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
++	# have runtime linking enabled, and use it for executables.
++	# For shared libraries, we enable/disable runtime linking
++	# depending on the kind of the shared library created -
++	# when "with_aix_soname,aix_use_runtimelinking" is:
++	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "aix,yes"  lib.so          shared, rtl:yes, for executables
++	#            lib.a           static archive
++	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
++	#            lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a(lib.so.V) shared, rtl:no
++	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a           static archive
 +	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 +	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 +	    aix_use_runtimelinking=yes
 +	    break
 +	  fi
 +	  done
++	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	    # so we don't have lib.a shared libs to link our executables.
++	    # We have to force runtime linking in this case.
++	    aix_use_runtimelinking=yes
++	    LDFLAGS="$LDFLAGS -Wl,-brtl"
++	  fi
 +	  ;;
 +	esac
 +
@@ -48763,13 +51697,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_direct_absolute=yes
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
++      file_list_spec='$wl-f,'
++      case $with_aix_soname,$aix_use_runtimelinking in
++      aix,*) ;; # traditional, no import file
++      svr4,* | *,yes) # use import file
++	# The Import File defines what to hardcode.
++	hardcode_direct=no
++	hardcode_direct_absolute=no
++	;;
++      esac
 +
-+      if test "$GCC" = yes; then
++      if test yes = "$GCC"; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -48788,35 +51730,42 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  ;;
 +	esac
 +	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
++	if test yes = "$aix_use_runtimelinking"; then
++	  shared_flag="$shared_flag "'$wl-G'
 +	fi
++	# Need to ensure runtime linking is disabled for the traditional
++	# shared library, or the linker may eventually find shared libraries
++	# /with/ Import File - we do not want to mix them.
++	shared_flag_aix='-shared'
++	shared_flag_svr4='-shared $wl-G'
 +      else
 +	# not using gcc
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag='$wl-G'
 +	  else
-+	    shared_flag='${wl}-bM:SRE'
++	    shared_flag='$wl-bM:SRE'
 +	  fi
++	  shared_flag_aix='$wl-bM:SRE'
++	  shared_flag_svr4='$wl-G'
 +	fi
 +      fi
 +
-+      export_dynamic_flag_spec='${wl}-bexpall'
++      export_dynamic_flag_spec='$wl-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols=yes
-+      if test "$aix_use_runtimelinking" = yes; then
++      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +	# Warning - without using the other runtime loading flags (-brtl),
 +	# -berok will link without error, but may produce a broken library.
 +	allow_undefined_flag='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
-+        if test "${lt_cv_aix_libpath+set}" = set; then
++        if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath_+:} false; then :
@@ -48859,7 +51808,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_="/usr/lib:/lib"
++    lt_cv_aix_libpath_=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -48867,17 +51816,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath_
 +fi
 +
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
++        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	if test ia64 = "$host_cpu"; then
++	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 +	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
-+	 if test "${lt_cv_aix_libpath+set}" = set; then
++	 if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath_+:} false; then :
@@ -48920,7 +51869,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_="/usr/lib:/lib"
++    lt_cv_aix_libpath_=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -48928,21 +51877,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath_
 +fi
 +
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
++	  no_undefined_flag=' $wl-bernotok'
++	  allow_undefined_flag=' $wl-berok'
++	  if test yes = "$with_gnu_ld"; then
 +	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	  else
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    whole_archive_flag_spec='$convenience'
 +	  fi
 +	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	  # -brtl affects multiple linker settings, -berok does not and is overridden later
++	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
++	  if test svr4 != "$with_aix_soname"; then
++	    # This is similar to how AIX traditionally builds its shared libraries.
++	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	  fi
++	  if test aix != "$with_aix_soname"; then
++	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	  else
++	    # used by -dlpreopen to get the symbols
++	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	  fi
++	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 +	fi
 +      fi
 +      ;;
@@ -48951,7 +51912,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds=''
 +        ;;
 +      m68k)
@@ -48981,16 +51942,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
-+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
++	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++            cp "$export_symbols" "$output_objdir/$soname.def";
++            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++          else
++            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++          fi~
++          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++          linknames='
 +	# The linker will not automatically build a static lib if we build a DLL.
 +	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 +	enable_shared_with_static_runtimes=yes
@@ -48999,18 +51961,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Don't use ranlib
 +	old_postinstall_cmds='chmod 644 $oldlib'
 +	postlink_cmds='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
++          lt_tool_outputfile="@TOOL_OUTPUT@"~
++          case $lt_outputfile in
++            *.exe|*.EXE) ;;
++            *)
++              lt_outputfile=$lt_outputfile.exe
++              lt_tool_outputfile=$lt_tool_outputfile.exe
++              ;;
++          esac~
++          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++            $RM "$lt_outputfile.manifest";
++          fi'
 +	;;
 +      *)
 +	# Assume MSVC wrapper
@@ -49019,7 +51981,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
 +	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +	# The linker will automatically build a .lib file if we build a DLL.
@@ -49038,24 +52000,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  hardcode_direct=no
 +  hardcode_automatic=yes
 +  hardcode_shlibpath_var=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +
 +  else
 +    whole_archive_flag_spec=''
 +  fi
 +  link_all_deplibs=yes
-+  allow_undefined_flag="$_lt_dar_allow_undefined"
++  allow_undefined_flag=$_lt_dar_allow_undefined
 +  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 +
 +  else
 +  ld_shlibs=no
@@ -49097,33 +52059,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      if test yes = "$GCC"; then
++	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      else
-+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      fi
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 +      hardcode_libdir_separator=:
 +      hardcode_direct=yes
 +
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
++      export_dynamic_flag_spec='$wl-E'
 +      ;;
 +
 +    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes,no = "$GCC,$with_gnu_ld"; then
++	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 +	hardcode_libdir_separator=:
 +	hardcode_direct=yes
 +	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
++	export_dynamic_flag_spec='$wl-E'
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L=yes
@@ -49131,25 +52093,25 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++      if test yes,no = "$GCC,$with_gnu_ld"; then
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
 +
@@ -49161,7 +52123,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler__b=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS -b"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -49180,14 +52142,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 +$as_echo "$lt_cv_prog_compiler__b" >&6; }
 +
-+if test x"$lt_cv_prog_compiler__b" = xyes; then
-+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++if test yes = "$lt_cv_prog_compiler__b"; then
++    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +else
 +    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +fi
@@ -49195,8 +52157,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  ;;
 +	esac
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 +	hardcode_libdir_separator=:
 +
 +	case $host_cpu in
@@ -49207,7 +52169,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	*)
 +	  hardcode_direct=yes
 +	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
++	  export_dynamic_flag_spec='$wl-E'
 +
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
@@ -49218,8 +52180,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
@@ -49229,8 +52191,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +if ${lt_cv_irix_exported_symbol+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++  save_LDFLAGS=$LDFLAGS
++	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 +	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +int foo (void) { return 0; }
@@ -49242,25 +52204,36 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+           LDFLAGS="$save_LDFLAGS"
++           LDFLAGS=$save_LDFLAGS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++	if test yes = "$lt_cv_irix_exported_symbol"; then
++          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 +	fi
++	link_all_deplibs=no
 +      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator=:
 +      inherit_rpath=yes
 +      link_all_deplibs=yes
 +      ;;
 +
-+    netbsd*)
++    linux*)
++      case $cc_basename in
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	ld_shlibs=yes
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      esac
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +      else
@@ -49274,7 +52247,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    newsos6)
 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator=:
 +      hardcode_shlibpath_var=no
 +      ;;
@@ -49282,27 +52255,19 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *nto* | *qnx*)
 +      ;;
 +
-+    openbsd*)
++    openbsd* | bitrig*)
 +      if test -f /usr/libexec/ld.so; then
 +	hardcode_direct=yes
 +	hardcode_shlibpath_var=no
 +	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++	  export_dynamic_flag_spec='$wl-E'
 +	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 +	fi
 +      else
 +	ld_shlibs=no
@@ -49313,33 +52278,53 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_libdir_flag_spec='-L$libdir'
 +      hardcode_minus_L=yes
 +      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      shrext_cmds=.dll
++      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes=yes
 +      ;;
 +
 +    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
++	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +      else
 +	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +      fi
 +      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator=:
 +      ;;
 +
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      if test yes = "$GCC"; then
++	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
++	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 +      else
 +	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -49350,24 +52335,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    solaris*)
 +      no_undefined_flag=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	wlarc='$wl'
++	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
 +	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 +	  ;;
 +	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  wlarc='$wl'
++	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	  ;;
 +	esac
 +      fi
@@ -49377,11 +52362,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
 +	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 +	# but is careful enough not to reorder.
 +	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	if test yes = "$GCC"; then
++	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +	else
 +	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 +	fi
@@ -49391,10 +52376,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
++      if test sequent = "$host_vendor"; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
 +	# files that make .init and .fini sections work.
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 +      fi
@@ -49443,43 +52428,43 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
++      no_undefined_flag='$wl-z,text'
 +      archive_cmds_need_lc=no
 +      hardcode_shlibpath_var=no
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
++      # Note: We CANNOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
 +      # always be unresolved, which means just about no library would
 +      # ever link correctly.  If we're not using GNU ld we use -z text
 +      # though, which does catch some bad symbols but isn't as heavy-handed
 +      # as -z defs.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
++      no_undefined_flag='$wl-z,text'
++      allow_undefined_flag='$wl-z,nodefs'
 +      archive_cmds_need_lc=no
 +      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
++      hardcode_libdir_flag_spec='$wl-R,$libdir'
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
++      export_dynamic_flag_spec='$wl-Bexport'
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
@@ -49494,10 +52479,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +    esac
 +
-+    if test x$host_vendor = xsni; then
++    if test sni = "$host_vendor"; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
++	export_dynamic_flag_spec='$wl-Blargedynsym'
 +	;;
 +      esac
 +    fi
@@ -49505,7 +52490,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 +$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
++test no = "$ld_shlibs" && can_build_shared=no
 +
 +with_gnu_ld=$with_gnu_ld
 +
@@ -49531,7 +52516,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Assume -lc should be added
 +  archive_cmds_need_lc=yes
 +
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $archive_cmds in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
@@ -49746,14 +52731,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 +$as_echo_n "checking dynamic linker characteristics... " >&6; }
 +
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
++    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
++    *) lt_awk_arg='/^libraries:/' ;;
 +  esac
 +  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
++    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
++    *) lt_sed_strip_eq='s|=/|/|g' ;;
 +  esac
 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 +  case $lt_search_path_spec in
@@ -49769,28 +52754,35 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    ;;
 +  esac
 +  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
++  # and add multilib dir if necessary...
 +  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  # ...but if some path component already ends with the multilib dir we assume
++  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
++  case "$lt_multi_os_dir; $lt_search_path_spec " in
++  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
++    lt_multi_os_dir=
++    ;;
++  esac
 +  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
++    if test -d "$lt_sys_path$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
++    elif test -n "$lt_multi_os_dir"; then
 +      test -d "$lt_sys_path" && \
 +	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 +    fi
 +  done
 +  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
++BEGIN {RS = " "; FS = "/|\n";} {
++  lt_foo = "";
++  lt_count = 0;
 +  for (lt_i = NF; lt_i > 0; lt_i--) {
 +    if ($lt_i != "" && $lt_i != ".") {
 +      if ($lt_i == "..") {
 +        lt_count++;
 +      } else {
 +        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
++          lt_foo = "/" $lt_i lt_foo;
 +        } else {
 +          lt_count--;
 +        }
@@ -49804,7 +52796,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # for these hosts.
 +  case $host_os in
 +    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
++      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
 +  esac
 +  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 +else
@@ -49813,7 +52805,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
-+shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
@@ -49830,14 +52822,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# flags to be left without arguments
 +need_version=unknown
 +
++
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[4-9]*)
@@ -49845,41 +52839,91 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[01] | aix4.[01].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a(lib.so.V)'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
@@ -49889,18 +52933,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-+  library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
@@ -49908,8 +52952,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +bsdi[45]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -49921,7 +52965,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-+  shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
@@ -49930,8 +52974,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
@@ -49947,17 +52991,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +
 +      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
@@ -49966,8 +53010,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
@@ -49994,7 +53038,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-+      sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -50007,8 +53051,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
@@ -50021,7 +53065,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  *)
 +    # Assume MSVC wrapper
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
@@ -50034,8 +53078,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -50048,8 +53092,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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
 +  ;;
 +
@@ -50067,12 +53111,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      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
 +      ;;
 +    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
@@ -50097,26 +53142,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  ;;
 +
-+gnu*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  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'
-+  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
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
@@ -50134,14 +53168,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
@@ -50149,8 +53184,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
@@ -50159,8 +53194,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -50173,8 +53208,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -50185,7 +53220,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
++	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
@@ -50193,8 +53228,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
@@ -50213,8 +53248,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
@@ -50223,13 +53258,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  hardcode_libdir_flag_spec='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -50281,14 +53336,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-+  # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -50300,17 +53356,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
++netbsdelf*-gnu)
++  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'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    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'
++    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
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -50320,7 +53388,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
@@ -50329,58 +53397,68 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=qnx
 +  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'
++  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
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
-+openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-+    shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-+  shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
@@ -50391,8 +53469,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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=yes
 +  hardcode_into_libs=yes
@@ -50402,11 +53480,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sunos4*)
 +  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
@@ -50414,8 +53492,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  case $host_vendor in
 +    sni)
@@ -50436,24 +53514,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +
 +sysv4*MP*)
-+  if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -50471,7 +53549,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -50479,8 +53557,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  ;;
 +
@@ -50490,20 +53568,35 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 +$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
++
++
++
++
++
 +
 +
 +
@@ -50600,15 +53693,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +hardcode_action=
 +if test -n "$hardcode_libdir_flag_spec" ||
 +   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
++   test yes = "$hardcode_automatic"; then
 +
 +  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != no &&
++  if test no != "$hardcode_direct" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
++     test no != "$hardcode_minus_L"; then
 +    # Linking always hardcodes the temporary library directory.
 +    hardcode_action=relink
 +  else
@@ -50623,12 +53716,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 +$as_echo "$hardcode_action" >&6; }
 +
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; then
++if test relink = "$hardcode_action" ||
++   test yes = "$inherit_rpath"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
@@ -50638,7 +53731,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+  if test "x$enable_dlopen" != xyes; then
++  if test yes != "$enable_dlopen"; then
 +  enable_dlopen=unknown
 +  enable_dlopen_self=unknown
 +  enable_dlopen_self_static=unknown
@@ -50648,23 +53741,23 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  case $host_os in
 +  beos*)
-+    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen=load_add_on
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +    ;;
 +
 +  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen=LoadLibrary
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  cygwin*)
-+    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen=dlopen
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  darwin*)
-+  # if libdl is installed we need to link against it
++    # if libdl is installed we need to link against it
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 +$as_echo_n "checking for dlopen in -ldl... " >&6; }
 +if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -50710,10 +53803,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 +else
 +
-+    lt_cv_dlopen="dyld"
++    lt_cv_dlopen=dyld
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +
@@ -50721,10 +53814,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    ;;
 +
++  tpf*)
++    # Don't try to run any link tests for TPF.  We know it's impossible
++    # because TPF is a cross-compiler, and we know how we open DSOs.
++    lt_cv_dlopen=dlopen
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=no
++    ;;
++
 +  *)
 +    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 +if test "x$ac_cv_func_shl_load" = xyes; then :
-+  lt_cv_dlopen="shl_load"
++  lt_cv_dlopen=shl_load
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 +$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -50771,11 +53872,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 +if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 +else
 +  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 +if test "x$ac_cv_func_dlopen" = xyes; then :
-+  lt_cv_dlopen="dlopen"
++  lt_cv_dlopen=dlopen
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 +$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -50822,7 +53923,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 +$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -50869,7 +53970,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 +if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 +$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -50916,7 +54017,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 +if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 +fi
 +
 +
@@ -50937,21 +54038,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    ;;
 +  esac
 +
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
++  if test no = "$lt_cv_dlopen"; then
 +    enable_dlopen=no
++  else
++    enable_dlopen=yes
 +  fi
 +
 +  case $lt_cv_dlopen in
 +  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    save_CPPFLAGS=$CPPFLAGS
++    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +
-+    save_LDFLAGS="$LDFLAGS"
++    save_LDFLAGS=$LDFLAGS
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +
-+    save_LIBS="$LIBS"
++    save_LIBS=$LIBS
 +    LIBS="$lt_cv_dlopen_libs $LIBS"
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -50959,7 +54060,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +if ${lt_cv_dlopen_self+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  	  if test "$cross_compiling" = yes; then :
++  	  if test yes = "$cross_compiling"; then :
 +  lt_cv_dlopen_self=cross
 +else
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -51006,9 +54107,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +#  endif
 +#endif
 +
-+/* When -fvisbility=hidden is used, assume the code has been annotated
++/* When -fvisibility=hidden is used, assume the code has been annotated
 +   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 +int fnord () __attribute__((visibility("default")));
 +#endif
 +
@@ -51038,7 +54139,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 +    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
@@ -51058,14 +54159,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 +$as_echo "$lt_cv_dlopen_self" >&6; }
 +
-+    if test "x$lt_cv_dlopen_self" = xyes; then
++    if test yes = "$lt_cv_dlopen_self"; then
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 +if ${lt_cv_dlopen_self_static+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  	  if test "$cross_compiling" = yes; then :
++  	  if test yes = "$cross_compiling"; then :
 +  lt_cv_dlopen_self_static=cross
 +else
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -51112,9 +54213,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +#  endif
 +#endif
 +
-+/* When -fvisbility=hidden is used, assume the code has been annotated
++/* When -fvisibility=hidden is used, assume the code has been annotated
 +   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 +int fnord () __attribute__((visibility("default")));
 +#endif
 +
@@ -51144,7 +54245,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 +    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
@@ -51165,9 +54266,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +$as_echo "$lt_cv_dlopen_self_static" >&6; }
 +    fi
 +
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++    LIBS=$save_LIBS
 +    ;;
 +  esac
 +
@@ -51211,7 +54312,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# FIXME - insert some real tests, host_os isn't really good enough
 +  case $host_os in
 +  darwin*)
-+    if test -n "$STRIP" ; then
++    if test -n "$STRIP"; then
 +      striplib="$STRIP -x"
 +      old_striplib="$STRIP -S"
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -51239,7 +54340,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+  # Report which library types will actually be built
++  # Report what library types will actually be built
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 +$as_echo_n "checking if libtool supports shared libraries... " >&6; }
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -51247,13 +54348,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 +$as_echo_n "checking whether to build shared libraries... " >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
++  test no = "$can_build_shared" && enable_shared=no
 +
 +  # On AIX, shared libraries and static libraries use the same namespace, and
 +  # are all built from PIC.
 +  case $host_os in
 +  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
++    test yes = "$enable_shared" && enable_static=no
 +    if test -n "$RANLIB"; then
 +      archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +      postinstall_cmds='$RANLIB $lib'
@@ -51261,8 +54362,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    ;;
 +
 +  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
++    if test ia64 != "$host_cpu"; then
++      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++      yes,aix,yes) ;;			# shared object as lib.so file only
++      yes,svr4,*) ;;			# shared object as lib.so archive member only
++      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++      esac
 +    fi
 +    ;;
 +  esac
@@ -51272,7 +54377,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 +$as_echo_n "checking whether to build static libraries... " >&6; }
 +  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
++  test yes = "$enable_shared" || enable_static=yes
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 +$as_echo "$enable_static" >&6; }
 +
@@ -51286,11 +54391,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
-+CC="$lt_save_CC"
++CC=$lt_save_CC
 +
-+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
++      if test -n "$CXX" && ( test no != "$CXX" &&
++    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
++    (test g++ != "$CXX"))); then
 +  ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -51469,7 +54574,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# the CXX compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
++if test yes != "$_lt_caught_CXX_error"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="int some_variable = 0;"
 +
@@ -51530,46 +54635,39 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  CFLAGS=$CXXFLAGS
 +  compiler=$CC
 +  compiler_CXX=$CC
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++  func_cc_basename $compiler
++cc_basename=$func_cc_basename_result
 +
 +
 +  if test -n "$compiler"; then
 +    # We don't want -fno-exception when compiling C++ code, so set the
 +    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
 +    else
 +      lt_prog_compiler_no_builtin_flag_CXX=
 +    fi
 +
-+    if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      # Set up default GNU C++ configuration
 +
 +
 +
 +# Check whether --with-gnu-ld was given.
 +if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 +else
 +  with_gnu_ld=no
 +fi
 +
 +ac_prog=ld
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  # Check if gcc -print-prog-name=ld gives a path.
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 +$as_echo_n "checking for ld used by $CC... " >&6; }
 +  case $host in
 +  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
++    # gcc leaves a trailing carriage return, which upsets mingw
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 +  *)
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -51583,7 +54681,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 +	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 +      done
-+      test -z "$LD" && LD="$ac_prog"
++      test -z "$LD" && LD=$ac_prog
 +      ;;
 +  "")
 +    # If it fails, then pretend we aren't using GCC.
@@ -51594,7 +54692,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    with_gnu_ld=unknown
 +    ;;
 +  esac
-+elif test "$with_gnu_ld" = yes; then
++elif test yes = "$with_gnu_ld"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 +$as_echo_n "checking for GNU ld... " >&6; }
 +else
@@ -51605,32 +54703,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
++      lt_cv_path_LD=$ac_dir/$ac_prog
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
 +      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
++	test no != "$with_gnu_ld" && break
 +	;;
 +      *)
-+	test "$with_gnu_ld" != yes && break
++	test yes != "$with_gnu_ld" && break
 +	;;
 +      esac
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
++  IFS=$lt_save_ifs
 +else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  lt_cv_path_LD=$LD # Let the user override the test with a path.
 +fi
 +fi
 +
-+LD="$lt_cv_path_LD"
++LD=$lt_cv_path_LD
 +if test -n "$LD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 +$as_echo "$LD" >&6; }
@@ -51666,22 +54764,22 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +      # Check if GNU C++ uses GNU ld as the underlying linker, since the
 +      # archiving commands below assume that GNU ld is being used.
-+      if test "$with_gnu_ld" = yes; then
-+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      if test yes = "$with_gnu_ld"; then
++        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
++        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 +
 +        # If archive_cmds runs LD, not CC, wlarc should be empty
 +        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 +        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
++        wlarc='$wl'
 +
 +        # ancient GNU ld didn't support --whole-archive et. al.
 +        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 +	  $GREP 'no-whole-archive' > /dev/null; then
-+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +        else
 +          whole_archive_flag_spec_CXX=
 +        fi
@@ -51700,7 +54798,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # 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"'
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +
 +    else
 +      GXX=no
@@ -51718,18 +54816,30 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ld_shlibs_CXX=no
 +        ;;
 +      aix[4-9]*)
-+        if test "$host_cpu" = ia64; then
++        if test ia64 = "$host_cpu"; then
 +          # On IA64, the linker does run time linking by default, so we don't
 +          # have to do anything special.
 +          aix_use_runtimelinking=no
 +          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
++          no_entry_flag=
 +        else
 +          aix_use_runtimelinking=no
 +
 +          # Test if we are trying to use run time linking or normal
 +          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
++          # have runtime linking enabled, and use it for executables.
++          # For shared libraries, we enable/disable runtime linking
++          # depending on the kind of the shared library created -
++          # when "with_aix_soname,aix_use_runtimelinking" is:
++          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "aix,yes"  lib.so          shared, rtl:yes, for executables
++          #            lib.a           static archive
++          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
++          #            lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a(lib.so.V) shared, rtl:no
++          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a           static archive
 +          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 +	    for ld_flag in $LDFLAGS; do
 +	      case $ld_flag in
@@ -51739,6 +54849,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	        ;;
 +	      esac
 +	    done
++	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	      # so we don't have lib.a shared libs to link our executables.
++	      # We have to force runtime linking in this case.
++	      aix_use_runtimelinking=yes
++	      LDFLAGS="$LDFLAGS -Wl,-brtl"
++	    fi
 +	    ;;
 +          esac
 +
@@ -51757,13 +54874,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        hardcode_direct_absolute_CXX=yes
 +        hardcode_libdir_separator_CXX=':'
 +        link_all_deplibs_CXX=yes
-+        file_list_spec_CXX='${wl}-f,'
++        file_list_spec_CXX='$wl-f,'
++        case $with_aix_soname,$aix_use_runtimelinking in
++        aix,*) ;;	# no import file
++        svr4,* | *,yes) # use import file
++          # The Import File defines what to hardcode.
++          hardcode_direct_CXX=no
++          hardcode_direct_absolute_CXX=no
++          ;;
++        esac
 +
-+        if test "$GXX" = yes; then
++        if test yes = "$GXX"; then
 +          case $host_os in aix4.[012]|aix4.[012].*)
 +          # We only want to do this on AIX 4.2 and lower, the check
 +          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -51781,36 +54906,44 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  fi
 +          esac
 +          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag=$shared_flag' $wl-G'
 +	  fi
++	  # Need to ensure runtime linking is disabled for the traditional
++	  # shared library, or the linker may eventually find shared libraries
++	  # /with/ Import File - we do not want to mix them.
++	  shared_flag_aix='-shared'
++	  shared_flag_svr4='-shared $wl-G'
 +        else
 +          # not using gcc
-+          if test "$host_cpu" = ia64; then
++          if test ia64 = "$host_cpu"; then
 +	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	  # chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
++	    if test yes = "$aix_use_runtimelinking"; then
++	      shared_flag='$wl-G'
 +	    else
-+	      shared_flag='${wl}-bM:SRE'
++	      shared_flag='$wl-bM:SRE'
 +	    fi
++	    shared_flag_aix='$wl-bM:SRE'
++	    shared_flag_svr4='$wl-G'
 +          fi
 +        fi
 +
-+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
++        export_dynamic_flag_spec_CXX='$wl-bexpall'
 +        # It seems that -bexpall does not export symbols beginning with
 +        # underscore (_), so it is better to generate a list of symbols to
 +	# export.
 +        always_export_symbols_CXX=yes
-+        if test "$aix_use_runtimelinking" = yes; then
++	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +          # Warning - without using the other runtime loading flags (-brtl),
 +          # -berok will link without error, but may produce a broken library.
-+          allow_undefined_flag_CXX='-berok'
++          # The "-G" linker flag allows undefined symbols.
++          no_undefined_flag_CXX='-bernotok'
 +          # Determine the default libpath from the value encoded in an empty
 +          # executable.
-+          if test "${lt_cv_aix_libpath+set}" = set; then
++          if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -51853,7 +54986,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++    lt_cv_aix_libpath__CXX=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -51861,18 +54994,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__CXX
 +fi
 +
-+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 +
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +        else
-+          if test "$host_cpu" = ia64; then
-+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++          if test ia64 = "$host_cpu"; then
++	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
 +	    allow_undefined_flag_CXX="-z nodefs"
-+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +          else
 +	    # Determine the default libpath from the value encoded in an
 +	    # empty executable.
-+	    if test "${lt_cv_aix_libpath+set}" = set; then
++	    if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -51915,7 +55048,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++    lt_cv_aix_libpath__CXX=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -51923,22 +55056,34 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__CXX
 +fi
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 +	    # Warning - without using the other run time loading flags,
 +	    # -berok will link without error, but may produce a broken library.
-+	    no_undefined_flag_CXX=' ${wl}-bernotok'
-+	    allow_undefined_flag_CXX=' ${wl}-berok'
-+	    if test "$with_gnu_ld" = yes; then
++	    no_undefined_flag_CXX=' $wl-bernotok'
++	    allow_undefined_flag_CXX=' $wl-berok'
++	    if test yes = "$with_gnu_ld"; then
 +	      # We only use this code for GNU lds that support --whole-archive.
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    else
 +	      # Exported symbols can be pulled into shared objects from archives
 +	      whole_archive_flag_spec_CXX='$convenience'
 +	    fi
 +	    archive_cmds_need_lc_CXX=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	    # -brtl affects multiple linker settings, -berok does not and is overridden later
++	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
++	    if test svr4 != "$with_aix_soname"; then
++	      # This is similar to how AIX traditionally builds its shared
++	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
++	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	    fi
++	    if test aix != "$with_aix_soname"; then
++	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	    else
++	      # used by -dlpreopen to get the symbols
++	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	    fi
++	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
 +          fi
 +        fi
 +        ;;
@@ -51948,7 +55093,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  allow_undefined_flag_CXX=unsupported
 +	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	  # support --undefined.  This deserves some investigation.  FIXME
-+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +	else
 +	  ld_shlibs_CXX=no
 +	fi
@@ -51976,57 +55121,58 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  # Tell ltmain to make .lib files, not .a files.
 +	  libext=lib
 +	  # Tell ltmain to make .dll files, not .so files.
-+	  shrext_cmds=".dll"
++	  shrext_cmds=.dll
 +	  # FIXME: Setting linknames here is a bad hack.
-+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	    else
-+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	    fi~
-+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	    linknames='
++	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++              cp "$export_symbols" "$output_objdir/$soname.def";
++              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++            else
++              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++            fi~
++            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++            linknames='
 +	  # The linker will not automatically build a static lib if we build a DLL.
 +	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
 +	  enable_shared_with_static_runtimes_CXX=yes
 +	  # Don't use ranlib
 +	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
 +	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	    case $lt_outputfile in
-+	      *.exe|*.EXE) ;;
-+	      *)
-+		lt_outputfile="$lt_outputfile.exe"
-+		lt_tool_outputfile="$lt_tool_outputfile.exe"
-+		;;
-+	    esac~
-+	    func_to_tool_file "$lt_outputfile"~
-+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	      $RM "$lt_outputfile.manifest";
-+	    fi'
++            lt_tool_outputfile="@TOOL_OUTPUT@"~
++            case $lt_outputfile in
++              *.exe|*.EXE) ;;
++              *)
++                lt_outputfile=$lt_outputfile.exe
++                lt_tool_outputfile=$lt_tool_outputfile.exe
++                ;;
++            esac~
++            func_to_tool_file "$lt_outputfile"~
++            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++              $RM "$lt_outputfile.manifest";
++            fi'
 +	  ;;
 +	*)
 +	  # g++
 +	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 +	  # as there is no search path for DLLs.
 +	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
++	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
 +	  allow_undefined_flag_CXX=unsupported
 +	  always_export_symbols_CXX=no
 +	  enable_shared_with_static_runtimes_CXX=yes
 +
 +	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	    # If the export-symbols file already is a .def file (1st line
-+	    # is EXPORTS), use it as is; otherwise, prepend...
-+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      cp $export_symbols $output_objdir/$soname.def;
-+	    else
-+	      echo EXPORTS > $output_objdir/$soname.def;
-+	      cat $export_symbols >> $output_objdir/$soname.def;
-+	    fi~
-+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    # If the export-symbols file already is a .def file, use it as
++	    # is; otherwise, prepend EXPORTS...
++	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++              cp $export_symbols $output_objdir/$soname.def;
++            else
++              echo EXPORTS > $output_objdir/$soname.def;
++              cat $export_symbols >> $output_objdir/$soname.def;
++            fi~
++            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +	  else
 +	    ld_shlibs_CXX=no
 +	  fi
@@ -52040,27 +55186,27 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  hardcode_direct_CXX=no
 +  hardcode_automatic_CXX=yes
 +  hardcode_shlibpath_var_CXX=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +
 +  else
 +    whole_archive_flag_spec_CXX=''
 +  fi
 +  link_all_deplibs_CXX=yes
-+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
 +  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++       if test yes != "$lt_cv_apple_cc_single_mod"; then
++      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
++      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
 +    fi
 +
 +  else
@@ -52069,6 +55215,34 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +	;;
 +
++      os2*)
++	hardcode_libdir_flag_spec_CXX='-L$libdir'
++	hardcode_minus_L_CXX=yes
++	allow_undefined_flag_CXX=unsupported
++	shrext_cmds=.dll
++	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  prefix_cmds="$SED"~
++	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	    prefix_cmds="$prefix_cmds -e 1d";
++	  fi~
++	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++	enable_shared_with_static_runtimes_CXX=yes
++	;;
++
 +      dgux*)
 +        case $cc_basename in
 +          ec++*)
@@ -52103,18 +55277,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ld_shlibs_CXX=yes
 +        ;;
 +
-+      gnu*)
-+        ;;
-+
 +      haiku*)
-+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +        link_all_deplibs_CXX=yes
 +        ;;
 +
 +      hpux9*)
-+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
 +        hardcode_libdir_separator_CXX=:
-+        export_dynamic_flag_spec_CXX='${wl}-E'
++        export_dynamic_flag_spec_CXX='$wl-E'
 +        hardcode_direct_CXX=yes
 +        hardcode_minus_L_CXX=yes # Not in the search PATH,
 +				             # but as the default
@@ -52126,7 +55297,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +            ld_shlibs_CXX=no
 +            ;;
 +          aCC*)
-+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            # Commands to make compiler produce verbose output that lists
 +            # what "hidden" libraries, object files and flags are used when
 +            # linking a shared library.
@@ -52135,11 +55306,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +            # explicitly linking system object files so we need to strip them
 +            # from the output so that they don't get included in the library
 +            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +            ;;
 +          *)
-+            if test "$GXX" = yes; then
-+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            if test yes = "$GXX"; then
++              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            else
 +              # FIXME: insert proper C++ library support
 +              ld_shlibs_CXX=no
@@ -52149,15 +55320,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +
 +      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++        if test no = "$with_gnu_ld"; then
++	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
 +	  hardcode_libdir_separator_CXX=:
 +
 +          case $host_cpu in
 +            hppa*64*|ia64*)
 +              ;;
 +            *)
-+	      export_dynamic_flag_spec_CXX='${wl}-E'
++	      export_dynamic_flag_spec_CXX='$wl-E'
 +              ;;
 +          esac
 +        fi
@@ -52183,13 +55354,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +          aCC*)
 +	    case $host_cpu in
 +	      hppa*64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      ia64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      *)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	    esac
 +	    # Commands to make compiler produce verbose output that lists
@@ -52200,20 +55371,20 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
 +	        case $host_cpu in
 +	          hppa*64*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          ia64*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          *)
-+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	        esac
 +	      fi
@@ -52228,22 +55399,22 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      interix[3-9]*)
 +	hardcode_direct_CXX=no
 +	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}-E'
++	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='$wl-E'
 +	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +	# Instead, shared libraries are loaded at an image base (0x10000000 by
 +	# default) and relocated if they conflict, which is a slow very memory
 +	# consuming and fragmenting process.  To avoid this, we pick a random,
 +	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +	;;
 +      irix5* | irix6*)
 +        case $cc_basename in
 +          CC*)
 +	    # SGI C++
-+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -52252,22 +55423,22 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
 +	    ;;
 +          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	      else
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 +	      fi
 +	    fi
 +	    link_all_deplibs_CXX=yes
 +	    ;;
 +        esac
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 +        hardcode_libdir_separator_CXX=:
 +        inherit_rpath_CXX=yes
 +        ;;
 +
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -52275,8 +55446,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
-+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -52285,10 +55456,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
++	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -52302,59 +55473,59 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # earlier do not add the objects themselves.
 +	    case `$CC -V 2>&1` in
 +	      *"Version 7."*)
-+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	      *)  # Version 8.0 or newer
 +	        tmp_idyn=
 +	        case $host_cpu in
 +		  ia64*) tmp_idyn=' -i_dynamic';;
 +		esac
-+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	    esac
 +	    archive_cmds_need_lc_CXX=no
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
++	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
++	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    ;;
 +          pgCC* | pgcpp*)
 +            # Portland Group C++ compiler
 +	    case `$CC -V` in
 +	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
 +	      prelink_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++               rm -rf $tpldir~
++               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 +	      old_archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+		$RANLIB $oldlib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++                $RANLIB $oldlib'
 +	      archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 +	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    *) # Version 6 and above use weak symbols
-+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    esac
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
++	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
++	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +            ;;
 +	  cxx*)
 +	    # Compaq C++
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 +
 +	    runpath_var=LD_RUN_PATH
 +	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -52368,18 +55539,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 +	    ;;
 +	  xl* | mpixl* | bgxl*)
 +	    # IBM XL 8.0 on PPC, with GNU ld
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
++	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
++	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
++	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    if test yes = "$supports_anon_versioning"; then
 +	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++                echo "local: *; };" >> $output_objdir/$libname.ver~
++                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +	    fi
 +	    ;;
 +	  *)
@@ -52387,10 +55558,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    *Sun\ C*)
 +	      # Sun C++ 5.9
 +	      no_undefined_flag_CXX=' -zdefs'
-+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 +	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	      compiler_needs_object_CXX=yes
 +
 +	      # Not sure whether something based on
@@ -52448,22 +55619,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ld_shlibs_CXX=yes
 +	;;
 +
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	ld_shlibs_CXX=no
-+	;;
-+
-+      openbsd*)
++      openbsd* | bitrig*)
 +	if test -f /usr/libexec/ld.so; then
 +	  hardcode_direct_CXX=yes
 +	  hardcode_shlibpath_var_CXX=no
 +	  hardcode_direct_absolute_CXX=yes
 +	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    export_dynamic_flag_spec_CXX='${wl}-E'
-+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
++	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
++	    export_dynamic_flag_spec_CXX='$wl-E'
++	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +	  fi
 +	  output_verbose_link_cmd=func_echo_all
 +	else
@@ -52479,9 +55645,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
-+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
 +	    hardcode_libdir_separator_CXX=:
 +
 +	    # Archives containing C++ object files must be created using
@@ -52499,17 +55665,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +          cxx*)
 +	    case $host in
 +	      osf3*)
-+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
++	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 +		;;
 +	      *)
 +	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
++                  echo "-hidden">> $lib.exp~
++                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
++                  $RM $lib.exp'
 +	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 +		;;
 +	    esac
@@ -52524,27 +55690,27 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	    if test yes,no = "$GXX,$with_gnu_ld"; then
++	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
 +	      case $host in
 +	        osf3*)
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	        *)
-+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	      esac
 +
-+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 +	      hardcode_libdir_separator_CXX=:
 +
 +	      # 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"'
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +
 +	    else
 +	      # FIXME: insert proper C++ library support
@@ -52584,9 +55750,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +            archive_cmds_need_lc_CXX=yes
 +	    no_undefined_flag_CXX=' -zdefs'
-+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	    hardcode_libdir_flag_spec_CXX='-R$libdir'
 +	    hardcode_shlibpath_var_CXX=no
@@ -52594,7 +55760,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +	      *)
 +		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
++		# but understands '-z linker_flag'.
 +	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 +		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 +	        ;;
@@ -52611,42 +55777,42 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    ;;
 +          gcx*)
 +	    # Green Hills C++ Compiler
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 +
 +	    # The C++ compiler must be used to create the archive.
 +	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 +	    ;;
 +          *)
 +	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	    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
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $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~
-+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -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'
 +
 +	        # 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"'
++	        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
++	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 +	        # platform.
-+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        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 -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $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"'
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +	      fi
 +
-+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	      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'
++		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +		  ;;
 +	      esac
 +	    fi
@@ -52655,52 +55821,52 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag_CXX='${wl}-z,text'
++      no_undefined_flag_CXX='$wl-z,text'
 +      archive_cmds_need_lc_CXX=no
 +      hardcode_shlibpath_var_CXX=no
 +      runpath_var='LD_RUN_PATH'
 +
 +      case $cc_basename in
 +        CC*)
-+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +      esac
 +      ;;
 +
 +      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
++	# Note: We CANNOT use -z defs as we might desire, because we do not
 +	# link with -lc, and that would cause any symbols used from libc to
 +	# always be unresolved, which means just about no library would
 +	# ever link correctly.  If we're not using GNU ld we use -z text
 +	# though, which does catch some bad symbols but isn't as heavy-handed
 +	# as -z defs.
-+	no_undefined_flag_CXX='${wl}-z,text'
-+	allow_undefined_flag_CXX='${wl}-z,nodefs'
++	no_undefined_flag_CXX='$wl-z,text'
++	allow_undefined_flag_CXX='$wl-z,nodefs'
 +	archive_cmds_need_lc_CXX=no
 +	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
++	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
 +	hardcode_libdir_separator_CXX=':'
 +	link_all_deplibs_CXX=yes
-+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
++	export_dynamic_flag_spec_CXX='$wl-Bexport'
 +	runpath_var='LD_RUN_PATH'
 +
 +	case $cc_basename in
 +          CC*)
-+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-+	      '"$old_archive_cmds_CXX"
++              '"$old_archive_cmds_CXX"
 +	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-+	      '"$reload_cmds_CXX"
++              '"$reload_cmds_CXX"
 +	    ;;
 +	  *)
-+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    ;;
 +	esac
 +      ;;
@@ -52732,10 +55898,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 +$as_echo "$ld_shlibs_CXX" >&6; }
-+    test "$ld_shlibs_CXX" = no && can_build_shared=no
++    test no = "$ld_shlibs_CXX" && can_build_shared=no
 +
-+    GCC_CXX="$GXX"
-+    LD_CXX="$LD"
++    GCC_CXX=$GXX
++    LD_CXX=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -52779,13 +55945,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  pre_test_object_deps_done=no
 +
 +  for p in `eval "$output_verbose_link_cmd"`; do
-+    case ${prev}${p} in
++    case $prev$p in
 +
 +    -L* | -R* | -l*)
 +       # Some compilers place space between "-{L,R}" and the path.
 +       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
++       if test x-L = "$p" ||
++          test x-R = "$p"; then
 +	 prev=$p
 +	 continue
 +       fi
@@ -52801,16 +55967,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +       case $p in
 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 +       esac
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case ${prev} in
++       if test no = "$pre_test_object_deps_done"; then
++	 case $prev in
 +	 -L | -R)
 +	   # Internal compiler library paths should come after those
 +	   # provided the user.  The postdeps already come after the
 +	   # user supplied libs so there is no need to process them.
 +	   if test -z "$compiler_lib_search_path_CXX"; then
-+	     compiler_lib_search_path_CXX="${prev}${p}"
++	     compiler_lib_search_path_CXX=$prev$p
 +	   else
-+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
 +	   fi
 +	   ;;
 +	 # The "-l" case would never come before the object being
@@ -52818,9 +55984,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	 esac
 +       else
 +	 if test -z "$postdeps_CXX"; then
-+	   postdeps_CXX="${prev}${p}"
++	   postdeps_CXX=$prev$p
 +	 else
-+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	   postdeps_CXX="${postdeps_CXX} $prev$p"
 +	 fi
 +       fi
 +       prev=
@@ -52835,15 +56001,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	 continue
 +       fi
 +
-+       if test "$pre_test_object_deps_done" = no; then
++       if test no = "$pre_test_object_deps_done"; then
 +	 if test -z "$predep_objects_CXX"; then
-+	   predep_objects_CXX="$p"
++	   predep_objects_CXX=$p
 +	 else
 +	   predep_objects_CXX="$predep_objects_CXX $p"
 +	 fi
 +       else
 +	 if test -z "$postdep_objects_CXX"; then
-+	   postdep_objects_CXX="$p"
++	   postdep_objects_CXX=$p
 +	 else
 +	   postdep_objects_CXX="$postdep_objects_CXX $p"
 +	 fi
@@ -52873,51 +56039,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  postdep_objects_CXX=
 +  postdeps_CXX=
 +  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
-+  CC* | sunCC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
 +esac
 +
 +
@@ -52926,7 +56047,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 + compiler_lib_search_dirs_CXX=
 +if test -n "${compiler_lib_search_path_CXX}"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 +fi
 +
 +
@@ -52965,17 +56086,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
++  if test yes = "$GXX"; then
 +    lt_prog_compiler_wl_CXX='-Wl,'
 +    lt_prog_compiler_static_CXX='-static'
 +
 +    case $host_os in
 +    aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static_CXX='-Bstatic'
 +      fi
++      lt_prog_compiler_pic_CXX='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -52986,8 +56108,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -53002,6 +56124,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static_CXX='$wl-static'
++	;;
++      esac
 +      ;;
 +    darwin* | rhapsody*)
 +      # PIC is the default on this platform
@@ -53051,7 +56178,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +      aix[4-9]*)
 +	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	  # AIX 5 now supports IA64 processor
 +	  lt_prog_compiler_static_CXX='-Bstatic'
 +	else
@@ -53091,14 +56218,14 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	case $cc_basename in
 +	  CC*)
 +	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
++	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
++	    if test ia64 != "$host_cpu"; then
 +	      lt_prog_compiler_pic_CXX='+Z'
 +	    fi
 +	    ;;
 +	  aCC*)
 +	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
 +	    case $host_cpu in
 +	    hppa*64*|ia64*)
 +	      # +Z the default
@@ -53127,7 +56254,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    ;;
 +	esac
 +	;;
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
@@ -53135,7 +56262,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    lt_prog_compiler_pic_CXX='-fPIC'
 +	    ;;
 +	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
++	    # old Intel C++ for x86_64, which still supported -KPIC.
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    lt_prog_compiler_pic_CXX='-KPIC'
 +	    lt_prog_compiler_static_CXX='-static'
@@ -53191,7 +56318,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    ;;
 +	esac
 +	;;
-+      netbsd*)
++      netbsd* | netbsdelf*-gnu)
 +	;;
 +      *qnx* | *nto*)
 +        # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -53280,7 +56407,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_CXX=
 +    ;;
@@ -53312,7 +56439,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_prog_compiler_pic_works_CXX=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -53342,7 +56469,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
++if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
 +    case $lt_prog_compiler_pic_CXX in
 +     "" | " "*) ;;
 +     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -53368,7 +56495,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler_static_works_CXX=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -53387,13 +56514,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
++if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
 +    :
 +else
 +    lt_prog_compiler_static_CXX=
@@ -53507,8 +56634,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 +$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -53520,9 +56647,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 +$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++  if test no = "$hard_links"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 +    need_locks=warn
 +  fi
 +else
@@ -53539,17 +56666,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  case $host_os in
 +  aix[4-9]*)
 +    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    # Also, AIX nm treats weak defined symbols like other global defined
-+    # symbols, whereas GNU nm marks them as "W".
++    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
++    # Without the "-l" option, or with the "-B" option, AIX nm treats
++    # weak defined symbols like other global defined symbols, whereas
++    # GNU nm marks them as "W".
++    # While the 'weak' keyword is ignored in the Export File, we need
++    # it in the Import File for the 'aix-soname' feature, so we have
++    # to replace the "-B" option with "-P" for AIX nm.
 +    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +    else
-+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +    fi
 +    ;;
 +  pw32*)
-+    export_symbols_cmds_CXX="$ltdll_cmds"
++    export_symbols_cmds_CXX=$ltdll_cmds
 +    ;;
 +  cygwin* | mingw* | cegcc*)
 +    case $cc_basename in
@@ -53562,6 +56693,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +    esac
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs_CXX=no
++    ;;
 +  *)
 +    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 +    ;;
@@ -53569,7 +56703,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 +$as_echo "$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
++test no = "$ld_shlibs_CXX" && can_build_shared=no
 +
 +with_gnu_ld_CXX=$with_gnu_ld
 +
@@ -53586,7 +56720,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Assume -lc should be added
 +  archive_cmds_need_lc_CXX=yes
 +
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $archive_cmds_CXX in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
@@ -53714,7 +56848,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
-+shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
@@ -53731,14 +56865,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# flags to be left without arguments
 +need_version=unknown
 +
++
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[4-9]*)
@@ -53746,41 +56882,91 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[01] | aix4.[01].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a(lib.so.V)'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
@@ -53790,18 +56976,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-+  library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
@@ -53809,8 +56995,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +bsdi[45]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -53822,7 +57008,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-+  shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
@@ -53831,8 +57017,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
@@ -53848,16 +57034,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
@@ -53866,8 +57052,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
@@ -53894,7 +57080,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-+      sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -53907,8 +57093,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
@@ -53921,7 +57107,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  *)
 +    # Assume MSVC wrapper
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
@@ -53934,8 +57120,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -53947,8 +57133,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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
 +  ;;
 +
@@ -53966,12 +57152,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      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
 +      ;;
 +    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
@@ -53996,26 +57183,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  ;;
 +
-+gnu*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  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'
-+  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
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
@@ -54033,14 +57209,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
@@ -54048,8 +57225,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
@@ -54058,8 +57235,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -54072,8 +57249,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -54084,7 +57261,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
++	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
@@ -54092,8 +57269,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
@@ -54112,8 +57289,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
@@ -54122,13 +57299,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  hardcode_libdir_flag_spec_CXX='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -54180,14 +57377,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-+  # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -54199,17 +57397,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
++netbsdelf*-gnu)
++  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'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    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'
++    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
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -54219,7 +57429,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
@@ -54228,58 +57438,68 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=qnx
 +  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'
++  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
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
-+openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-+    shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-+  shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
@@ -54290,8 +57510,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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=yes
 +  hardcode_into_libs=yes
@@ -54301,11 +57521,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sunos4*)
 +  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
@@ -54313,8 +57533,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  case $host_vendor in
 +    sni)
@@ -54335,24 +57555,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +
 +sysv4*MP*)
-+  if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -54370,7 +57590,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -54378,8 +57598,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  ;;
 +
@@ -54389,20 +57609,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 +$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
++
++
 +
 +
 +
@@ -54445,15 +57677,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +hardcode_action_CXX=
 +if test -n "$hardcode_libdir_flag_spec_CXX" ||
 +   test -n "$runpath_var_CXX" ||
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++   test yes = "$hardcode_automatic_CXX"; then
 +
 +  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct_CXX" != no &&
++  if test no != "$hardcode_direct_CXX" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-+     test "$hardcode_minus_L_CXX" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
++     test no != "$hardcode_minus_L_CXX"; then
 +    # Linking always hardcodes the temporary library directory.
 +    hardcode_action_CXX=relink
 +  else
@@ -54468,12 +57700,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
 +$as_echo "$hardcode_action_CXX" >&6; }
 +
-+if test "$hardcode_action_CXX" = relink ||
-+   test "$inherit_rpath_CXX" = yes; then
++if test relink = "$hardcode_action_CXX" ||
++   test yes = "$inherit_rpath_CXX"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
@@ -54496,7 +57728,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_path_LD=$lt_save_path_LD
 +  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
++fi # test yes != "$_lt_caught_CXX_error"
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
@@ -54511,7 +57743,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 +
-+if test -z "$F77" || test "X$F77" = "Xno"; then
++if test -z "$F77" || test no = "$F77"; then
 +  _lt_disable_F77=yes
 +fi
 +
@@ -54548,7 +57780,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# the F77 compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
++if test yes != "$_lt_disable_F77"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
@@ -54594,22 +57826,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${F77-"f77"}
 +  CFLAGS=$FFLAGS
 +  compiler=$CC
 +  compiler_F77=$CC
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++  func_cc_basename $compiler
++cc_basename=$func_cc_basename_result
 +
 +  GCC=$G77
 +  if test -n "$compiler"; then
@@ -54620,21 +57845,25 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 +$as_echo_n "checking whether to build shared libraries... " >&6; }
-+    test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[4-9]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
@@ -54644,12 +57873,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 +$as_echo_n "checking whether to build static libraries... " >&6; }
 +    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 +$as_echo "$enable_static" >&6; }
 +
-+    GCC_F77="$G77"
-+    LD_F77="$LD"
++    GCC_F77=$G77
++    LD_F77=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -54660,17 +57889,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +lt_prog_compiler_static_F77=
 +
 +
-+  if test "$GCC" = yes; then
++  if test yes = "$GCC"; then
 +    lt_prog_compiler_wl_F77='-Wl,'
 +    lt_prog_compiler_static_F77='-static'
 +
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static_F77='-Bstatic'
 +      fi
++      lt_prog_compiler_pic_F77='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -54681,8 +57911,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -54698,6 +57928,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static_F77='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
@@ -54768,7 +58003,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix*)
 +      lt_prog_compiler_wl_F77='-Wl,'
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static_F77='-Bstatic'
 +      else
@@ -54776,10 +58011,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      case $cc_basename in
++      nagfor*)
++        # NAG Fortran compiler
++        lt_prog_compiler_wl_F77='-Wl,-Wl,,'
++        lt_prog_compiler_pic_F77='-PIC'
++        lt_prog_compiler_static_F77='-Bstatic'
++        ;;
++      esac
++      ;;
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static_F77='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    hpux9* | hpux10* | hpux11*)
@@ -54795,7 +58049,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	;;
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      lt_prog_compiler_static_F77='$wl-a ${wl}archive'
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
@@ -54804,14 +58058,20 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      lt_prog_compiler_static_F77='-non_shared'
 +      ;;
 +
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
++      # old Intel for x86_64, which still supported -KPIC.
 +      ecc*)
 +	lt_prog_compiler_wl_F77='-Wl,'
 +	lt_prog_compiler_pic_F77='-KPIC'
 +	lt_prog_compiler_static_F77='-static'
 +        ;;
++      # flang / f18. f95 an alias for gfortran or flang on Debian
++      flang* | f18* | f95*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
 +      # icc used to be incompatible with GCC.
 +      # ICC 10 doesn't accept -KPIC any more.
 +      icc* | ifort*)
@@ -54831,6 +58091,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lt_prog_compiler_pic_F77='-PIC'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +	;;
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fPIC'
++	lt_prog_compiler_static_F77='-static'
++	;;
 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -54928,7 +58194,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*MP*)
-+      if test -d /usr/nec ;then
++      if test -d /usr/nec; then
 +	lt_prog_compiler_pic_F77='-Kconform_pic'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +      fi
@@ -54957,7 +58223,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_F77=
 +    ;;
@@ -54989,7 +58255,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_prog_compiler_pic_works_F77=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -55019,7 +58285,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5
 +$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
++if test yes = "$lt_cv_prog_compiler_pic_works_F77"; then
 +    case $lt_prog_compiler_pic_F77 in
 +     "" | " "*) ;;
 +     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -55045,7 +58311,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler_static_works_F77=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -55064,13 +58330,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5
 +$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
++if test yes = "$lt_cv_prog_compiler_static_works_F77"; then
 +    :
 +else
 +    lt_prog_compiler_static_F77=
@@ -55184,8 +58450,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$lt_cv_prog_compiler_c_o_F77" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 +$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -55197,9 +58463,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 +$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++  if test no = "$hard_links"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 +    need_locks=warn
 +  fi
 +else
@@ -55239,9 +58505,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # included in the symbol list
 +  include_expsyms_F77=
 +  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
++  # it will be wrapped by ' (' and ')$', so one must not match beginning or
++  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
++  # as well as any symbol that contains 'd'.
 +  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 +  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 +  # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -55256,7 +58522,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 +    # When not using gcc, we currently assume that we are using
 +    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      with_gnu_ld=no
 +    fi
 +    ;;
@@ -55264,9 +58530,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
++  openbsd* | bitrig*)
 +    with_gnu_ld=no
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs_F77=no
++    ;;
 +  esac
 +
 +  ld_shlibs_F77=yes
@@ -55274,7 +58543,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # On some targets, GNU ld is compatible enough with the native linker
 +  # that we're better off using the native interface for both.
 +  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    case $host_os in
 +      aix*)
 +	# The AIX port of GNU ld has always aspired to compatibility
@@ -55296,24 +58565,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +  fi
 +
-+  if test "$lt_use_gnu_ld_interface" = yes; then
++  if test yes = "$lt_use_gnu_ld_interface"; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
++    wlarc='$wl'
 +
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
 +    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++    hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
++    export_dynamic_flag_spec_F77='$wl--export-dynamic'
 +    # ancient GNU ld didn't support --whole-archive et. al.
 +    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      whole_archive_flag_spec_F77=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +    else
 +      whole_archive_flag_spec_F77=
 +    fi
 +    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
++    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -55326,7 +58595,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix[3-9]*)
 +      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
++      if test ia64 != "$host_cpu"; then
 +	ld_shlibs_F77=no
 +	cat <<_LT_EOF 1>&2
 +
@@ -55345,7 +58614,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds_F77=''
 +        ;;
 +      m68k)
@@ -55361,7 +58630,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	allow_undefined_flag_F77=unsupported
 +	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      else
 +	ld_shlibs_F77=no
 +      fi
@@ -55371,7 +58640,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      export_dynamic_flag_spec_F77='${wl}--export-all-symbols'
++      export_dynamic_flag_spec_F77='$wl--export-all-symbols'
 +      allow_undefined_flag_F77=unsupported
 +      always_export_symbols_F77=no
 +      enable_shared_with_static_runtimes_F77=yes
@@ -55379,61 +58648,89 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      exclude_expsyms_F77='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 +
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file, use it as
++	# is; otherwise, prepend EXPORTS...
++	archive_expsym_cmds_F77='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++          cp $export_symbols $output_objdir/$soname.def;
++        else
++          echo EXPORTS > $output_objdir/$soname.def;
++          cat $export_symbols >> $output_objdir/$soname.def;
++        fi~
++        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	ld_shlibs_F77=no
 +      fi
 +      ;;
 +
 +    haiku*)
-+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      link_all_deplibs_F77=yes
 +      ;;
 +
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
++      shrext_cmds=.dll
++      archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
++
 +    interix[3-9]*)
 +      hardcode_direct_F77=no
 +      hardcode_shlibpath_var_F77=no
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec_F77='${wl}-E'
++      hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
++      export_dynamic_flag_spec_F77='$wl-E'
 +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +      # Instead, shared libraries are loaded at an image base (0x10000000 by
 +      # default) and relocated if they conflict, which is a slow very memory
 +      # consuming and fragmenting process.  To avoid this, we pick a random,
 +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_F77='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
++      if test linux-dietlibc = "$host_os"; then
 +	case $cc_basename in
 +	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 +	esac
 +      fi
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
++	 && test no = "$tmp_diet"
 +      then
 +	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 +					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
@@ -55444,42 +58741,47 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lf95*)				# Lahey Fortran 8.1
 +	  whole_archive_flag_spec_F77=
 +	  tmp_sharedflag='--shared' ;;
++        nagfor*)                        # NAGFOR 5.3
++          tmp_sharedflag='-Wl,-shared' ;;
 +	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
 +	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object_F77=yes
 +	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_F77='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object_F77=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
 +	  tmp_sharedflag='-G' ;;
 +	esac
-+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +
-+        if test "x$supports_anon_versioning" = xyes; then
++        if test yes = "$supports_anon_versioning"; then
 +          archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++            echo "local: *; };" >> $output_objdir/$libname.ver~
++            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +        fi
 +
 +	case $cc_basename in
++	tcc*)
++	  export_dynamic_flag_spec_F77='-rdynamic'
++	  ;;
 +	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
 +	  archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
++	  if test yes = "$supports_anon_versioning"; then
 +	    archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++              echo "local: *; };" >> $output_objdir/$libname.ver~
++              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
@@ -55488,13 +58790,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
-+    netbsd*)
++    netbsd* | netbsdelf*-gnu)
 +      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'
++	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
 +      ;;
 +
@@ -55512,8 +58814,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	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'
++	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'
 +      else
 +	ld_shlibs_F77=no
 +      fi
@@ -55525,7 +58827,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	ld_shlibs_F77=no
 +	cat <<_LT_EOF 1>&2
 +
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -55540,9 +58842,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  # DT_RUNPATH tag from executables and libraries.  But doing so
 +	  # requires that you compile everything twice, which is a pain.
 +	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+	    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 $wl$libdir'
++	    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'
 +	  else
 +	    ld_shlibs_F77=no
 +	  fi
@@ -55559,15 +58861,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	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'
++	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'
 +      else
 +	ld_shlibs_F77=no
 +      fi
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs_F77" = no; then
++    if test no = "$ld_shlibs_F77"; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec_F77=
 +      export_dynamic_flag_spec_F77=
@@ -55583,7 +58885,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Note: this linker hardcodes the directories in LIBPATH if there
 +      # are no directories specified by -L.
 +      hardcode_minus_L_F77=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 +	# Neither direct hardcoding nor static linking is supported with a
 +	# broken collect2.
 +	hardcode_direct_F77=unsupported
@@ -55591,34 +58893,57 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
++	no_entry_flag=
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
++	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
++	# Without the "-l" option, or with the "-B" option, AIX nm treats
++	# weak defined symbols like other global defined symbols, whereas
++	# GNU nm marks them as "W".
++	# While the 'weak' keyword is ignored in the Export File, we need
++	# it in the Import File for the 'aix-soname' feature, so we have
++	# to replace the "-B" option with "-P" for AIX nm.
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +	else
-+	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds_F77='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
++	# have runtime linking enabled, and use it for executables.
++	# For shared libraries, we enable/disable runtime linking
++	# depending on the kind of the shared library created -
++	# when "with_aix_soname,aix_use_runtimelinking" is:
++	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "aix,yes"  lib.so          shared, rtl:yes, for executables
++	#            lib.a           static archive
++	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
++	#            lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a(lib.so.V) shared, rtl:no
++	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a           static archive
 +	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 +	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 +	    aix_use_runtimelinking=yes
 +	    break
 +	  fi
 +	  done
++	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	    # so we don't have lib.a shared libs to link our executables.
++	    # We have to force runtime linking in this case.
++	    aix_use_runtimelinking=yes
++	    LDFLAGS="$LDFLAGS -Wl,-brtl"
++	  fi
 +	  ;;
 +	esac
 +
@@ -55637,13 +58962,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_direct_absolute_F77=yes
 +      hardcode_libdir_separator_F77=':'
 +      link_all_deplibs_F77=yes
-+      file_list_spec_F77='${wl}-f,'
++      file_list_spec_F77='$wl-f,'
++      case $with_aix_soname,$aix_use_runtimelinking in
++      aix,*) ;; # traditional, no import file
++      svr4,* | *,yes) # use import file
++	# The Import File defines what to hardcode.
++	hardcode_direct_F77=no
++	hardcode_direct_absolute_F77=no
++	;;
++      esac
 +
-+      if test "$GCC" = yes; then
++      if test yes = "$GCC"; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -55662,35 +58995,42 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  ;;
 +	esac
 +	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
++	if test yes = "$aix_use_runtimelinking"; then
++	  shared_flag="$shared_flag "'$wl-G'
 +	fi
++	# Need to ensure runtime linking is disabled for the traditional
++	# shared library, or the linker may eventually find shared libraries
++	# /with/ Import File - we do not want to mix them.
++	shared_flag_aix='-shared'
++	shared_flag_svr4='-shared $wl-G'
 +      else
 +	# not using gcc
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag='$wl-G'
 +	  else
-+	    shared_flag='${wl}-bM:SRE'
++	    shared_flag='$wl-bM:SRE'
 +	  fi
++	  shared_flag_aix='$wl-bM:SRE'
++	  shared_flag_svr4='$wl-G'
 +	fi
 +      fi
 +
-+      export_dynamic_flag_spec_F77='${wl}-bexpall'
++      export_dynamic_flag_spec_F77='$wl-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_F77=yes
-+      if test "$aix_use_runtimelinking" = yes; then
++      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +	# Warning - without using the other runtime loading flags (-brtl),
 +	# -berok will link without error, but may produce a broken library.
 +	allow_undefined_flag_F77='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
-+        if test "${lt_cv_aix_libpath+set}" = set; then
++        if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__F77+:} false; then :
@@ -55719,7 +59059,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__F77"; then
-+    lt_cv_aix_libpath__F77="/usr/lib:/lib"
++    lt_cv_aix_libpath__F77=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -55727,17 +59067,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__F77
 +fi
 +
-+        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
++        archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	if test ia64 = "$host_cpu"; then
++	  hardcode_libdir_flag_spec_F77='$wl-R $libdir:/usr/lib:/lib'
 +	  allow_undefined_flag_F77="-z nodefs"
-+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
-+	 if test "${lt_cv_aix_libpath+set}" = set; then
++	 if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__F77+:} false; then :
@@ -55766,7 +59106,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__F77"; then
-+    lt_cv_aix_libpath__F77="/usr/lib:/lib"
++    lt_cv_aix_libpath__F77=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -55774,21 +59114,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__F77
 +fi
 +
-+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	 hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag_F77=' ${wl}-bernotok'
-+	  allow_undefined_flag_F77=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
++	  no_undefined_flag_F77=' $wl-bernotok'
++	  allow_undefined_flag_F77=' $wl-berok'
++	  if test yes = "$with_gnu_ld"; then
 +	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec_F77='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    whole_archive_flag_spec_F77='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	  else
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    whole_archive_flag_spec_F77='$convenience'
 +	  fi
 +	  archive_cmds_need_lc_F77=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  archive_expsym_cmds_F77='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	  # -brtl affects multiple linker settings, -berok does not and is overridden later
++	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
++	  if test svr4 != "$with_aix_soname"; then
++	    # This is similar to how AIX traditionally builds its shared libraries.
++	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	  fi
++	  if test aix != "$with_aix_soname"; then
++	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	  else
++	    # used by -dlpreopen to get the symbols
++	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	  fi
++	  archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$RM -r $output_objdir/$realname.d'
 +	fi
 +      fi
 +      ;;
@@ -55797,7 +59149,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds_F77=''
 +        ;;
 +      m68k)
@@ -55827,16 +59179,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
-+	archive_cmds_F77='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
++	archive_cmds_F77='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	archive_expsym_cmds_F77='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++            cp "$export_symbols" "$output_objdir/$soname.def";
++            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++          else
++            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++          fi~
++          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++          linknames='
 +	# The linker will not automatically build a static lib if we build a DLL.
 +	# _LT_TAGVAR(old_archive_from_new_cmds, F77)='true'
 +	enable_shared_with_static_runtimes_F77=yes
@@ -55845,18 +59198,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Don't use ranlib
 +	old_postinstall_cmds_F77='chmod 644 $oldlib'
 +	postlink_cmds_F77='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
++          lt_tool_outputfile="@TOOL_OUTPUT@"~
++          case $lt_outputfile in
++            *.exe|*.EXE) ;;
++            *)
++              lt_outputfile=$lt_outputfile.exe
++              lt_tool_outputfile=$lt_tool_outputfile.exe
++              ;;
++          esac~
++          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++            $RM "$lt_outputfile.manifest";
++          fi'
 +	;;
 +      *)
 +	# Assume MSVC wrapper
@@ -55865,7 +59218,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
 +	archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +	# The linker will automatically build a .lib file if we build a DLL.
@@ -55884,24 +59237,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  hardcode_direct_F77=no
 +  hardcode_automatic_F77=yes
 +  hardcode_shlibpath_var_F77=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +    compiler_needs_object_F77=yes
 +  else
 +    whole_archive_flag_spec_F77=''
 +  fi
 +  link_all_deplibs_F77=yes
-+  allow_undefined_flag_F77="$_lt_dar_allow_undefined"
++  allow_undefined_flag_F77=$_lt_dar_allow_undefined
 +  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-+    archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    archive_expsym_cmds_F77="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    module_expsym_cmds_F77="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 +
 +  else
 +  ld_shlibs_F77=no
@@ -55943,33 +59296,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      if test yes = "$GCC"; then
++	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      else
-+	archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      fi
-+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
 +      hardcode_libdir_separator_F77=:
 +      hardcode_direct_F77=yes
 +
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      hardcode_minus_L_F77=yes
-+      export_dynamic_flag_spec_F77='${wl}-E'
++      export_dynamic_flag_spec_F77='$wl-E'
 +      ;;
 +
 +    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes,no = "$GCC,$with_gnu_ld"; then
++	archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
 +	hardcode_libdir_separator_F77=:
 +	hardcode_direct_F77=yes
 +	hardcode_direct_absolute_F77=yes
-+	export_dynamic_flag_spec_F77='${wl}-E'
++	export_dynamic_flag_spec_F77='$wl-E'
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L_F77=yes
@@ -55977,33 +59330,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++      if test yes,no = "$GCC,$with_gnu_ld"; then
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_F77='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_F77='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
 +	hardcode_libdir_separator_F77=:
 +
 +	case $host_cpu in
@@ -56014,7 +59367,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	*)
 +	  hardcode_direct_F77=yes
 +	  hardcode_direct_absolute_F77=yes
-+	  export_dynamic_flag_spec_F77='${wl}-E'
++	  export_dynamic_flag_spec_F77='$wl-E'
 +
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
@@ -56025,8 +59378,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
@@ -56036,8 +59389,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +if ${lt_cv_irix_exported_symbol+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++  save_LDFLAGS=$LDFLAGS
++	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 +	   cat > conftest.$ac_ext <<_ACEOF
 +
 +      subroutine foo
@@ -56050,25 +59403,36 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+           LDFLAGS="$save_LDFLAGS"
++           LDFLAGS=$save_LDFLAGS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++	if test yes = "$lt_cv_irix_exported_symbol"; then
++          archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 +	fi
++	link_all_deplibs_F77=no
 +      else
-+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      archive_cmds_need_lc_F77='no'
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_F77=:
 +      inherit_rpath_F77=yes
 +      link_all_deplibs_F77=yes
 +      ;;
 +
-+    netbsd*)
++    linux*)
++      case $cc_basename in
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	ld_shlibs_F77=yes
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      esac
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +      else
@@ -56082,7 +59446,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    newsos6)
 +      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_direct_F77=yes
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_F77=:
 +      hardcode_shlibpath_var_F77=no
 +      ;;
@@ -56090,27 +59454,19 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *nto* | *qnx*)
 +      ;;
 +
-+    openbsd*)
++    openbsd* | bitrig*)
 +      if test -f /usr/libexec/ld.so; then
 +	hardcode_direct_F77=yes
 +	hardcode_shlibpath_var_F77=no
 +	hardcode_direct_absolute_F77=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec_F77='${wl}-E'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='$wl-E'
 +	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec_F77='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
 +	fi
 +      else
 +	ld_shlibs_F77=no
@@ -56121,33 +59477,53 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_libdir_flag_spec_F77='-L$libdir'
 +      hardcode_minus_L_F77=yes
 +      allow_undefined_flag_F77=unsupported
-+      archive_cmds_F77='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      shrext_cmds=.dll
++      archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes_F77=yes
 +      ;;
 +
 +    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
++	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +      else
 +	allow_undefined_flag_F77=' -expect_unresolved \*'
-+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +      fi
 +      archive_cmds_need_lc_F77='no'
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_F77=:
 +      ;;
 +
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      if test yes = "$GCC"; then
++	allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
++	archive_cmds_F77='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++	hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
 +      else
 +	allow_undefined_flag_F77=' -expect_unresolved \*'
-+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -56158,24 +59534,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    solaris*)
 +      no_undefined_flag_F77=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds_F77='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	wlarc='$wl'
++	archive_cmds_F77='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
 +	  wlarc=''
-+	  archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds_F77='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 +	  ;;
 +	*)
-+	  wlarc='${wl}'
-+	  archive_cmds_F77='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  wlarc='$wl'
++	  archive_cmds_F77='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	  ;;
 +	esac
 +      fi
@@ -56185,11 +59561,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
 +	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 +	# but is careful enough not to reorder.
 +	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	if test yes = "$GCC"; then
++	  whole_archive_flag_spec_F77='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +	else
 +	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
 +	fi
@@ -56199,10 +59575,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
++      if test sequent = "$host_vendor"; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
 +	# files that make .init and .fini sections work.
-+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_F77='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 +      fi
@@ -56251,43 +59627,43 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag_F77='${wl}-z,text'
++      no_undefined_flag_F77='$wl-z,text'
 +      archive_cmds_need_lc_F77=no
 +      hardcode_shlibpath_var_F77=no
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
++      # Note: We CANNOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
 +      # always be unresolved, which means just about no library would
 +      # ever link correctly.  If we're not using GNU ld we use -z text
 +      # though, which does catch some bad symbols but isn't as heavy-handed
 +      # as -z defs.
-+      no_undefined_flag_F77='${wl}-z,text'
-+      allow_undefined_flag_F77='${wl}-z,nodefs'
++      no_undefined_flag_F77='$wl-z,text'
++      allow_undefined_flag_F77='$wl-z,nodefs'
 +      archive_cmds_need_lc_F77=no
 +      hardcode_shlibpath_var_F77=no
-+      hardcode_libdir_flag_spec_F77='${wl}-R,$libdir'
++      hardcode_libdir_flag_spec_F77='$wl-R,$libdir'
 +      hardcode_libdir_separator_F77=':'
 +      link_all_deplibs_F77=yes
-+      export_dynamic_flag_spec_F77='${wl}-Bexport'
++      export_dynamic_flag_spec_F77='$wl-Bexport'
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
@@ -56302,10 +59678,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +    esac
 +
-+    if test x$host_vendor = xsni; then
++    if test sni = "$host_vendor"; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec_F77='${wl}-Blargedynsym'
++	export_dynamic_flag_spec_F77='$wl-Blargedynsym'
 +	;;
 +      esac
 +    fi
@@ -56313,7 +59689,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5
 +$as_echo "$ld_shlibs_F77" >&6; }
-+test "$ld_shlibs_F77" = no && can_build_shared=no
++test no = "$ld_shlibs_F77" && can_build_shared=no
 +
 +with_gnu_ld_F77=$with_gnu_ld
 +
@@ -56330,7 +59706,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Assume -lc should be added
 +  archive_cmds_need_lc_F77=yes
 +
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $archive_cmds_F77 in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
@@ -56458,7 +59834,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
-+shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
@@ -56475,14 +59851,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# flags to be left without arguments
 +need_version=unknown
 +
++
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[4-9]*)
@@ -56490,41 +59868,91 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[01] | aix4.[01].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a(lib.so.V)'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
@@ -56534,18 +59962,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-+  library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
@@ -56553,8 +59981,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +bsdi[45]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -56566,7 +59994,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-+  shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
@@ -56575,8 +60003,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
@@ -56592,16 +60020,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
@@ -56610,8 +60038,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
@@ -56638,7 +60066,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-+      sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -56651,8 +60079,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
@@ -56665,7 +60093,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  *)
 +    # Assume MSVC wrapper
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
@@ -56678,8 +60106,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -56691,8 +60119,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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
 +  ;;
 +
@@ -56710,12 +60138,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      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
 +      ;;
 +    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
@@ -56740,26 +60169,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  ;;
 +
-+gnu*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  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'
-+  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
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
@@ -56777,14 +60195,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
@@ -56792,8 +60211,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
@@ -56802,8 +60221,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -56816,8 +60235,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -56828,7 +60247,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
++	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
@@ -56836,8 +60255,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
@@ -56856,8 +60275,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
@@ -56866,13 +60285,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  hardcode_libdir_flag_spec_F77='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -56910,14 +60349,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-+  # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -56929,17 +60369,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
++netbsdelf*-gnu)
++  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'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    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'
++    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
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -56949,7 +60401,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
@@ -56958,58 +60410,68 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=qnx
 +  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'
++  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
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
-+openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-+    shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-+  shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
@@ -57020,8 +60482,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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=yes
 +  hardcode_into_libs=yes
@@ -57031,11 +60493,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sunos4*)
 +  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
@@ -57043,8 +60505,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  case $host_vendor in
 +    sni)
@@ -57065,24 +60527,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +
 +sysv4*MP*)
-+  if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -57100,7 +60562,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -57108,8 +60570,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  ;;
 +
@@ -57119,20 +60581,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 +$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
++
++
 +
 +
 +
@@ -57175,15 +60649,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +hardcode_action_F77=
 +if test -n "$hardcode_libdir_flag_spec_F77" ||
 +   test -n "$runpath_var_F77" ||
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
++   test yes = "$hardcode_automatic_F77"; then
 +
 +  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct_F77" != no &&
++  if test no != "$hardcode_direct_F77" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-+     test "$hardcode_minus_L_F77" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" &&
++     test no != "$hardcode_minus_L_F77"; then
 +    # Linking always hardcodes the temporary library directory.
 +    hardcode_action_F77=relink
 +  else
@@ -57198,12 +60672,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5
 +$as_echo "$hardcode_action_F77" >&6; }
 +
-+if test "$hardcode_action_F77" = relink ||
-+   test "$inherit_rpath_F77" = yes; then
++if test relink = "$hardcode_action_F77" ||
++   test yes = "$inherit_rpath_F77"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
@@ -57217,9 +60691,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi # test -n "$compiler"
 +
 +  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+  CFLAGS="$lt_save_CFLAGS"
-+fi # test "$_lt_disable_F77" != yes
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
++fi # test yes != "$_lt_disable_F77"
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
@@ -57235,7 +60709,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 +
 +
-+if test -z "$FC" || test "X$FC" = "Xno"; then
++if test -z "$FC" || test no = "$FC"; then
 +  _lt_disable_FC=yes
 +fi
 +
@@ -57272,7 +60746,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# the FC compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
++if test yes != "$_lt_disable_FC"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
@@ -57318,7 +60792,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${FC-"f95"}
@@ -57327,15 +60801,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  GCC=$ac_cv_fc_compiler_gnu
 +
 +  compiler_FC=$CC
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++  func_cc_basename $compiler
++cc_basename=$func_cc_basename_result
 +
 +
 +  if test -n "$compiler"; then
@@ -57346,21 +60813,25 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 +$as_echo_n "checking whether to build shared libraries... " >&6; }
-+    test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[4-9]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
@@ -57370,12 +60841,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 +$as_echo_n "checking whether to build static libraries... " >&6; }
 +    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 +$as_echo "$enable_static" >&6; }
 +
-+    GCC_FC="$ac_cv_fc_compiler_gnu"
-+    LD_FC="$LD"
++    GCC_FC=$ac_cv_fc_compiler_gnu
++    LD_FC=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -57418,13 +60889,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  pre_test_object_deps_done=no
 +
 +  for p in `eval "$output_verbose_link_cmd"`; do
-+    case ${prev}${p} in
++    case $prev$p in
 +
 +    -L* | -R* | -l*)
 +       # Some compilers place space between "-{L,R}" and the path.
 +       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
++       if test x-L = "$p" ||
++          test x-R = "$p"; then
 +	 prev=$p
 +	 continue
 +       fi
@@ -57440,16 +60911,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +       case $p in
 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 +       esac
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case ${prev} in
++       if test no = "$pre_test_object_deps_done"; then
++	 case $prev in
 +	 -L | -R)
 +	   # Internal compiler library paths should come after those
 +	   # provided the user.  The postdeps already come after the
 +	   # user supplied libs so there is no need to process them.
 +	   if test -z "$compiler_lib_search_path_FC"; then
-+	     compiler_lib_search_path_FC="${prev}${p}"
++	     compiler_lib_search_path_FC=$prev$p
 +	   else
-+	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
++	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} $prev$p"
 +	   fi
 +	   ;;
 +	 # The "-l" case would never come before the object being
@@ -57457,9 +60928,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	 esac
 +       else
 +	 if test -z "$postdeps_FC"; then
-+	   postdeps_FC="${prev}${p}"
++	   postdeps_FC=$prev$p
 +	 else
-+	   postdeps_FC="${postdeps_FC} ${prev}${p}"
++	   postdeps_FC="${postdeps_FC} $prev$p"
 +	 fi
 +       fi
 +       prev=
@@ -57474,15 +60945,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	 continue
 +       fi
 +
-+       if test "$pre_test_object_deps_done" = no; then
++       if test no = "$pre_test_object_deps_done"; then
 +	 if test -z "$predep_objects_FC"; then
-+	   predep_objects_FC="$p"
++	   predep_objects_FC=$p
 +	 else
 +	   predep_objects_FC="$predep_objects_FC $p"
 +	 fi
 +       else
 +	 if test -z "$postdep_objects_FC"; then
-+	   postdep_objects_FC="$p"
++	   postdep_objects_FC=$p
 +	 else
 +	   postdep_objects_FC="$postdep_objects_FC $p"
 +	 fi
@@ -57511,7 +60982,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 + compiler_lib_search_dirs_FC=
 +if test -n "${compiler_lib_search_path_FC}"; then
-+ compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++ compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 +fi
 +
 +
@@ -57531,17 +61002,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +lt_prog_compiler_static_FC=
 +
 +
-+  if test "$GCC" = yes; then
++  if test yes = "$GCC"; then
 +    lt_prog_compiler_wl_FC='-Wl,'
 +    lt_prog_compiler_static_FC='-static'
 +
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static_FC='-Bstatic'
 +      fi
++      lt_prog_compiler_pic_FC='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -57552,8 +61024,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -57569,6 +61041,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static_FC='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
@@ -57639,7 +61116,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix*)
 +      lt_prog_compiler_wl_FC='-Wl,'
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static_FC='-Bstatic'
 +      else
@@ -57647,10 +61124,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_FC='-fno-common'
++      case $cc_basename in
++      nagfor*)
++        # NAG Fortran compiler
++        lt_prog_compiler_wl_FC='-Wl,-Wl,,'
++        lt_prog_compiler_pic_FC='-PIC'
++        lt_prog_compiler_static_FC='-Bstatic'
++        ;;
++      esac
++      ;;
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
++      case $host_os in
++      os2*)
++	lt_prog_compiler_static_FC='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    hpux9* | hpux10* | hpux11*)
@@ -57666,7 +61162,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	;;
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
++      lt_prog_compiler_static_FC='$wl-a ${wl}archive'
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
@@ -57675,14 +61171,20 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      lt_prog_compiler_static_FC='-non_shared'
 +      ;;
 +
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
++      # old Intel for x86_64, which still supported -KPIC.
 +      ecc*)
 +	lt_prog_compiler_wl_FC='-Wl,'
 +	lt_prog_compiler_pic_FC='-KPIC'
 +	lt_prog_compiler_static_FC='-static'
 +        ;;
++      # flang / f18. f95 an alias for gfortran or flang on Debian
++      flang* | f18* | f95*)
++	lt_prog_compiler_wl_FC='-Wl,'
++	lt_prog_compiler_pic_FC='-fPIC'
++	lt_prog_compiler_static_FC='-static'
++        ;;
 +      # icc used to be incompatible with GCC.
 +      # ICC 10 doesn't accept -KPIC any more.
 +      icc* | ifort*)
@@ -57702,6 +61204,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lt_prog_compiler_pic_FC='-PIC'
 +	lt_prog_compiler_static_FC='-Bstatic'
 +	;;
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	lt_prog_compiler_wl_FC='-Wl,'
++	lt_prog_compiler_pic_FC='-fPIC'
++	lt_prog_compiler_static_FC='-static'
++	;;
 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -57799,7 +61307,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*MP*)
-+      if test -d /usr/nec ;then
++      if test -d /usr/nec; then
 +	lt_prog_compiler_pic_FC='-Kconform_pic'
 +	lt_prog_compiler_static_FC='-Bstatic'
 +      fi
@@ -57828,7 +61336,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  fi
 +
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_FC=
 +    ;;
@@ -57860,7 +61368,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  lt_cv_prog_compiler_pic_works_FC=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_FC"
++   lt_compiler_flag="$lt_prog_compiler_pic_FC"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -57890,7 +61398,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5
 +$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
++if test yes = "$lt_cv_prog_compiler_pic_works_FC"; then
 +    case $lt_prog_compiler_pic_FC in
 +     "" | " "*) ;;
 +     *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
@@ -57916,7 +61424,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler_static_works_FC=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -57935,13 +61443,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5
 +$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
 +
-+if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
++if test yes = "$lt_cv_prog_compiler_static_works_FC"; then
 +    :
 +else
 +    lt_prog_compiler_static_FC=
@@ -58055,8 +61563,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +
 +
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$lt_cv_prog_compiler_c_o_FC" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 +$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -58068,9 +61576,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 +$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++  if test no = "$hard_links"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 +    need_locks=warn
 +  fi
 +else
@@ -58110,9 +61618,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # included in the symbol list
 +  include_expsyms_FC=
 +  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
++  # it will be wrapped by ' (' and ')$', so one must not match beginning or
++  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
++  # as well as any symbol that contains 'd'.
 +  exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 +  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 +  # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -58127,7 +61635,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 +    # When not using gcc, we currently assume that we are using
 +    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      with_gnu_ld=no
 +    fi
 +    ;;
@@ -58135,9 +61643,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
++  openbsd* | bitrig*)
 +    with_gnu_ld=no
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs_FC=no
++    ;;
 +  esac
 +
 +  ld_shlibs_FC=yes
@@ -58145,7 +61656,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # On some targets, GNU ld is compatible enough with the native linker
 +  # that we're better off using the native interface for both.
 +  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    case $host_os in
 +      aix*)
 +	# The AIX port of GNU ld has always aspired to compatibility
@@ -58167,24 +61678,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +  fi
 +
-+  if test "$lt_use_gnu_ld_interface" = yes; then
++  if test yes = "$lt_use_gnu_ld_interface"; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
++    wlarc='$wl'
 +
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
 +    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_FC='${wl}--export-dynamic'
++    hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
++    export_dynamic_flag_spec_FC='$wl--export-dynamic'
 +    # ancient GNU ld didn't support --whole-archive et. al.
 +    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      whole_archive_flag_spec_FC=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +    else
 +      whole_archive_flag_spec_FC=
 +    fi
 +    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
++    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -58197,7 +61708,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    aix[3-9]*)
 +      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
++      if test ia64 != "$host_cpu"; then
 +	ld_shlibs_FC=no
 +	cat <<_LT_EOF 1>&2
 +
@@ -58216,7 +61727,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds_FC=''
 +        ;;
 +      m68k)
@@ -58232,7 +61743,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	allow_undefined_flag_FC=unsupported
 +	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      else
 +	ld_shlibs_FC=no
 +      fi
@@ -58242,7 +61753,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      hardcode_libdir_flag_spec_FC='-L$libdir'
-+      export_dynamic_flag_spec_FC='${wl}--export-all-symbols'
++      export_dynamic_flag_spec_FC='$wl--export-all-symbols'
 +      allow_undefined_flag_FC=unsupported
 +      always_export_symbols_FC=no
 +      enable_shared_with_static_runtimes_FC=yes
@@ -58250,61 +61761,89 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      exclude_expsyms_FC='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 +
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file, use it as
++	# is; otherwise, prepend EXPORTS...
++	archive_expsym_cmds_FC='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++          cp $export_symbols $output_objdir/$soname.def;
++        else
++          echo EXPORTS > $output_objdir/$soname.def;
++          cat $export_symbols >> $output_objdir/$soname.def;
++        fi~
++        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	ld_shlibs_FC=no
 +      fi
 +      ;;
 +
 +    haiku*)
-+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      link_all_deplibs_FC=yes
 +      ;;
 +
++    os2*)
++      hardcode_libdir_flag_spec_FC='-L$libdir'
++      hardcode_minus_L_FC=yes
++      allow_undefined_flag_FC=unsupported
++      shrext_cmds=.dll
++      archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes_FC=yes
++      ;;
++
 +    interix[3-9]*)
 +      hardcode_direct_FC=no
 +      hardcode_shlibpath_var_FC=no
-+      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec_FC='${wl}-E'
++      hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
++      export_dynamic_flag_spec_FC='$wl-E'
 +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +      # Instead, shared libraries are loaded at an image base (0x10000000 by
 +      # default) and relocated if they conflict, which is a slow very memory
 +      # consuming and fragmenting process.  To avoid this, we pick a random,
 +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_FC='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
++      if test linux-dietlibc = "$host_os"; then
 +	case $cc_basename in
 +	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 +	esac
 +      fi
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
++	 && test no = "$tmp_diet"
 +      then
 +	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 +					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
@@ -58315,42 +61854,47 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	lf95*)				# Lahey Fortran 8.1
 +	  whole_archive_flag_spec_FC=
 +	  tmp_sharedflag='--shared' ;;
++        nagfor*)                        # NAGFOR 5.3
++          tmp_sharedflag='-Wl,-shared' ;;
 +	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
 +	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object_FC=yes
 +	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  whole_archive_flag_spec_FC='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  compiler_needs_object_FC=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
 +	  tmp_sharedflag='-G' ;;
 +	esac
-+	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +
-+        if test "x$supports_anon_versioning" = xyes; then
++        if test yes = "$supports_anon_versioning"; then
 +          archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++            echo "local: *; };" >> $output_objdir/$libname.ver~
++            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +        fi
 +
 +	case $cc_basename in
++	tcc*)
++	  export_dynamic_flag_spec_FC='-rdynamic'
++	  ;;
 +	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
 +	  archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
++	  if test yes = "$supports_anon_versioning"; then
 +	    archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++              echo "local: *; };" >> $output_objdir/$libname.ver~
++              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
@@ -58359,13 +61903,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      fi
 +      ;;
 +
-+    netbsd*)
++    netbsd* | netbsdelf*-gnu)
 +      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'
++	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
 +      ;;
 +
@@ -58383,8 +61927,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	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'
++	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'
 +      else
 +	ld_shlibs_FC=no
 +      fi
@@ -58396,7 +61940,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	ld_shlibs_FC=no
 +	cat <<_LT_EOF 1>&2
 +
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -58411,9 +61955,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  # DT_RUNPATH tag from executables and libraries.  But doing so
 +	  # requires that you compile everything twice, which is a pain.
 +	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-+	    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 $wl$libdir'
++	    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'
 +	  else
 +	    ld_shlibs_FC=no
 +	  fi
@@ -58430,15 +61974,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	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'
++	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'
 +      else
 +	ld_shlibs_FC=no
 +      fi
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs_FC" = no; then
++    if test no = "$ld_shlibs_FC"; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec_FC=
 +      export_dynamic_flag_spec_FC=
@@ -58454,7 +61998,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      # Note: this linker hardcodes the directories in LIBPATH if there
 +      # are no directories specified by -L.
 +      hardcode_minus_L_FC=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 +	# Neither direct hardcoding nor static linking is supported with a
 +	# broken collect2.
 +	hardcode_direct_FC=unsupported
@@ -58462,34 +62006,57 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
++	no_entry_flag=
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
++	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
++	# Without the "-l" option, or with the "-B" option, AIX nm treats
++	# weak defined symbols like other global defined symbols, whereas
++	# GNU nm marks them as "W".
++	# While the 'weak' keyword is ignored in the Export File, we need
++	# it in the Import File for the 'aix-soname' feature, so we have
++	# to replace the "-B" option with "-P" for AIX nm.
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +	else
-+	  export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  export_symbols_cmds_FC='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
++	# have runtime linking enabled, and use it for executables.
++	# For shared libraries, we enable/disable runtime linking
++	# depending on the kind of the shared library created -
++	# when "with_aix_soname,aix_use_runtimelinking" is:
++	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "aix,yes"  lib.so          shared, rtl:yes, for executables
++	#            lib.a           static archive
++	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
++	#            lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a(lib.so.V) shared, rtl:no
++	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a           static archive
 +	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 +	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 +	    aix_use_runtimelinking=yes
 +	    break
 +	  fi
 +	  done
++	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	    # so we don't have lib.a shared libs to link our executables.
++	    # We have to force runtime linking in this case.
++	    aix_use_runtimelinking=yes
++	    LDFLAGS="$LDFLAGS -Wl,-brtl"
++	  fi
 +	  ;;
 +	esac
 +
@@ -58508,13 +62075,21 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_direct_absolute_FC=yes
 +      hardcode_libdir_separator_FC=':'
 +      link_all_deplibs_FC=yes
-+      file_list_spec_FC='${wl}-f,'
++      file_list_spec_FC='$wl-f,'
++      case $with_aix_soname,$aix_use_runtimelinking in
++      aix,*) ;; # traditional, no import file
++      svr4,* | *,yes) # use import file
++	# The Import File defines what to hardcode.
++	hardcode_direct_FC=no
++	hardcode_direct_absolute_FC=no
++	;;
++      esac
 +
-+      if test "$GCC" = yes; then
++      if test yes = "$GCC"; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -58533,35 +62108,42 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	  ;;
 +	esac
 +	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
++	if test yes = "$aix_use_runtimelinking"; then
++	  shared_flag="$shared_flag "'$wl-G'
 +	fi
++	# Need to ensure runtime linking is disabled for the traditional
++	# shared library, or the linker may eventually find shared libraries
++	# /with/ Import File - we do not want to mix them.
++	shared_flag_aix='-shared'
++	shared_flag_svr4='-shared $wl-G'
 +      else
 +	# not using gcc
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag='$wl-G'
 +	  else
-+	    shared_flag='${wl}-bM:SRE'
++	    shared_flag='$wl-bM:SRE'
 +	  fi
++	  shared_flag_aix='$wl-bM:SRE'
++	  shared_flag_svr4='$wl-G'
 +	fi
 +      fi
 +
-+      export_dynamic_flag_spec_FC='${wl}-bexpall'
++      export_dynamic_flag_spec_FC='$wl-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_FC=yes
-+      if test "$aix_use_runtimelinking" = yes; then
++      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +	# Warning - without using the other runtime loading flags (-brtl),
 +	# -berok will link without error, but may produce a broken library.
 +	allow_undefined_flag_FC='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
-+        if test "${lt_cv_aix_libpath+set}" = set; then
++        if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__FC+:} false; then :
@@ -58590,7 +62172,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__FC"; then
-+    lt_cv_aix_libpath__FC="/usr/lib:/lib"
++    lt_cv_aix_libpath__FC=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -58598,17 +62180,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__FC
 +fi
 +
-+        hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
++        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
++	if test ia64 = "$host_cpu"; then
++	  hardcode_libdir_flag_spec_FC='$wl-R $libdir:/usr/lib:/lib'
 +	  allow_undefined_flag_FC="-z nodefs"
-+	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
-+	 if test "${lt_cv_aix_libpath+set}" = set; then
++	 if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  if ${lt_cv_aix_libpath__FC+:} false; then :
@@ -58637,7 +62219,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  if test -z "$lt_cv_aix_libpath__FC"; then
-+    lt_cv_aix_libpath__FC="/usr/lib:/lib"
++    lt_cv_aix_libpath__FC=/usr/lib:/lib
 +  fi
 +
 +fi
@@ -58645,21 +62227,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  aix_libpath=$lt_cv_aix_libpath__FC
 +fi
 +
-+	 hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
++	 hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag_FC=' ${wl}-bernotok'
-+	  allow_undefined_flag_FC=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
++	  no_undefined_flag_FC=' $wl-bernotok'
++	  allow_undefined_flag_FC=' $wl-berok'
++	  if test yes = "$with_gnu_ld"; then
 +	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec_FC='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    whole_archive_flag_spec_FC='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	  else
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    whole_archive_flag_spec_FC='$convenience'
 +	  fi
 +	  archive_cmds_need_lc_FC=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  archive_expsym_cmds_FC='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	  # -brtl affects multiple linker settings, -berok does not and is overridden later
++	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
++	  if test svr4 != "$with_aix_soname"; then
++	    # This is similar to how AIX traditionally builds its shared libraries.
++	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	  fi
++	  if test aix != "$with_aix_soname"; then
++	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	  else
++	    # used by -dlpreopen to get the symbols
++	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	  fi
++	  archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$RM -r $output_objdir/$realname.d'
 +	fi
 +      fi
 +      ;;
@@ -58668,7 +62262,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            archive_expsym_cmds_FC=''
 +        ;;
 +      m68k)
@@ -58698,16 +62292,17 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
-+	archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
++	archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	archive_expsym_cmds_FC='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
++            cp "$export_symbols" "$output_objdir/$soname.def";
++            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++          else
++            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++          fi~
++          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++          linknames='
 +	# The linker will not automatically build a static lib if we build a DLL.
 +	# _LT_TAGVAR(old_archive_from_new_cmds, FC)='true'
 +	enable_shared_with_static_runtimes_FC=yes
@@ -58716,18 +62311,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Don't use ranlib
 +	old_postinstall_cmds_FC='chmod 644 $oldlib'
 +	postlink_cmds_FC='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
++          lt_tool_outputfile="@TOOL_OUTPUT@"~
++          case $lt_outputfile in
++            *.exe|*.EXE) ;;
++            *)
++              lt_outputfile=$lt_outputfile.exe
++              lt_tool_outputfile=$lt_tool_outputfile.exe
++              ;;
++          esac~
++          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++            $RM "$lt_outputfile.manifest";
++          fi'
 +	;;
 +      *)
 +	# Assume MSVC wrapper
@@ -58736,7 +62331,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
 +	archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +	# The linker will automatically build a .lib file if we build a DLL.
@@ -58755,24 +62350,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  hardcode_direct_FC=no
 +  hardcode_automatic_FC=yes
 +  hardcode_shlibpath_var_FC=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +    compiler_needs_object_FC=yes
 +  else
 +    whole_archive_flag_spec_FC=''
 +  fi
 +  link_all_deplibs_FC=yes
-+  allow_undefined_flag_FC="$_lt_dar_allow_undefined"
++  allow_undefined_flag_FC=$_lt_dar_allow_undefined
 +  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-+    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    archive_expsym_cmds_FC="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    module_expsym_cmds_FC="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 +
 +  else
 +  ld_shlibs_FC=no
@@ -58814,33 +62409,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      if test yes = "$GCC"; then
++	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      else
-+	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      fi
-+      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
++      hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
 +      hardcode_libdir_separator_FC=:
 +      hardcode_direct_FC=yes
 +
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      hardcode_minus_L_FC=yes
-+      export_dynamic_flag_spec_FC='${wl}-E'
++      export_dynamic_flag_spec_FC='$wl-E'
 +      ;;
 +
 +    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes,no = "$GCC,$with_gnu_ld"; then
++	archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
 +	hardcode_libdir_separator_FC=:
 +	hardcode_direct_FC=yes
 +	hardcode_direct_absolute_FC=yes
-+	export_dynamic_flag_spec_FC='${wl}-E'
++	export_dynamic_flag_spec_FC='$wl-E'
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L_FC=yes
@@ -58848,33 +62443,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++      if test yes,no = "$GCC,$with_gnu_ld"; then
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_FC='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
 +	case $host_cpu in
 +	hppa*64*)
-+	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_FC='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
 +	hardcode_libdir_separator_FC=:
 +
 +	case $host_cpu in
@@ -58885,7 +62480,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	*)
 +	  hardcode_direct_FC=yes
 +	  hardcode_direct_absolute_FC=yes
-+	  export_dynamic_flag_spec_FC='${wl}-E'
++	  export_dynamic_flag_spec_FC='$wl-E'
 +
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
@@ -58896,8 +62491,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
@@ -58907,8 +62502,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +if ${lt_cv_irix_exported_symbol+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++  save_LDFLAGS=$LDFLAGS
++	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 +	   cat > conftest.$ac_ext <<_ACEOF
 +
 +      subroutine foo
@@ -58921,25 +62516,36 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+           LDFLAGS="$save_LDFLAGS"
++           LDFLAGS=$save_LDFLAGS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++	if test yes = "$lt_cv_irix_exported_symbol"; then
++          archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 +	fi
++	link_all_deplibs_FC=no
 +      else
-+	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      archive_cmds_need_lc_FC='no'
-+      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_FC=:
 +      inherit_rpath_FC=yes
 +      link_all_deplibs_FC=yes
 +      ;;
 +
-+    netbsd*)
++    linux*)
++      case $cc_basename in
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	ld_shlibs_FC=yes
++	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      esac
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +      else
@@ -58953,7 +62559,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    newsos6)
 +      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_direct_FC=yes
-+      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_FC=:
 +      hardcode_shlibpath_var_FC=no
 +      ;;
@@ -58961,27 +62567,19 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    *nto* | *qnx*)
 +      ;;
 +
-+    openbsd*)
++    openbsd* | bitrig*)
 +      if test -f /usr/libexec/ld.so; then
 +	hardcode_direct_FC=yes
 +	hardcode_shlibpath_var_FC=no
 +	hardcode_direct_absolute_FC=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec_FC='${wl}-E'
++	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
++	  export_dynamic_flag_spec_FC='$wl-E'
 +	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec_FC='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
++	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
 +	fi
 +      else
 +	ld_shlibs_FC=no
@@ -58992,33 +62590,53 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      hardcode_libdir_flag_spec_FC='-L$libdir'
 +      hardcode_minus_L_FC=yes
 +      allow_undefined_flag_FC=unsupported
-+      archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      shrext_cmds=.dll
++      archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      enable_shared_with_static_runtimes_FC=yes
 +      ;;
 +
 +    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
++	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +      else
 +	allow_undefined_flag_FC=' -expect_unresolved \*'
-+	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +      fi
 +      archive_cmds_need_lc_FC='no'
-+      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
 +      hardcode_libdir_separator_FC=:
 +      ;;
 +
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds_FC='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++      if test yes = "$GCC"; then
++	allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
++	archive_cmds_FC='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++	hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
 +      else
 +	allow_undefined_flag_FC=' -expect_unresolved \*'
-+	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec_FC='-rpath $libdir'
@@ -59029,24 +62647,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +    solaris*)
 +      no_undefined_flag_FC=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds_FC='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	wlarc='$wl'
++	archive_cmds_FC='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
 +	  wlarc=''
-+	  archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds_FC='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 +	  ;;
 +	*)
-+	  wlarc='${wl}'
-+	  archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  wlarc='$wl'
++	  archive_cmds_FC='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	  ;;
 +	esac
 +      fi
@@ -59056,11 +62674,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
 +	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 +	# but is careful enough not to reorder.
 +	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	if test yes = "$GCC"; then
++	  whole_archive_flag_spec_FC='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +	else
 +	  whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
 +	fi
@@ -59070,10 +62688,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
++      if test sequent = "$host_vendor"; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
 +	# files that make .init and .fini sections work.
-+	archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_FC='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 +      fi
@@ -59122,43 +62740,43 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag_FC='${wl}-z,text'
++      no_undefined_flag_FC='$wl-z,text'
 +      archive_cmds_need_lc_FC=no
 +      hardcode_shlibpath_var_FC=no
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
++      # Note: We CANNOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
 +      # always be unresolved, which means just about no library would
 +      # ever link correctly.  If we're not using GNU ld we use -z text
 +      # though, which does catch some bad symbols but isn't as heavy-handed
 +      # as -z defs.
-+      no_undefined_flag_FC='${wl}-z,text'
-+      allow_undefined_flag_FC='${wl}-z,nodefs'
++      no_undefined_flag_FC='$wl-z,text'
++      allow_undefined_flag_FC='$wl-z,nodefs'
 +      archive_cmds_need_lc_FC=no
 +      hardcode_shlibpath_var_FC=no
-+      hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
++      hardcode_libdir_flag_spec_FC='$wl-R,$libdir'
 +      hardcode_libdir_separator_FC=':'
 +      link_all_deplibs_FC=yes
-+      export_dynamic_flag_spec_FC='${wl}-Bexport'
++      export_dynamic_flag_spec_FC='$wl-Bexport'
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
@@ -59173,10 +62791,10 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      ;;
 +    esac
 +
-+    if test x$host_vendor = xsni; then
++    if test sni = "$host_vendor"; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
++	export_dynamic_flag_spec_FC='$wl-Blargedynsym'
 +	;;
 +      esac
 +    fi
@@ -59184,7 +62802,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5
 +$as_echo "$ld_shlibs_FC" >&6; }
-+test "$ld_shlibs_FC" = no && can_build_shared=no
++test no = "$ld_shlibs_FC" && can_build_shared=no
 +
 +with_gnu_ld_FC=$with_gnu_ld
 +
@@ -59201,7 +62819,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Assume -lc should be added
 +  archive_cmds_need_lc_FC=yes
 +
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $archive_cmds_FC in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
@@ -59329,7 +62947,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
-+shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
@@ -59346,14 +62964,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# flags to be left without arguments
 +need_version=unknown
 +
++
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[4-9]*)
@@ -59361,41 +62981,91 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[01] | aix4.[01].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a(lib.so.V)'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
@@ -59405,18 +63075,18 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-+  library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
@@ -59424,8 +63094,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +bsdi[45]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -59437,7 +63107,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-+  shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
@@ -59446,8 +63116,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
@@ -59463,16 +63133,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
@@ -59481,8 +63151,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
@@ -59509,7 +63179,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-+      sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -59522,8 +63192,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
@@ -59536,7 +63206,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +  *)
 +    # Assume MSVC wrapper
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
@@ -59549,8 +63219,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -59562,8 +63232,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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
 +  ;;
 +
@@ -59581,12 +63251,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      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
 +      ;;
 +    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
@@ -59611,26 +63282,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  ;;
 +
-+gnu*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  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'
-+  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
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
@@ -59648,14 +63308,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
@@ -59663,8 +63324,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
@@ -59673,8 +63334,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -59687,8 +63348,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -59699,7 +63360,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
++	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
@@ -59707,8 +63368,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
@@ -59727,8 +63388,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
@@ -59737,13 +63398,33 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  hardcode_libdir_flag_spec_FC='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -59781,14 +63462,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-+  # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -59800,17 +63482,29 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
++netbsdelf*-gnu)
++  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'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    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'
++    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
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -59820,7 +63514,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
@@ -59829,58 +63523,68 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=qnx
 +  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'
++  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
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
-+openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-+    shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-+  shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
@@ -59891,8 +63595,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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=yes
 +  hardcode_into_libs=yes
@@ -59902,11 +63606,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sunos4*)
 +  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
@@ -59914,8 +63618,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  case $host_vendor in
 +    sni)
@@ -59936,24 +63640,24 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ;;
 +
 +sysv4*MP*)
-+  if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -59971,7 +63675,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -59979,8 +63683,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  ;;
 +
@@ -59990,20 +63694,32 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +esac
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 +$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
++
++
 +
 +
 +
@@ -60046,15 +63762,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +hardcode_action_FC=
 +if test -n "$hardcode_libdir_flag_spec_FC" ||
 +   test -n "$runpath_var_FC" ||
-+   test "X$hardcode_automatic_FC" = "Xyes" ; then
++   test yes = "$hardcode_automatic_FC"; then
 +
 +  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct_FC" != no &&
++  if test no != "$hardcode_direct_FC" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
-+     test "$hardcode_minus_L_FC" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" &&
++     test no != "$hardcode_minus_L_FC"; then
 +    # Linking always hardcodes the temporary library directory.
 +    hardcode_action_FC=relink
 +  else
@@ -60069,12 +63785,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5
 +$as_echo "$hardcode_action_FC" >&6; }
 +
-+if test "$hardcode_action_FC" = relink ||
-+   test "$inherit_rpath_FC" = yes; then
++if test relink = "$hardcode_action_FC" ||
++   test yes = "$inherit_rpath_FC"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
@@ -60090,7 +63806,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  GCC=$lt_save_GCC
 +  CC=$lt_save_CC
 +  CFLAGS=$lt_save_CFLAGS
-+fi # test "$_lt_disable_FC" != yes
++fi # test yes != "$_lt_disable_FC"
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
@@ -60168,15 +63884,15 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +fi
 +
-+# Check whether --enable-icb-exmm was given.
-+if test "${enable_icb_exmm+set}" = set; then :
-+  enableval=$enable_icb_exmm; enable_icb=$enableval
++# Check whether --enable-eigen was given.
++if test "${enable_eigen+set}" = set; then :
++  enableval=$enable_eigen; enable_icb=$enableval
 +else
-+  enable_icb_exmm=no
++  enable_eigen=no
 +fi
 +
 +
-+if test x"$enable_icb_exmm" != x"no"; then
++if test x"$enable_eigen" != x"no"; then
 +
 +pkg_failed=no
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EIGEN3" >&5
@@ -63319,12 +67035,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  ICB_FALSE=
 +fi
 +
-+ if test x"$enable_icb_exmm" != x"no"; then
-+  ICBEXMM_TRUE=
-+  ICBEXMM_FALSE='#'
++ if test x"$enable_eigen" != x"no"; then
++  EIGEN_TRUE=
++  EIGEN_FALSE='#'
 +else
-+  ICBEXMM_TRUE='#'
-+  ICBEXMM_FALSE=
++  EIGEN_TRUE='#'
++  EIGEN_FALSE=
 +fi
 +
 +
@@ -63348,7 +67064,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +PARPACK_PC_LIBS_PRIVATE="$LAPACK_LIBS $BLAS_LIBS $MPI_Fortran_LIBS"
 +
 +
-+ac_config_files="$ac_config_files arpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpack.pc.in parpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/parpack.pc.in arpackSolver$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpackSolver.pc.in"
++ac_config_files="$ac_config_files arpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpack.pc.in parpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/parpack.pc.in"
 +
 +
 +ac_config_files="$ac_config_files tstAutotoolsInstall.sh:pkg-config/tstAutotoolsInstall.sh.in"
@@ -63356,7 +67072,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +ac_config_files="$ac_config_files arpackdef.h arpackicb.h Makefile ICB/Makefile UTIL/Makefile SRC/Makefile TESTS/Makefile EXAMPLES/Makefile EXAMPLES/BAND/Makefile EXAMPLES/COMPLEX/Makefile EXAMPLES/NONSYM/Makefile EXAMPLES/SIMPLE/Makefile EXAMPLES/SVD/Makefile EXAMPLES/SYM/Makefile EXAMPLES/MATRIX_MARKET/Makefile PARPACK/Makefile PARPACK/SRC/MPI/Makefile PARPACK/SRC/BLACS/Makefile PARPACK/UTIL/MPI/Makefile PARPACK/UTIL/BLACS/Makefile PARPACK/TESTS/MPI/Makefile PARPACK/EXAMPLES/MPI/Makefile PARPACK/EXAMPLES/BLACS/Makefile"
 +
-+ac_config_links="$ac_config_links TESTS/testA.mtx:TESTS/testA.mtx EXAMPLES/MATRIX_MARKET/An.mtx:EXAMPLES/MATRIX_MARKET/An.mtx EXAMPLES/MATRIX_MARKET/As.mtx:EXAMPLES/MATRIX_MARKET/As.mtx EXAMPLES/MATRIX_MARKET/Az.mtx:EXAMPLES/MATRIX_MARKET/Az.mtx EXAMPLES/MATRIX_MARKET/B.mtx:EXAMPLES/MATRIX_MARKET/B.mtx EXAMPLES/MATRIX_MARKET/Bz.mtx:EXAMPLES/MATRIX_MARKET/Bz.mtx"
++ac_config_links="$ac_config_links TESTS/testA.mtx:TESTS/testA.mtx EXAMPLES/MATRIX_MARKET/An.mtx:EXAMPLES/MATRIX_MARKET/An.mtx EXAMPLES/MATRIX_MARKET/As.mtx:EXAMPLES/MATRIX_MARKET/As.mtx EXAMPLES/MATRIX_MARKET/Az.mtx:EXAMPLES/MATRIX_MARKET/Az.mtx EXAMPLES/MATRIX_MARKET/B.mtx:EXAMPLES/MATRIX_MARKET/B.mtx EXAMPLES/MATRIX_MARKET/Bz.mtx:EXAMPLES/MATRIX_MARKET/Bz.mtx EXAMPLES/MATRIX_MARKET/issue215.mtx:EXAMPLES/MATRIX_MARKET/issue215.mtx EXAMPLES/MATRIX_MARKET/issue401.mtx:EXAMPLES/MATRIX_MARKET/issue401.mtx"
 +
 +cat >confcache <<\_ACEOF
 +# This file is a shell script that caches the results of configure
@@ -63547,8 +67263,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  as_fn_error $? "conditional \"ICB\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
 +fi
-+if test -z "${ICBEXMM_TRUE}" && test -z "${ICBEXMM_FALSE}"; then
-+  as_fn_error $? "conditional \"ICBEXMM\" was never defined.
++if test -z "${EIGEN_TRUE}" && test -z "${EIGEN_FALSE}"; then
++  as_fn_error $? "conditional \"EIGEN\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
 +fi
 +
@@ -63948,7 +67664,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# report actual input values of CONFIG_FILES etc. instead of their
 +# values after options handling.
 +ac_log="
-+This file was extended by ARPACK-NG $as_me 3.9.0, which was
++This file was extended by ARPACK-NG $as_me 3.9.1, which was
 +generated by GNU Autoconf 2.69.  Invocation command line was
 +
 +  CONFIG_FILES    = $CONFIG_FILES
@@ -64010,7 +67726,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 +ac_cs_version="\\
-+ARPACK-NG config.status 3.9.0
++ARPACK-NG config.status 3.9.1
 +configured by $0, generated by GNU Autoconf 2.69,
 +  with options \\"\$ac_cs_config\\"
 +
@@ -64118,7 +67834,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +#
 +# INIT-COMMANDS
 +#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
++AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 +
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -64137,6 +67853,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
++shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -64184,10 +67901,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
++lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
++lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -64252,7 +67972,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
++configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
++configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -64454,9 +68175,12 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +compiler \
 +lt_cv_sys_global_symbol_pipe \
 +lt_cv_sys_global_symbol_to_cdecl \
++lt_cv_sys_global_symbol_to_import \
 +lt_cv_sys_global_symbol_to_c_name_address \
 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
++lt_cv_nm_interface \
 +nm_file_list_spec \
++lt_cv_truncate_bin \
 +lt_prog_compiler_no_builtin_flag \
 +lt_prog_compiler_pic \
 +lt_prog_compiler_wl \
@@ -64572,7 +68296,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +compiler_lib_search_path_FC; do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -64599,7 +68323,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +postuninstall_cmds \
 +finish_cmds \
 +sys_lib_search_path_spec \
-+sys_lib_dlsearch_path_spec \
++configure_time_dlsearch_path \
++configure_time_lt_sys_library_path \
 +reload_cmds_CXX \
 +reload_cmds_F77 \
 +reload_cmds_FC \
@@ -64635,7 +68360,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +postlink_cmds_FC; do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -64644,19 +68369,16 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +done
 +
 +ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
 +
-+# See if we are running on zsh, and set the options which allow our
++# See if we are running on zsh, and set the options that allow our
 +# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
++if test -n "\${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +
 +
 +    PACKAGE='$PACKAGE'
 +    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
 +    RM='$RM'
 +    ofile='$ofile'
 +
@@ -64683,7 +68405,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
 +    "arpack$LIBSUFFIX$ITF64SUFFIX.pc") CONFIG_FILES="$CONFIG_FILES arpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpack.pc.in" ;;
 +    "parpack$LIBSUFFIX$ITF64SUFFIX.pc") CONFIG_FILES="$CONFIG_FILES parpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/parpack.pc.in" ;;
-+    "arpackSolver$LIBSUFFIX$ITF64SUFFIX.pc") CONFIG_FILES="$CONFIG_FILES arpackSolver$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpackSolver.pc.in" ;;
 +    "tstAutotoolsInstall.sh") CONFIG_FILES="$CONFIG_FILES tstAutotoolsInstall.sh:pkg-config/tstAutotoolsInstall.sh.in" ;;
 +    "arpackdef.h") CONFIG_FILES="$CONFIG_FILES arpackdef.h" ;;
 +    "arpackicb.h") CONFIG_FILES="$CONFIG_FILES arpackicb.h" ;;
@@ -64714,6 +68435,8 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +    "EXAMPLES/MATRIX_MARKET/Az.mtx") CONFIG_LINKS="$CONFIG_LINKS EXAMPLES/MATRIX_MARKET/Az.mtx:EXAMPLES/MATRIX_MARKET/Az.mtx" ;;
 +    "EXAMPLES/MATRIX_MARKET/B.mtx") CONFIG_LINKS="$CONFIG_LINKS EXAMPLES/MATRIX_MARKET/B.mtx:EXAMPLES/MATRIX_MARKET/B.mtx" ;;
 +    "EXAMPLES/MATRIX_MARKET/Bz.mtx") CONFIG_LINKS="$CONFIG_LINKS EXAMPLES/MATRIX_MARKET/Bz.mtx:EXAMPLES/MATRIX_MARKET/Bz.mtx" ;;
++    "EXAMPLES/MATRIX_MARKET/issue215.mtx") CONFIG_LINKS="$CONFIG_LINKS EXAMPLES/MATRIX_MARKET/issue215.mtx:EXAMPLES/MATRIX_MARKET/issue215.mtx" ;;
++    "EXAMPLES/MATRIX_MARKET/issue401.mtx") CONFIG_LINKS="$CONFIG_LINKS EXAMPLES/MATRIX_MARKET/issue401.mtx:EXAMPLES/MATRIX_MARKET/issue401.mtx" ;;
 +
 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 +  esac
@@ -65179,29 +68902,35 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  # Older Autoconf quotes --file arguments for eval, but not when files
 +  # are listed without --file.  Let's play safe and only enable the eval
 +  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
++  # TODO: see whether this extra hack can be removed once we start
++  # requiring Autoconf 2.70 or later.
++  case $CONFIG_FILES in #(
++  *\'*) :
++    eval set x "$CONFIG_FILES" ;; #(
++  *) :
++    set x $CONFIG_FILES ;; #(
++  *) :
++     ;;
++esac
 +  shift
-+  for mf
++  # Used to flag and report bootstrapping failures.
++  am_rc=0
++  for am_mf
 +  do
 +    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named 'Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
++    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
++    # Check whether this is an Automake generated Makefile which includes
++    # dependency-tracking related rules and includes.
++    # Grep'ing the whole file directly is not great: AIX grep has a line
 +    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
++    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
++      || continue
++    am_dirpart=`$as_dirname -- "$am_mf" ||
++$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$am_mf" : 'X\(//\)[^/]' \| \
++	 X"$am_mf" : 'X\(//\)$' \| \
++	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$am_mf" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -65219,106 +68948,98 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running 'make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "$am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
++    am_filepart=`$as_basename -- "$am_mf" ||
++$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$am_mf" : 'X\(//\)$' \| \
++	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$am_mf" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
 +	  }
-+	  /^X\(\/\/\)$/{
++	  /^X\/\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
-+	  /^X\(\/\).*/{
++	  /^X\/\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
++    { echo "$as_me:$LINENO: cd "$am_dirpart" \
++      && sed -e '/# am--include-marker/d' "$am_filepart" \
++        | $MAKE -f - am--depfiles" >&5
++   (cd "$am_dirpart" \
++      && sed -e '/# am--include-marker/d' "$am_filepart" \
++        | $MAKE -f - am--depfiles) >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } || am_rc=$?
 +  done
++  if test $am_rc -ne 0; then
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "Something went wrong bootstrapping makefile fragments
++    for automatic dependency tracking.  Try re-running configure with the
++    '--disable-dependency-tracking' option to at least be able to build
++    the package (albeit without support for automatic dependency tracking).
++See \`config.log' for more details" "$LINENO" 5; }
++  fi
++  { am_dirpart=; unset am_dirpart;}
++  { am_filepart=; unset am_filepart;}
++  { am_mf=; unset am_mf;}
++  { am_rc=; unset am_rc;}
++  rm -f conftest-deps.mk
 +}
 + ;;
 +    "libtool":C)
 +
-+    # See if we are running on zsh, and set the options which allow our
++    # See if we are running on zsh, and set the options that allow our
 +    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
++    if test -n "${ZSH_VERSION+set}"; then
 +      setopt NO_GLOB_SUBST
 +    fi
 +
-+    cfgfile="${ofile}T"
++    cfgfile=${ofile}T
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
 +
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Generated automatically by $as_me ($PACKAGE) $VERSION
 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++
++# Provide generalized library-building support services.
++# Written by Gordon Matzigkeit, 1996
++
++# Copyright (C) 2014 Free Software Foundation, Inc.
++# This is free software; see the source for copying conditions.  There is NO
++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++# GNU Libtool is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of of the License, or
++# (at your option) any later version.
 +#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program or library that is built
++# using GNU Libtool, you may include this file under the  same
++# distribution terms that you use for the rest of that program.
 +#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# GNU Libtool is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +
 +# The names of the tagged configurations supported by this script.
-+available_tags="CXX F77 FC "
++available_tags='CXX F77 FC '
++
++# Configured defaults for sys_lib_dlsearch_path munging.
++: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 +
 +# ### BEGIN LIBTOOL CONFIG
 +
@@ -65347,6 +69068,9 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Whether or not to optimize for fast installation.
 +fast_install=$enable_fast_install
 +
++# Shared archive member basename,for filename based shared library versioning on AIX.
++shared_archive_member_spec=$shared_archive_member_spec
++
 +# Shell to use when invoking shell scripts.
 +SHELL=$lt_SHELL
 +
@@ -65458,18 +69182,27 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Transform the output of nm in a proper C declaration.
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 +
++# Transform the output of nm into a list of symbols to manually relocate.
++global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
++
 +# Transform the output of nm in a C name address pair.
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 +
 +# Transform the output of nm in a C name address pair when lib prefix is needed.
 +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 +
++# The name lister interface.
++nm_interface=$lt_lt_cv_nm_interface
++
 +# Specify filename containing input files for \$NM.
 +nm_file_list_spec=$lt_nm_file_list_spec
 +
-+# The root where to search for dependent libraries,and in which our libraries should be installed.
++# The root where to search for dependent libraries,and where our libraries should be installed.
 +lt_sysroot=$lt_sysroot
 +
++# Command to truncate a binary pipe.
++lt_truncate_bin=$lt_lt_cv_truncate_bin
++
 +# The name of the directory that contains temporary libtool files.
 +objdir=$objdir
 +
@@ -65560,8 +69293,11 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Compile-time system search path for libraries.
 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 +
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# Detected run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
++
++# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
++configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 +
 +# Whether dlopen is supported.
 +dlopen_support=$enable_dlopen
@@ -65654,13 +69390,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Whether we need a single "-rpath" flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary.
 +hardcode_direct=$hardcode_direct
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 +# library is relocated.
 +hardcode_direct_absolute=$hardcode_direct_absolute
 +
@@ -65726,13 +69462,72 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +
 +_LT_EOF
 +
++    cat <<'_LT_EOF' >> "$cfgfile"
++
++# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
++
++# func_munge_path_list VARIABLE PATH
++# -----------------------------------
++# VARIABLE is name of variable containing _space_ separated list of
++# directories to be munged by the contents of PATH, which is string
++# having a format:
++# "DIR[:DIR]:"
++#       string "DIR[ DIR]" will be prepended to VARIABLE
++# ":DIR[:DIR]"
++#       string "DIR[ DIR]" will be appended to VARIABLE
++# "DIRP[:DIRP]::[DIRA:]DIRA"
++#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
++#       "DIRA[ DIRA]" will be appended to VARIABLE
++# "DIR[:DIR]"
++#       VARIABLE will be replaced by "DIR[ DIR]"
++func_munge_path_list ()
++{
++    case x$2 in
++    x)
++        ;;
++    *:)
++        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
++        ;;
++    x:*)
++        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
++        ;;
++    *::*)
++        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
++        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
++        ;;
++    *)
++        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
++        ;;
++    esac
++}
++
++
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++func_cc_basename ()
++{
++    for cc_temp in $*""; do
++      case $cc_temp in
++        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++        \-*) ;;
++        *) break;;
++      esac
++    done
++    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++}
++
++
++# ### END FUNCTIONS SHARED WITH CONFIGURE
++
++_LT_EOF
++
 +  case $host_os in
 +  aix3*)
 +    cat <<\_LT_EOF >> "$cfgfile"
 +# AIX sometimes has problems with the GCC collect2 program.  For some
 +# reason, if we set the COLLECT_NAMES environment variable, the problems
 +# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
++if test set != "${COLLECT_NAMES+set}"; then
 +  COLLECT_NAMES=
 +  export COLLECT_NAMES
 +fi
@@ -65741,7 +69536,7 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  esac
 +
 +
-+ltmain="$ac_aux_dir/ltmain.sh"
++ltmain=$ac_aux_dir/ltmain.sh
 +
 +
 +  # We use sed instead of cat because bash on DJGPP gets confused if
@@ -65751,165 +69546,6 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
 +
-+  if test x"$xsi_shell" = xyes; then
-+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-+func_dirname ()\
-+{\
-+\    case ${1} in\
-+\      */*) func_dirname_result="${1%/*}${2}" ;;\
-+\      *  ) func_dirname_result="${3}" ;;\
-+\    esac\
-+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-+func_basename ()\
-+{\
-+\    func_basename_result="${1##*/}"\
-+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-+func_dirname_and_basename ()\
-+{\
-+\    case ${1} in\
-+\      */*) func_dirname_result="${1%/*}${2}" ;;\
-+\      *  ) func_dirname_result="${3}" ;;\
-+\    esac\
-+\    func_basename_result="${1##*/}"\
-+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-+func_stripname ()\
-+{\
-+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-+\    # positional parameters, so assign one to ordinary parameter first.\
-+\    func_stripname_result=${3}\
-+\    func_stripname_result=${func_stripname_result#"${1}"}\
-+\    func_stripname_result=${func_stripname_result%"${2}"}\
-+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-+func_split_long_opt ()\
-+{\
-+\    func_split_long_opt_name=${1%%=*}\
-+\    func_split_long_opt_arg=${1#*=}\
-+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-+func_split_short_opt ()\
-+{\
-+\    func_split_short_opt_arg=${1#??}\
-+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-+func_lo2o ()\
-+{\
-+\    case ${1} in\
-+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-+\      *)    func_lo2o_result=${1} ;;\
-+\    esac\
-+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-+func_xform ()\
-+{\
-+    func_xform_result=${1%.*}.lo\
-+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-+func_arith ()\
-+{\
-+    func_arith_result=$(( $* ))\
-+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_len ()$/,/^} # func_len /c\
-+func_len ()\
-+{\
-+    func_len_result=${#1}\
-+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+fi
-+
-+if test x"$lt_shell_append" = xyes; then
-+  sed -e '/^func_append ()$/,/^} # func_append /c\
-+func_append ()\
-+{\
-+    eval "${1}+=\\${2}"\
-+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-+func_append_quoted ()\
-+{\
-+\    func_quote_for_eval "${2}"\
-+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  # Save a `func_append' function call where possible by direct use of '+='
-+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+  # Save a `func_append' function call even when '+=' is not available
-+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+fi
-+
-+if test x"$_lt_function_replace_fail" = x":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-+fi
-+
-+
 +   mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
@@ -65996,13 +69632,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Whether we need a single "-rpath" flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary.
 +hardcode_direct=$hardcode_direct_CXX
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 +# library is relocated.
 +hardcode_direct_absolute=$hardcode_direct_absolute_CXX
 +
@@ -66149,13 +69785,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Whether we need a single "-rpath" flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary.
 +hardcode_direct=$hardcode_direct_F77
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 +# library is relocated.
 +hardcode_direct_absolute=$hardcode_direct_absolute_F77
 +
@@ -66302,13 +69938,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +# Whether we need a single "-rpath" flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary.
 +hardcode_direct=$hardcode_direct_FC
 +
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 +# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 +# library is relocated.
 +hardcode_direct_absolute=$hardcode_direct_absolute_FC
 +
@@ -66471,15 +70107,13 @@ diff -ruN arpack-ng-3.9.0/configure arpack-ng-3.9.0-patch/configure
 +Configuration OK
 +--------------------------------------------------
 +" >&6; }
-diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
---- arpack-ng-3.9.0/m4/libtool.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/m4/libtool.m4	2023-02-12 10:13:26.844109483 +0000
-@@ -0,0 +1,7986 @@
+diff -ruN arpack-ng-3.9.1/m4/libtool.m4 arpack-ng-3.9.1-patch/m4/libtool.m4
+--- arpack-ng-3.9.1/m4/libtool.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/m4/libtool.m4	2023-11-11 16:51:16.226914938 +0900
+@@ -0,0 +1,8394 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
++#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 +#   Written by Gordon Matzigkeit, 1996
 +#
 +# This file is free software; the Free Software Foundation gives
@@ -66487,36 +70121,30 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# modifications, as long as this notice is preserved.
 +
 +m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
++# Copyright (C) 2014 Free Software Foundation, Inc.
++# This is free software; see the source for copying conditions.  There is NO
++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++# GNU Libtool is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of of the License, or
++# (at your option) any later version.
 +#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program or library that is built
++# using GNU Libtool, you may include this file under the  same
++# distribution terms that you use for the rest of that program.
 +#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# GNU Libtool is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +])
 +
-+# serial 57 LT_INIT
++# serial 58 LT_INIT
 +
 +
 +# LT_PREREQ(VERSION)
@@ -66544,7 +70172,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# LT_INIT([OPTIONS])
 +# ------------------
 +AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 +AC_BEFORE([$0], [LT_LANG])dnl
 +AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -66568,7 +70196,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_SET_OPTIONS([$0], [$1])
 +
 +# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
++LIBTOOL_DEPS=$ltmain
 +
 +# Always use our own libtool.
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -66588,26 +70216,43 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 +
 +
++# _LT_PREPARE_CC_BASENAME
++# -----------------------
++m4_defun([_LT_PREPARE_CC_BASENAME], [
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++func_cc_basename ()
++{
++    for cc_temp in @S|@*""; do
++      case $cc_temp in
++        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++        \-*) ;;
++        *) break;;
++      esac
++    done
++    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++}
++])# _LT_PREPARE_CC_BASENAME
++
++
 +# _LT_CC_BASENAME(CC)
 +# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
++# but that macro is also expanded into generated libtool script, which
++# arranges for $SED and $ECHO to be set by different means.
 +m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++[m4_require([_LT_PREPARE_CC_BASENAME])dnl
++AC_REQUIRE([_LT_DECL_SED])dnl
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
++func_cc_basename $1
++cc_basename=$func_cc_basename_result
 +])
 +
 +
 +# _LT_FILEUTILS_DEFAULTS
 +# ----------------------
 +# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 +m4_defun([_LT_FILEUTILS_DEFAULTS],
 +[: ${CP="cp -f"}
 +: ${MV="mv -f"}
@@ -66654,15 +70299,16 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 +m4_require([_LT_WITH_SYSROOT])dnl
++m4_require([_LT_CMD_TRUNCATE])dnl
 +
 +_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
++# See if we are running on zsh, and set the options that allow our
 +# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
++if test -n "\${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +])
-+if test -n "${ZSH_VERSION+set}" ; then
++if test -n "${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +
@@ -66675,7 +70321,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
 +  # reason, if we set the COLLECT_NAMES environment variable, the problems
 +  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
++  if test set != "${COLLECT_NAMES+set}"; then
 +    COLLECT_NAMES=
 +    export COLLECT_NAMES
 +  fi
@@ -66686,14 +70332,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +ofile=libtool
 +can_build_shared=yes
 +
-+# All known linkers require a `.a' archive for static linking (except MSVC,
++# All known linkers require a '.a' archive for static linking (except MSVC,
 +# which needs '.lib').
 +libext=a
 +
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++with_gnu_ld=$lt_cv_prog_gnu_ld
 +
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
++old_CC=$CC
++old_CFLAGS=$CFLAGS
 +
 +# Set sane defaults for various variables
 +test -z "$CC" && CC=cc
@@ -66746,14 +70392,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +# _LT_PROG_LTMAIN
 +# ---------------
-+# Note that this code is called both from `configure', and `config.status'
++# Note that this code is called both from 'configure', and 'config.status'
 +# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 +# so we pass a copy along to make sure it has a sensible value anyway.
 +m4_defun([_LT_PROG_LTMAIN],
 +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
 +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
++ltmain=$ac_aux_dir/ltmain.sh
 +])# _LT_PROG_LTMAIN
 +
 +
@@ -66763,7 +70409,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +# So that we can recreate a full libtool script including additional
 +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
++# in macros and then make a single call at the end using the 'libtool'
 +# label.
 +
 +
@@ -66898,8 +70544,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +# _LT_CONFIG_STATUS_DECLARE([VARNAME])
 +# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
++# Quote a variable value, and forward it to 'config.status' so that its
++# declaration there will have the same value as in 'configure'.  VARNAME
 +# must have a single quote delimited value for this to work.
 +m4_define([_LT_CONFIG_STATUS_DECLARE],
 +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -66923,7 +70569,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Output comment and list of tags supported by the script
 +m4_defun([_LT_LIBTOOL_TAGS],
 +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
++available_tags='_LT_TAGS'dnl
 +])
 +
 +
@@ -66951,7 +70597,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# _LT_LIBTOOL_CONFIG_VARS
 +# -----------------------
 +# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 +# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 +# section) are produced by _LT_LIBTOOL_TAG_VARS.
 +m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -66977,8 +70623,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 +# variables for single and double quote escaping we saved from calls
 +# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'.  Finally, any additional code accumulated
++# into 'config.status', and then the shell code to quote escape them in
++# for loops in 'config.status'.  Finally, any additional code accumulated
 +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 +m4_defun([_LT_CONFIG_COMMANDS],
 +[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -67024,7 +70670,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +]], lt_decl_quote_varnames); do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -67037,7 +70683,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +]], lt_decl_dquote_varnames); do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -67053,7 +70699,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Generate a child script FILE with all initialization necessary to
 +# reuse the environment learned by the parent script, and make the
 +# file executable.  If COMMENT is supplied, it is inserted after the
-+# `#!' sequence but before initialization text begins.  After this
++# '#!' sequence but before initialization text begins.  After this
 +# macro, additional text can be appended to FILE to form the body of
 +# the child script.  The macro ends with non-zero status if the
 +# file could not be fully written (such as if the disk is full).
@@ -67075,7 +70721,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_AS_PREPARE
 +exec AS_MESSAGE_FD>&1
 +_ASEOF
-+test $lt_write_fail = 0 && chmod +x $1[]dnl
++test 0 = "$lt_write_fail" && chmod +x $1[]dnl
 +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 +
 +# LT_OUTPUT
@@ -67098,7 +70744,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +} >&AS_MESSAGE_LOG_FD
 +
 +lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
++'$as_me' creates a local libtool stub from the current configuration,
 +for use in further configure time tests before the real libtool is
 +generated.
 +
@@ -67120,7 +70766,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +This config.lt script is free software; the Free Software Foundation
 +gives unlimited permision to copy, distribute and modify it."
 +
-+while test $[#] != 0
++while test 0 != $[#]
 +do
 +  case $[1] in
 +    --version | --v* | -V )
@@ -67133,10 +70779,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      lt_cl_silent=: ;;
 +
 +    -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
++Try '$[0] --help' for more information.]) ;;
 +
 +    *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
++Try '$[0] --help' for more information.]) ;;
 +  esac
 +  shift
 +done
@@ -67162,7 +70808,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# open by configure.  Here we exec the FD to /dev/null, effectively closing
 +# config.log, so it can be properly (re)opened and appended to by config.lt.
 +lt_cl_success=:
-+test "$silent" = yes &&
++test yes = "$silent" &&
 +  lt_config_lt_args="$lt_config_lt_args --quiet"
 +exec AS_MESSAGE_LOG_FD>/dev/null
 +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -67182,27 +70828,30 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_CONFIG_SAVE_COMMANDS([
 +  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
 +  m4_if(_LT_TAG, [C], [
-+    # See if we are running on zsh, and set the options which allow our
++    # See if we are running on zsh, and set the options that allow our
 +    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
++    if test -n "${ZSH_VERSION+set}"; then
 +      setopt NO_GLOB_SUBST
 +    fi
 +
-+    cfgfile="${ofile}T"
++    cfgfile=${ofile}T
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
 +
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Generated automatically by $as_me ($PACKAGE) $VERSION
 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
++
++# Provide generalized library-building support services.
++# Written by Gordon Matzigkeit, 1996
++
 +_LT_COPYING
 +_LT_LIBTOOL_TAGS
 +
++# Configured defaults for sys_lib_dlsearch_path munging.
++: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
++
 +# ### BEGIN LIBTOOL CONFIG
 +_LT_LIBTOOL_CONFIG_VARS
 +_LT_LIBTOOL_TAG_VARS
@@ -67210,13 +70859,24 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +_LT_EOF
 +
++    cat <<'_LT_EOF' >> "$cfgfile"
++
++# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
++
++_LT_PREPARE_MUNGE_PATH_LIST
++_LT_PREPARE_CC_BASENAME
++
++# ### END FUNCTIONS SHARED WITH CONFIGURE
++
++_LT_EOF
++
 +  case $host_os in
 +  aix3*)
 +    cat <<\_LT_EOF >> "$cfgfile"
 +# AIX sometimes has problems with the GCC collect2 program.  For some
 +# reason, if we set the COLLECT_NAMES environment variable, the problems
 +# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
++if test set != "${COLLECT_NAMES+set}"; then
 +  COLLECT_NAMES=
 +  export COLLECT_NAMES
 +fi
@@ -67233,8 +70893,6 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
 +
-+  _LT_PROG_REPLACE_SHELLFNS
-+
 +   mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
@@ -67252,7 +70910,6 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +[m4_if([$1], [], [
 +    PACKAGE='$PACKAGE'
 +    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
 +    RM='$RM'
 +    ofile='$ofile'], [])
 +])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -67451,7 +71108,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
 +      [lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
++      if test -z "$LT_MULTI_MODULE"; then
 +	# By default we will add the -single_module flag. You can override
 +	# by either setting the environment variable LT_MULTI_MODULE
 +	# non-empty at configure time, or by adding -multi_module to the
@@ -67469,7 +71126,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  cat conftest.err >&AS_MESSAGE_LOG_FD
 +	# Otherwise, if the output was created with a 0 exit code from
 +	# the compiler, it worked.
-+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
++	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 +	  lt_cv_apple_cc_single_mod=yes
 +	else
 +	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -67487,7 +71144,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 +	[lt_cv_ld_exported_symbols_list=yes],
 +	[lt_cv_ld_exported_symbols_list=no])
-+	LDFLAGS="$save_LDFLAGS"
++	LDFLAGS=$save_LDFLAGS
 +    ])
 +
 +    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -67497,8 +71154,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_EOF
 +      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
++      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
++      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
 +      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
 +      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
 +      cat > conftest.c << _LT_EOF
@@ -67509,7 +71166,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      _lt_result=$?
 +      if test -s conftest.err && $GREP force_load conftest.err; then
 +	cat conftest.err >&AS_MESSAGE_LOG_FD
-+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 +	lt_cv_ld_force_load=yes
 +      else
 +	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -67519,32 +71176,32 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ])
 +    case $host_os in
 +    rhapsody* | darwin1.[[012]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 +    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 +    darwin*) # darwin 5.x on
 +      # if running on 10.5 or later, the deployment target defaults
 +      # to the OS version, if on x86, and 10.4, the deployment
 +      # target defaults to 10.4. Don't you love it?
 +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 +	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[[012]]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++	10.[[012]][[,.]]*)
++	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 +	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 +      esac
 +    ;;
 +  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++    if test yes = "$lt_cv_apple_cc_single_mod"; then
 +      _lt_dar_single_mod='$single_module'
 +    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    if test yes = "$lt_cv_ld_exported_symbols_list"; then
++      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
 +    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
 +    fi
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
@@ -67564,29 +71221,29 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  _LT_TAGVAR(hardcode_direct, $1)=no
 +  _LT_TAGVAR(hardcode_automatic, $1)=yes
 +  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
 +                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
 +  else
 +    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
 +  fi
 +  _LT_TAGVAR(link_all_deplibs, $1)=yes
-+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
 +  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 +    m4_if([$1], [CXX],
-+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++[   if test yes != "$lt_cv_apple_cc_single_mod"; then
++      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
++      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
 +    fi
 +],[])
 +  else
@@ -67606,7 +71263,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Allow to override them for all tags through lt_cv_aix_libpath.
 +m4_defun([_LT_SYS_MODULE_PATH_AIX],
 +[m4_require([_LT_DECL_SED])dnl
-+if test "${lt_cv_aix_libpath+set}" = set; then
++if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -67624,7 +71281,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +  fi],[])
 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
 +  fi
 +  ])
 +  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -67644,8 +71301,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# -----------------------
 +# Find how we can fake an echo command that does not interpret backslash.
 +# In particular, with Autoconf 2.60 or later we add some code to the start
-+# of the generated configure script which will find a shell with a builtin
-+# printf (which we can use as an echo command).
++# of the generated configure script that will find a shell with a builtin
++# printf (that we can use as an echo command).
 +m4_defun([_LT_PROG_ECHO_BACKSLASH],
 +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -67673,10 +71330,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Invoke $ECHO with all args, space-separated.
 +func_echo_all ()
 +{
-+    $ECHO "$*" 
++    $ECHO "$*"
 +}
 +
-+case "$ECHO" in
++case $ECHO in
 +  printf*) AC_MSG_RESULT([printf]) ;;
 +  print*) AC_MSG_RESULT([print -r]) ;;
 +  *) AC_MSG_RESULT([cat]) ;;
@@ -67702,16 +71359,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +AC_DEFUN([_LT_WITH_SYSROOT],
 +[AC_MSG_CHECKING([for sysroot])
 +AC_ARG_WITH([sysroot],
-+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-+                        (or the compiler's sysroot if not specified).],
++[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
++  [Search for dependent libraries within DIR (or the compiler's sysroot
++   if not specified).])],
 +[], [with_sysroot=no])
 +
 +dnl lt_sysroot will always be passed unquoted.  We quote it here
 +dnl in case the user passed a directory name.
 +lt_sysroot=
-+case ${with_sysroot} in #(
++case $with_sysroot in #(
 + yes)
-+   if test "$GCC" = yes; then
++   if test yes = "$GCC"; then
 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 +   fi
 +   ;; #(
@@ -67721,14 +71379,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 + no|'')
 +   ;; #(
 + *)
-+   AC_MSG_RESULT([${with_sysroot}])
++   AC_MSG_RESULT([$with_sysroot])
 +   AC_MSG_ERROR([The sysroot must be an absolute path.])
 +   ;;
 +esac
 +
 + AC_MSG_RESULT([${lt_sysroot:-no}])
 +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-+[dependent libraries, and in which our libraries should be installed.])])
++[dependent libraries, and where our libraries should be installed.])])
 +
 +# _LT_ENABLE_LOCK
 +# ---------------
@@ -67736,31 +71394,33 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +[AC_ARG_ENABLE([libtool-lock],
 +  [AS_HELP_STRING([--disable-libtool-lock],
 +    [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 +
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
 +ia64-*-hpux*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set mode
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.$ac_objext` in
 +      *ELF-32*)
-+	HPUX_IA64_MODE="32"
++	HPUX_IA64_MODE=32
 +	;;
 +      *ELF-64*)
-+	HPUX_IA64_MODE="64"
++	HPUX_IA64_MODE=64
 +	;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
++    if test yes = "$lt_cv_prog_gnu_ld"; then
 +      case `/usr/bin/file conftest.$ac_objext` in
 +	*32-bit*)
 +	  LD="${LD-ld} -melf32bsmip"
@@ -67789,9 +71449,46 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  rm -rf conftest*
 +  ;;
 +
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++mips64*-*linux*)
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
++  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    emul=elf
++    case `/usr/bin/file conftest.$ac_objext` in
++      *32-bit*)
++	emul="${emul}32"
++	;;
++      *64-bit*)
++	emul="${emul}64"
++	;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *MSB*)
++	emul="${emul}btsmip"
++	;;
++      *LSB*)
++	emul="${emul}ltsmip"
++	;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *N32*)
++	emul="${emul}n32"
++	;;
++    esac
++    LD="${LD-ld} -m $emul"
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.  Note that the listed cases only cover the
++  # situations where additional linker options are needed (such as when
++  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
++  # vice versa); the common cases where no linker options are needed do
++  # not appear in the list.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.o` in
@@ -67801,9 +71498,19 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    LD="${LD-ld} -m elf_i386_fbsd"
 +	    ;;
 +	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
++	    case `/usr/bin/file conftest.o` in
++	      *x86-64*)
++		LD="${LD-ld} -m elf32_x86_64"
++		;;
++	      *)
++		LD="${LD-ld} -m elf_i386"
++		;;
++	    esac
 +	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
++	  powerpc64le-*linux*)
++	    LD="${LD-ld} -m elf32lppclinux"
++	    ;;
++	  powerpc64-*linux*)
 +	    LD="${LD-ld} -m elf32ppclinux"
 +	    ;;
 +	  s390x-*linux*)
@@ -67822,7 +71529,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  x86_64-*linux*)
 +	    LD="${LD-ld} -m elf_x86_64"
 +	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
++	  powerpcle-*linux*)
++	    LD="${LD-ld} -m elf64lppc"
++	    ;;
++	  powerpc-*linux*)
 +	    LD="${LD-ld} -m elf64ppc"
 +	    ;;
 +	  s390*-*linux*|s390*-*tpf*)
@@ -67840,19 +71550,20 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
++  SAVE_CFLAGS=$CFLAGS
 +  CFLAGS="$CFLAGS -belf"
 +  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
 +    [AC_LANG_PUSH(C)
 +     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
 +     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++  if test yes != "$lt_cv_cc_needs_belf"; then
 +    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
++    CFLAGS=$SAVE_CFLAGS
 +  fi
 +  ;;
 +*-*solaris*)
-+  # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.o` in
@@ -67860,7 +71571,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      case $lt_cv_prog_gnu_ld in
 +      yes*)
 +        case $host in
-+        i?86-*-solaris*)
++        i?86-*-solaris*|x86_64-*-solaris*)
 +          LD="${LD-ld} -m elf_x86_64"
 +          ;;
 +        sparc*-*-solaris*)
@@ -67869,7 +71580,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        esac
 +        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
 +        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+          LD="${LD-ld}_sol2"
++          LD=${LD-ld}_sol2
 +        fi
 +        ;;
 +      *)
@@ -67885,7 +71596,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ;;
 +esac
 +
-+need_locks="$enable_libtool_lock"
++need_locks=$enable_libtool_lock
 +])# _LT_ENABLE_LOCK
 +
 +
@@ -67894,7 +71605,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +m4_defun([_LT_PROG_AR],
 +[AC_CHECK_TOOLS(AR, [ar], false)
 +: ${AR=ar}
-+: ${AR_FLAGS=cru}
++: ${AR_FLAGS=cr}
 +_LT_DECL([], [AR], [1], [The archiver])
 +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 +
@@ -67904,11 +71615,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +     [echo conftest.$ac_objext > conftest.lst
 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
 +      AC_TRY_EVAL([lt_ar_try])
-+      if test "$ac_status" -eq 0; then
++      if test 0 -eq "$ac_status"; then
 +	# Ensure the archiver fails upon bogus file names.
 +	rm -f conftest.$ac_objext libconftest.a
 +	AC_TRY_EVAL([lt_ar_try])
-+	if test "$ac_status" -ne 0; then
++	if test 0 -ne "$ac_status"; then
 +          lt_cv_ar_at_file=@
 +        fi
 +      fi
@@ -67916,7 +71627,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +     ])
 +  ])
 +
-+if test "x$lt_cv_ar_at_file" = xno; then
++if test no = "$lt_cv_ar_at_file"; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
@@ -67947,7 +71658,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +if test -n "$RANLIB"; then
 +  case $host_os in
-+  openbsd*)
++  bitrig* | openbsd*)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 +    ;;
 +  *)
@@ -67983,7 +71694,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  [$2=no
 +   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
++   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
@@ -68010,7 +71721,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +   $RM conftest*
 +])
 +
-+if test x"[$]$2" = xyes; then
++if test yes = "[$]$2"; then
 +    m4_if([$5], , :, [$5])
 +else
 +    m4_if([$6], , :, [$6])
@@ -68032,7 +71743,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +m4_require([_LT_DECL_SED])dnl
 +AC_CACHE_CHECK([$1], [$2],
 +  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $3"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -68051,10 +71762,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +     fi
 +   fi
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +])
 +
-+if test x"[$]$2" = xyes; then
++if test yes = "[$]$2"; then
 +    m4_if([$4], , :, [$4])
 +else
 +    m4_if([$5], , :, [$5])
@@ -68075,7 +71786,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +AC_MSG_CHECKING([the maximum length of command line arguments])
 +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
 +  i=0
-+  teststring="ABCD"
++  teststring=ABCD
 +
 +  case $build_os in
 +  msdosdjgpp*)
@@ -68115,7 +71826,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  bitrig* | darwin* | dragonfly* | 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`
@@ -68165,22 +71876,23 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ;;
 +  *)
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
++    if test -n "$lt_cv_sys_max_cmd_len" && \
++       test undefined != "$lt_cv_sys_max_cmd_len"; then
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 +    else
 +      # Make teststring a little bigger before we do anything with it.
 +      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
++      for i in 1 2 3 4 5 6 7 8; do
 +        teststring=$teststring$teststring
 +      done
 +      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +      # If test is not a shell built-in, we'll probably end up computing a
 +      # maximum length that is only half of the actual maximum length, but
 +      # we can't tell.
-+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
++      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 +	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
++	      test 17 != "$i" # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
 +        teststring=$teststring$teststring
@@ -68196,7 +71908,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ;;
 +  esac
 +])
-+if test -n $lt_cv_sys_max_cmd_len ; then
++if test -n "$lt_cv_sys_max_cmd_len"; then
 +  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 +else
 +  AC_MSG_RESULT(none)
@@ -68224,7 +71936,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# ----------------------------------------------------------------
 +m4_defun([_LT_TRY_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
++if test yes = "$cross_compiling"; then :
 +  [$4]
 +else
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -68271,9 +71983,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +#  endif
 +#endif
 +
-+/* When -fvisbility=hidden is used, assume the code has been annotated
++/* When -fvisibility=hidden is used, assume the code has been annotated
 +   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 +int fnord () __attribute__((visibility("default")));
 +#endif
 +
@@ -68299,7 +72011,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  return status;
 +}]
 +_LT_EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
 +    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
@@ -68320,7 +72032,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# ------------------
 +AC_DEFUN([LT_SYS_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
++if test yes != "$enable_dlopen"; then
 +  enable_dlopen=unknown
 +  enable_dlopen_self=unknown
 +  enable_dlopen_self_static=unknown
@@ -68330,44 +72042,52 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +  case $host_os in
 +  beos*)
-+    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen=load_add_on
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +    ;;
 +
 +  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen=LoadLibrary
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  cygwin*)
-+    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen=dlopen
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  darwin*)
-+  # if libdl is installed we need to link against it
++    # if libdl is installed we need to link against it
 +    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
++		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
++    lt_cv_dlopen=dyld
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +    ])
 +    ;;
 +
++  tpf*)
++    # Don't try to run any link tests for TPF.  We know it's impossible
++    # because TPF is a cross-compiler, and we know how we open DSOs.
++    lt_cv_dlopen=dlopen
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=no
++    ;;
++
 +  *)
 +    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
++	  [lt_cv_dlopen=shl_load],
 +      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
 +	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
++	      [lt_cv_dlopen=dlopen],
 +	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
 +	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
 +	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
 +	      ])
 +	    ])
 +	  ])
@@ -68376,21 +72096,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ;;
 +  esac
 +
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
++  if test no = "$lt_cv_dlopen"; then
 +    enable_dlopen=no
++  else
++    enable_dlopen=yes
 +  fi
 +
 +  case $lt_cv_dlopen in
 +  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    save_CPPFLAGS=$CPPFLAGS
++    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +
-+    save_LDFLAGS="$LDFLAGS"
++    save_LDFLAGS=$LDFLAGS
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +
-+    save_LIBS="$LIBS"
++    save_LIBS=$LIBS
 +    LIBS="$lt_cv_dlopen_libs $LIBS"
 +
 +    AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -68400,7 +72120,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 +    ])
 +
-+    if test "x$lt_cv_dlopen_self" = xyes; then
++    if test yes = "$lt_cv_dlopen_self"; then
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 +      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 +	  lt_cv_dlopen_self_static, [dnl
@@ -68410,9 +72130,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ])
 +    fi
 +
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++    LIBS=$save_LIBS
 +    ;;
 +  esac
 +
@@ -68504,8 +72224,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +_LT_COMPILER_C_O([$1])
 +
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  AC_MSG_CHECKING([if we can lock with hard links])
 +  hard_links=yes
@@ -68515,8 +72235,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ln conftest.a conftest.b 2>&5 || hard_links=no
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++  if test no = "$hard_links"; then
++    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
 +    need_locks=warn
 +  fi
 +else
@@ -68543,8 +72263,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_DECL([], [objdir], [0],
 +         [The name of the directory that contains temporary libtool files])dnl
 +m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
++AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
++  [Define to the sub-directory where libtool stores uninstalled libraries.])
 +])# _LT_CHECK_OBJDIR
 +
 +
@@ -68556,15 +72276,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_TAGVAR(hardcode_action, $1)=
 +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
 +   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 +
 +  # We can hardcode non-existent directories.
-+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
++     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
 +    # Linking always hardcodes the temporary library directory.
 +    _LT_TAGVAR(hardcode_action, $1)=relink
 +  else
@@ -68578,12 +72298,12 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +fi
 +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 +
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
++if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
++   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
@@ -68607,7 +72327,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# FIXME - insert some real tests, host_os isn't really good enough
 +  case $host_os in
 +  darwin*)
-+    if test -n "$STRIP" ; then
++    if test -n "$STRIP"; then
 +      striplib="$STRIP -x"
 +      old_striplib="$STRIP -S"
 +      AC_MSG_RESULT([yes])
@@ -68625,6 +72345,47 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +])# _LT_CMD_STRIPLIB
 +
 +
++# _LT_PREPARE_MUNGE_PATH_LIST
++# ---------------------------
++# Make sure func_munge_path_list() is defined correctly.
++m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
++[[# func_munge_path_list VARIABLE PATH
++# -----------------------------------
++# VARIABLE is name of variable containing _space_ separated list of
++# directories to be munged by the contents of PATH, which is string
++# having a format:
++# "DIR[:DIR]:"
++#       string "DIR[ DIR]" will be prepended to VARIABLE
++# ":DIR[:DIR]"
++#       string "DIR[ DIR]" will be appended to VARIABLE
++# "DIRP[:DIRP]::[DIRA:]DIRA"
++#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
++#       "DIRA[ DIRA]" will be appended to VARIABLE
++# "DIR[:DIR]"
++#       VARIABLE will be replaced by "DIR[ DIR]"
++func_munge_path_list ()
++{
++    case x@S|@2 in
++    x)
++        ;;
++    *:)
++        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
++        ;;
++    x:*)
++        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
++        ;;
++    *::*)
++        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
++        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
++        ;;
++    *)
++        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
++        ;;
++    esac
++}
++]])# _LT_PREPARE_PATH_LIST
++
++
 +# _LT_SYS_DYNAMIC_LINKER([TAG])
 +# -----------------------------
 +# PORTME Fill in your ld.so characteristics
@@ -68635,17 +72396,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +m4_require([_LT_DECL_OBJDUMP])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 +AC_MSG_CHECKING([dynamic linker characteristics])
 +m4_if([$1],
 +	[], [
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
++    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
++    *) lt_awk_arg='/^libraries:/' ;;
 +  esac
 +  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
++    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
++    *) lt_sed_strip_eq='s|=/|/|g' ;;
 +  esac
 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 +  case $lt_search_path_spec in
@@ -68661,28 +72423,35 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ;;
 +  esac
 +  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
++  # and add multilib dir if necessary...
 +  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  # ...but if some path component already ends with the multilib dir we assume
++  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
++  case "$lt_multi_os_dir; $lt_search_path_spec " in
++  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
++    lt_multi_os_dir=
++    ;;
++  esac
 +  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
++    if test -d "$lt_sys_path$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
++    elif test -n "$lt_multi_os_dir"; then
 +      test -d "$lt_sys_path" && \
 +	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 +    fi
 +  done
 +  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
++BEGIN {RS = " "; FS = "/|\n";} {
++  lt_foo = "";
++  lt_count = 0;
 +  for (lt_i = NF; lt_i > 0; lt_i--) {
 +    if ($lt_i != "" && $lt_i != ".") {
 +      if ($lt_i == "..") {
 +        lt_count++;
 +      } else {
 +        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
++          lt_foo = "/" $lt_i lt_foo;
 +        } else {
 +          lt_count--;
 +        }
@@ -68696,7 +72465,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # for these hosts.
 +  case $host_os in
 +    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
++      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
 +  esac
 +  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 +else
@@ -68705,7 +72474,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
-+shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
@@ -68722,14 +72491,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# flags to be left without arguments
 +need_version=unknown
 +
++AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
++[User-defined run-time library search path.])
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[[4-9]]*)
@@ -68737,41 +72509,91 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[[01]] | aix4.[[01]].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
@@ -68781,18 +72603,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-+  library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
@@ -68800,8 +72622,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +bsdi[[45]]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -68813,7 +72635,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-+  shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
@@ -68822,8 +72644,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
@@ -68839,17 +72661,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +m4_if([$1], [],[
 +      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
@@ -68858,8 +72680,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
@@ -68886,7 +72708,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-+      sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -68899,8 +72721,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
@@ -68913,7 +72735,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +  *)
 +    # Assume MSVC wrapper
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
@@ -68926,8 +72748,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -68940,8 +72762,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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
 +  ;;
 +
@@ -68959,12 +72781,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      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
 +      ;;
 +    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
@@ -68989,26 +72812,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  esac
 +  ;;
 +
-+gnu*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  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'
-+  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
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
@@ -69026,14 +72838,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
@@ -69041,8 +72854,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
@@ -69051,8 +72864,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -69065,8 +72878,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -69077,7 +72890,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
++	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
@@ -69085,8 +72898,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
@@ -69105,8 +72918,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
@@ -69115,13 +72928,33 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
@@ -69146,14 +72979,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-+  # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -69165,17 +72999,29 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
++netbsdelf*-gnu)
++  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'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    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'
++    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
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -69185,7 +73031,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
@@ -69194,58 +73040,68 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=qnx
 +  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'
++  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
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
-+openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-+    shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-+  shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
@@ -69256,8 +73112,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  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'
++  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=yes
 +  hardcode_into_libs=yes
@@ -69267,11 +73123,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +sunos4*)
 +  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
@@ -69279,8 +73135,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  case $host_vendor in
 +    sni)
@@ -69301,24 +73157,24 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ;;
 +
 +sysv4*MP*)
-+  if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -69336,7 +73192,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -69344,8 +73200,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  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
 +  ;;
 +
@@ -69354,20 +73210,30 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ;;
 +esac
 +AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
 +_LT_DECL([], [variables_saved_for_relink], [1],
 +    [Variables whose values should be saved in libtool wrapper scripts and
 +    restored at link time])
@@ -69400,39 +73266,41 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    [Whether we should hardcode library paths into libraries])
 +_LT_DECL([], [sys_lib_search_path_spec], [2],
 +    [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+    [Run-time system search path for libraries])
++_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
++    [Detected run-time system search path for libraries])
++_LT_DECL([], [configure_time_lt_sys_library_path], [2],
++    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 +])# _LT_SYS_DYNAMIC_LINKER
 +
 +
 +# _LT_PATH_TOOL_PREFIX(TOOL)
 +# --------------------------
-+# find a file program which can recognize shared library
++# find a file program that can recognize shared library
 +AC_DEFUN([_LT_PATH_TOOL_PREFIX],
 +[m4_require([_LT_DECL_EGREP])dnl
 +AC_MSG_CHECKING([for $1])
 +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 +[case $MAGIC_CMD in
 +[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 +  ;;
 +*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_MAGIC_CMD=$MAGIC_CMD
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +dnl $ac_dummy forces splitting on constant user-supplied paths.
 +dnl POSIX.2 word splitting is done only on the output of word expansions,
 +dnl not every word.  This closes a longstanding sh security hole.
 +  ac_dummy="m4_if([$2], , $PATH, [$2])"
 +  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++    if test -f "$ac_dir/$1"; then
++      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
 +	    :
@@ -69455,11 +73323,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      break
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  IFS=$lt_save_ifs
++  MAGIC_CMD=$lt_save_MAGIC_CMD
 +  ;;
 +esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +if test -n "$MAGIC_CMD"; then
 +  AC_MSG_RESULT($MAGIC_CMD)
 +else
@@ -69477,7 +73345,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +# _LT_PATH_MAGIC
 +# --------------
-+# find a file program which can recognize a shared library
++# find a file program that can recognize a shared library
 +m4_defun([_LT_PATH_MAGIC],
 +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 +if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -69504,16 +73372,16 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +AC_ARG_WITH([gnu-ld],
 +    [AS_HELP_STRING([--with-gnu-ld],
 +	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
++    [test no = "$withval" || with_gnu_ld=yes],
 +    [with_gnu_ld=no])dnl
 +
 +ac_prog=ld
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  # Check if gcc -print-prog-name=ld gives a path.
 +  AC_MSG_CHECKING([for ld used by $CC])
 +  case $host in
 +  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
++    # gcc leaves a trailing carriage return, which upsets mingw
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 +  *)
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -69527,7 +73395,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 +	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 +      done
-+      test -z "$LD" && LD="$ac_prog"
++      test -z "$LD" && LD=$ac_prog
 +      ;;
 +  "")
 +    # If it fails, then pretend we aren't using GCC.
@@ -69538,37 +73406,37 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    with_gnu_ld=unknown
 +    ;;
 +  esac
-+elif test "$with_gnu_ld" = yes; then
++elif test yes = "$with_gnu_ld"; then
 +  AC_MSG_CHECKING([for GNU ld])
 +else
 +  AC_MSG_CHECKING([for non-GNU ld])
 +fi
 +AC_CACHE_VAL(lt_cv_path_LD,
 +[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +    test -z "$ac_dir" && ac_dir=.
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
++      lt_cv_path_LD=$ac_dir/$ac_prog
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
 +      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
++	test no != "$with_gnu_ld" && break
 +	;;
 +      *)
-+	test "$with_gnu_ld" != yes && break
++	test yes != "$with_gnu_ld" && break
 +	;;
 +      esac
 +    fi
 +  done
-+  IFS="$lt_save_ifs"
++  IFS=$lt_save_ifs
 +else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  lt_cv_path_LD=$LD # Let the user override the test with a path.
 +fi])
-+LD="$lt_cv_path_LD"
++LD=$lt_cv_path_LD
 +if test -n "$LD"; then
 +  AC_MSG_RESULT($LD)
 +else
@@ -69622,13 +73490,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  cygwin* | mingw* | pw32* | cegcc*)
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      reload_cmds=false
 +    fi
 +    ;;
 +  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    if test yes = "$GCC"; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
@@ -69639,6 +73507,43 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +])# _LT_CMD_RELOAD
 +
 +
++# _LT_PATH_DD
++# -----------
++# find a working dd
++m4_defun([_LT_PATH_DD],
++[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
++[printf 0123456789abcdef0123456789abcdef >conftest.i
++cat conftest.i conftest.i >conftest2.i
++: ${lt_DD:=$DD}
++AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
++[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
++  cmp -s conftest.i conftest.out \
++  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
++fi])
++rm -f conftest.i conftest2.i conftest.out])
++])# _LT_PATH_DD
++
++
++# _LT_CMD_TRUNCATE
++# ----------------
++# find command to truncate a binary pipe
++m4_defun([_LT_CMD_TRUNCATE],
++[m4_require([_LT_PATH_DD])
++AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
++[printf 0123456789abcdef0123456789abcdef >conftest.i
++cat conftest.i conftest.i >conftest2.i
++lt_cv_truncate_bin=
++if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
++  cmp -s conftest.i conftest.out \
++  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
++fi
++rm -f conftest.i conftest2.i conftest.out
++test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
++_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
++  [Command to truncate a binary pipe])
++])# _LT_CMD_TRUNCATE
++
++
 +# _LT_CHECK_MAGIC_METHOD
 +# ----------------------
 +# how to check for library dependencies
@@ -69654,13 +73559,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Need to set the preceding variable on all platforms that support
 +# interlibrary dependencies.
 +# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
++# 'unknown' -- same as none, but documents that we really don't know.
 +# 'pass_all' -- all dependencies passed with no checks.
 +# 'test_compile' -- check by making test program.
 +# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
++# that responds to the $file_magic_cmd with a given extended regex.
++# If you have 'file' or equivalent on your system and you're not sure
++# whether 'pass_all' will *always* work, you probably want this one.
 +
 +case $host_os in
 +aix[[4-9]]*)
@@ -69687,8 +73592,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump',
 +  # unless we find 'file', for example because we are cross-compiling.
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++  if ( file / ) >/dev/null 2>&1; then
 +    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +    lt_cv_file_magic_cmd='func_win32_libid'
 +  else
@@ -69724,10 +73628,6 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  fi
 +  ;;
 +
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
 +haiku*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
@@ -69766,11 +73666,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ;;
 +
 +# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+netbsd*)
++netbsd* | netbsdelf*-gnu)
 +  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
@@ -69788,8 +73688,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++openbsd* | bitrig*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
 +  else
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -69842,6 +73742,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +tpf*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
++os2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
 +esac
 +])
 +
@@ -69882,33 +73785,38 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 +[if test -n "$NM"; then
 +  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
++  lt_cv_path_NM=$NM
 +else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
++  lt_nm_to_check=${ac_tool_prefix}nm
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 +    lt_nm_to_check="$lt_nm_to_check nm"
 +  fi
 +  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 +    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      tmp_nm=$ac_dir/$lt_tmp_nm
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 +	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 +	#   nm: unknown option "B" ignored
 +	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
++	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
++	case $build_os in
++	mingw*) lt_bad_file=conftest.nm/nofile ;;
++	*) lt_bad_file=/dev/null ;;
++	esac
++	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
++	*$lt_bad_file* | *'Invalid file or object type'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
++	  break 2
 +	  ;;
 +	*)
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
++	    break 2
 +	    ;;
 +	  *)
 +	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -69919,21 +73827,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	esac
 +      fi
 +    done
-+    IFS="$lt_save_ifs"
++    IFS=$lt_save_ifs
 +  done
 +  : ${lt_cv_path_NM=no}
 +fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
++if test no != "$lt_cv_path_NM"; then
++  NM=$lt_cv_path_NM
 +else
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
 +  if test -n "$DUMPBIN"; then :
 +    # Let the user override the test.
 +  else
 +    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 +    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
++      DUMPBIN="$DUMPBIN -symbols -headers"
 +      ;;
 +    *)
 +      DUMPBIN=:
@@ -69941,8 +73849,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    esac
 +  fi
 +  AC_SUBST([DUMPBIN])
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
++  if test : != "$DUMPBIN"; then
++    NM=$DUMPBIN
 +  fi
 +fi
 +test -z "$NM" && NM=nm
@@ -69988,8 +73896,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +case $host_os in
 +cygwin* | mingw* | pw32* | cegcc*)
-+  # two different shell functions defined in ltmain.sh
-+  # decide which to use based on capabilities of $DLLTOOL
++  # two different shell functions defined in ltmain.sh;
++  # decide which one to use based on capabilities of $DLLTOOL
 +  case `$DLLTOOL --help 2>&1` in
 +  *--identify-strict*)
 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -70001,7 +73909,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  ;;
 +*)
 +  # fallback: assume linklib IS sharedlib
-+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++  lt_cv_sharedlib_from_linklib_cmd=$ECHO
 +  ;;
 +esac
 +])
@@ -70028,13 +73936,28 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    lt_cv_path_mainfest_tool=yes
 +  fi
 +  rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
++if test yes != "$lt_cv_path_mainfest_tool"; then
 +  MANIFEST_TOOL=:
 +fi
 +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 +])# _LT_PATH_MANIFEST_TOOL
 +
 +
++# _LT_DLL_DEF_P([FILE])
++# ---------------------
++# True iff FILE is a Windows DLL '.def' file.
++# Keep in sync with func_dll_def_p in the libtool script
++AC_DEFUN([_LT_DLL_DEF_P],
++[dnl
++  test DEF = "`$SED -n dnl
++    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
++    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
++    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
++    -e q dnl                          Only consider the first "real" line
++    $1`" dnl
++])# _LT_DLL_DEF_P
++
++
 +# LT_LIB_M
 +# --------
 +# check for math library
@@ -70046,11 +73969,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # These system don't have libm, or don't need it
 +  ;;
 +*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
 +  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
 +  ;;
 +*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  AC_CHECK_LIB(m, cos, LIBM=-lm)
 +  ;;
 +esac
 +AC_SUBST([LIBM])
@@ -70069,7 +73992,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +
-+if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $cc_basename in
 +  nvcc*)
 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -70121,7 +74044,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  symcode='[[ABCDGISTW]]'
 +  ;;
 +hpux*)
-+  if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    symcode='[[ABCDEGRST]]'
 +  fi
 +  ;;
@@ -70154,14 +74077,44 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  symcode='[[ABCDGIRSTW]]' ;;
 +esac
 +
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++  # Gets list of data symbols to import.
++  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
++  # Adjust the below global symbol transforms to fixup imported variables.
++  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
++  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
++  lt_c_name_lib_hook="\
++  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
++  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
++else
++  # Disable hooks by default.
++  lt_cv_sys_global_symbol_to_import=
++  lt_cdecl_hook=
++  lt_c_name_hook=
++  lt_c_name_lib_hook=
++fi
++
 +# Transform an extracted symbol line into a proper C declaration.
 +# Some systems (esp. on ia64) link data and code symbols differently,
 +# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++lt_cv_sys_global_symbol_to_cdecl="sed -n"\
++$lt_cdecl_hook\
++" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 +
 +# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
++$lt_c_name_hook\
++" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
++
++# Transform an extracted symbol line into symbol name with lib prefix and
++# symbol address.
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
++$lt_c_name_lib_hook\
++" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
++" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
++" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 +
 +# Handle CRLF in mingw tool chain
 +opt_cr=
@@ -70179,21 +74132,24 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +  # Write the raw and C identifiers.
 +  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
++    # Fake it for dumpbin and say T for any non-static function,
++    # D for any global variable and I for any imported variable.
 +    # Also find C++ and __fastcall symbols from MSVC++,
 +    # which start with @ or ?.
 +    lt_cv_sys_global_symbol_pipe="$AWK ['"\
 +"     {last_section=section; section=\$ 3};"\
 +"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 +"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
++"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
++"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 +"     \$ 0!~/External *\|/{next};"\
 +"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 +"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
++"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
++"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 +"     ' prfx=^$ac_symprfx]"
 +  else
 +    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -70220,7 +74176,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  if AC_TRY_EVAL(ac_compile); then
 +    # Now try to grab the symbols.
 +    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
++    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
++    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
 +      # Try sorting and uniquifying the output.
 +      if sort "$nlist" | uniq > "$nlist"T; then
 +	mv -f "$nlist"T "$nlist"
@@ -70233,11 +74190,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 +	  cat <<_LT_EOF > conftest.$ac_ext
 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
++/* DATA imports from DLLs on WIN32 can't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT@&t@_DLSYM_CONST
-+#elif defined(__osf__)
++#elif defined __osf__
 +/* This system does not cope well with relocations in const data.  */
 +# define LT@&t@_DLSYM_CONST
 +#else
@@ -70263,7 +74220,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +{
 +  { "@PROGRAM@", (void *) 0 },
 +_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 +	  cat <<\_LT_EOF >> conftest.$ac_ext
 +  {0, (void *) 0}
 +};
@@ -70283,9 +74240,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  mv conftest.$ac_objext conftstm.$ac_objext
 +	  lt_globsym_save_LIBS=$LIBS
 +	  lt_globsym_save_CFLAGS=$CFLAGS
-+	  LIBS="conftstm.$ac_objext"
++	  LIBS=conftstm.$ac_objext
 +	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
 +	    pipe_works=yes
 +	  fi
 +	  LIBS=$lt_globsym_save_LIBS
@@ -70306,7 +74263,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  rm -rf conftest* conftst*
 +
 +  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
++  if test yes = "$pipe_works"; then
 +    break
 +  else
 +    lt_cv_sys_global_symbol_pipe=
@@ -70333,12 +74290,16 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    [Take the output of nm and produce a listing of raw symbols and C names])
 +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
 +    [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
++    [Transform the output of nm into a list of symbols to manually relocate])
 +_LT_DECL([global_symbol_to_c_name_address],
 +    [lt_cv_sys_global_symbol_to_c_name_address], [1],
 +    [Transform the output of nm in a C name address pair])
 +_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
 +    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
 +    [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
++    [The name lister interface])
 +_LT_DECL([], [nm_file_list_spec], [1],
 +    [Specify filename containing input files for $NM])
 +]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -70354,17 +74315,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +m4_if([$1], [CXX], [
 +  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
++  if test yes = "$GXX"; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +
 +    case $host_os in
 +    aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -70375,8 +74337,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -70392,6 +74354,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      # (--disable-auto-import) libraries
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +    darwin* | rhapsody*)
 +      # PIC is the default on this platform
@@ -70441,7 +74408,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    case $host_os in
 +      aix[[4-9]]*)
 +	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	  # AIX 5 now supports IA64 processor
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	else
@@ -70482,14 +74449,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	case $cc_basename in
 +	  CC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++	    if test ia64 != "$host_cpu"; then
 +	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 +	    fi
 +	    ;;
 +	  aCC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 +	    case $host_cpu in
 +	    hppa*64*|ia64*)
 +	      # +Z the default
@@ -70518,7 +74485,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    ;;
 +	esac
 +	;;
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
@@ -70526,7 +74493,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    ;;
 +	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
++	    # old Intel C++ for x86_64, which still supported -KPIC.
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -70582,7 +74549,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    ;;
 +	esac
 +	;;
-+      netbsd*)
++      netbsd* | netbsdelf*-gnu)
 +	;;
 +      *qnx* | *nto*)
 +        # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -70671,17 +74638,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  fi
 +],
 +[
-+  if test "$GCC" = yes; then
++  if test yes = "$GCC"; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +
 +    amigaos*)
@@ -70692,8 +74660,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
@@ -70710,6 +74678,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      # (--disable-auto-import) libraries
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
@@ -70780,7 +74753,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    case $host_os in
 +    aix*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      else
@@ -70788,11 +74761,30 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      fi
 +      ;;
 +
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      case $cc_basename in
++      nagfor*)
++        # NAG Fortran compiler
++        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
++        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      esac
++      ;;
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    hpux9* | hpux10* | hpux11*)
@@ -70808,7 +74800,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	;;
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
@@ -70817,14 +74809,20 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
 +
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
++      # old Intel for x86_64, which still supported -KPIC.
 +      ecc*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +        ;;
++      # flang / f18. f95 an alias for gfortran or flang on Debian
++      flang* | f18* | f95*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
 +      # icc used to be incompatible with GCC.
 +      # ICC 10 doesn't accept -KPIC any more.
 +      icc* | ifort*)
@@ -70844,6 +74842,12 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	;;
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	;;
 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -70941,7 +74945,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    sysv4*MP*)
-+      if test -d /usr/nec ;then
++      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
@@ -70970,7 +74974,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  fi
 +])
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +    ;;
@@ -71036,17 +75040,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  case $host_os in
 +  aix[[4-9]]*)
 +    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    # Also, AIX nm treats weak defined symbols like other global defined
-+    # symbols, whereas GNU nm marks them as "W".
++    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
++    # Without the "-l" option, or with the "-B" option, AIX nm treats
++    # weak defined symbols like other global defined symbols, whereas
++    # GNU nm marks them as "W".
++    # While the 'weak' keyword is ignored in the Export File, we need
++    # it in the Import File for the 'aix-soname' feature, so we have
++    # to replace the "-B" option with "-P" for AIX nm.
 +    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +    else
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +    fi
 +    ;;
 +  pw32*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
 +    ;;
 +  cygwin* | mingw* | cegcc*)
 +    case $cc_basename in
@@ -71059,6 +75067,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +    esac
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
 +  *)
 +    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 +    ;;
@@ -71092,9 +75103,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # included in the symbol list
 +  _LT_TAGVAR(include_expsyms, $1)=
 +  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
++  # it will be wrapped by ' (' and ')$', so one must not match beginning or
++  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
++  # as well as any symbol that contains 'd'.
 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 +  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 +  # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -71110,7 +75121,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 +    # When not using gcc, we currently assume that we are using
 +    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      with_gnu_ld=no
 +    fi
 +    ;;
@@ -71118,9 +75129,12 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
++  openbsd* | bitrig*)
 +    with_gnu_ld=no
 +    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
 +  esac
 +
 +  _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -71128,7 +75142,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # On some targets, GNU ld is compatible enough with the native linker
 +  # that we're better off using the native interface for both.
 +  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    case $host_os in
 +      aix*)
 +	# The AIX port of GNU ld has always aspired to compatibility
@@ -71150,24 +75164,24 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    esac
 +  fi
 +
-+  if test "$lt_use_gnu_ld_interface" = yes; then
++  if test yes = "$lt_use_gnu_ld_interface"; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
++    wlarc='$wl'
 +
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
 +    runpath_var=LD_RUN_PATH
-+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +    # ancient GNU ld didn't support --whole-archive et. al.
 +    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +    else
 +      _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +    fi
 +    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
++    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -71180,7 +75194,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    case $host_os in
 +    aix[[3-9]]*)
 +      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
++      if test ia64 != "$host_cpu"; then
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
 +
@@ -71199,7 +75213,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            _LT_TAGVAR(archive_expsym_cmds, $1)=''
 +        ;;
 +      m68k)
@@ -71215,7 +75229,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
@@ -71225,7 +75239,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +      _LT_TAGVAR(always_export_symbols, $1)=no
 +      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -71233,61 +75247,89 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 +
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file, use it as
++	# is; otherwise, prepend EXPORTS...
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++          cp $export_symbols $output_objdir/$soname.def;
++        else
++          echo EXPORTS > $output_objdir/$soname.def;
++          cat $export_symbols >> $output_objdir/$soname.def;
++        fi~
++        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    haiku*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
 +
++    os2*)
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      shrext_cmds=.dll
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
 +    interix[[3-9]]*)
 +      _LT_TAGVAR(hardcode_direct, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +      # Instead, shared libraries are loaded at an image base (0x10000000 by
 +      # default) and relocated if they conflict, which is a slow very memory
 +      # consuming and fragmenting process.  To avoid this, we pick a random,
 +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
++      if test linux-dietlibc = "$host_os"; then
 +	case $cc_basename in
 +	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 +	esac
 +      fi
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
++	 && test no = "$tmp_diet"
 +      then
 +	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 +					# Portland Group f77 and f90 compilers
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
@@ -71298,42 +75340,47 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	lf95*)				# Lahey Fortran 8.1
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +	  tmp_sharedflag='--shared' ;;
++        nagfor*)                        # NAGFOR 5.3
++          tmp_sharedflag='-Wl,-shared' ;;
 +	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
 +	nvcc*)	# Cuda Compiler Driver 2.2
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 +	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
 +	  tmp_sharedflag='-G' ;;
 +	esac
-+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +
-+        if test "x$supports_anon_versioning" = xyes; then
++        if test yes = "$supports_anon_versioning"; then
 +          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++            echo "local: *; };" >> $output_objdir/$libname.ver~
++            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +        fi
 +
 +	case $cc_basename in
++	tcc*)
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
++	  ;;
 +	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
++	  if test yes = "$supports_anon_versioning"; then
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++              echo "local: *; };" >> $output_objdir/$libname.ver~
++              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
@@ -71342,13 +75389,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      fi
 +      ;;
 +
-+    netbsd*)
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 +	wlarc=
 +      else
-+	_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(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'
 +      fi
 +      ;;
 +
@@ -71366,8 +75413,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_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(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'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
@@ -71379,7 +75426,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
 +
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -71394,9 +75441,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  # DT_RUNPATH tag from executables and libraries.  But doing so
 +	  # requires that you compile everything twice, which is a pain.
 +	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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 $wl$libdir'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	  else
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	  fi
@@ -71413,15 +75460,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_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(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'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +    esac
 +
-+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
++    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
 +      runpath_var=
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -71437,7 +75484,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      # Note: this linker hardcodes the directories in LIBPATH if there
 +      # are no directories specified by -L.
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 +	# Neither direct hardcoding nor static linking is supported with a
 +	# broken collect2.
 +	_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -71445,34 +75492,57 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    aix[[4-9]]*)
-+      if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
++	no_entry_flag=
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
++	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
++	# Without the "-l" option, or with the "-B" option, AIX nm treats
++	# weak defined symbols like other global defined symbols, whereas
++	# GNU nm marks them as "W".
++	# While the 'weak' keyword is ignored in the Export File, we need
++	# it in the Import File for the 'aix-soname' feature, so we have
++	# to replace the "-B" option with "-P" for AIX nm.
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +	else
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
++	# have runtime linking enabled, and use it for executables.
++	# For shared libraries, we enable/disable runtime linking
++	# depending on the kind of the shared library created -
++	# when "with_aix_soname,aix_use_runtimelinking" is:
++	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "aix,yes"  lib.so          shared, rtl:yes, for executables
++	#            lib.a           static archive
++	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
++	#            lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a(lib.so.V) shared, rtl:no
++	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a           static archive
 +	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 +	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 +	    aix_use_runtimelinking=yes
 +	    break
 +	  fi
 +	  done
++	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	    # so we don't have lib.a shared libs to link our executables.
++	    # We have to force runtime linking in this case.
++	    aix_use_runtimelinking=yes
++	    LDFLAGS="$LDFLAGS -Wl,-brtl"
++	  fi
 +	  ;;
 +	esac
 +
@@ -71491,13 +75561,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
++      case $with_aix_soname,$aix_use_runtimelinking in
++      aix,*) ;; # traditional, no import file
++      svr4,* | *,yes) # use import file
++	# The Import File defines what to hardcode.
++	_LT_TAGVAR(hardcode_direct, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++	;;
++      esac
 +
-+      if test "$GCC" = yes; then
++      if test yes = "$GCC"; then
 +	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -71516,61 +75594,80 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  ;;
 +	esac
 +	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
++	if test yes = "$aix_use_runtimelinking"; then
++	  shared_flag="$shared_flag "'$wl-G'
 +	fi
++	# Need to ensure runtime linking is disabled for the traditional
++	# shared library, or the linker may eventually find shared libraries
++	# /with/ Import File - we do not want to mix them.
++	shared_flag_aix='-shared'
++	shared_flag_svr4='-shared $wl-G'
 +      else
 +	# not using gcc
-+	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag='$wl-G'
 +	  else
-+	    shared_flag='${wl}-bM:SRE'
++	    shared_flag='$wl-bM:SRE'
 +	  fi
++	  shared_flag_aix='$wl-bM:SRE'
++	  shared_flag_svr4='$wl-G'
 +	fi
 +      fi
 +
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      if test "$aix_use_runtimelinking" = yes; then
++      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +	# Warning - without using the other runtime loading flags (-brtl),
 +	# -berok will link without error, but may produce a broken library.
 +	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
 +        _LT_SYS_MODULE_PATH_AIX([$1])
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +      else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	if test ia64 = "$host_cpu"; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 +	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
 +	 _LT_SYS_MODULE_PATH_AIX([$1])
-+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
-+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
++	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
++	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
++	  if test yes = "$with_gnu_ld"; then
 +	    # We only use this code for GNU lds that support --whole-archive.
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	  else
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 +	  fi
 +	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	  # -brtl affects multiple linker settings, -berok does not and is overridden later
++	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
++	  if test svr4 != "$with_aix_soname"; then
++	    # This is similar to how AIX traditionally builds its shared libraries.
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	  fi
++	  if test aix != "$with_aix_soname"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	  else
++	    # used by -dlpreopen to get the symbols
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	  fi
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 +	fi
 +      fi
 +      ;;
@@ -71579,7 +75676,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            _LT_TAGVAR(archive_expsym_cmds, $1)=''
 +        ;;
 +      m68k)
@@ -71609,16 +75706,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
++	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++            cp "$export_symbols" "$output_objdir/$soname.def";
++            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++          else
++            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++          fi~
++          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++          linknames='
 +	# The linker will not automatically build a static lib if we build a DLL.
 +	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 +	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -71627,18 +75725,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	# Don't use ranlib
 +	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 +	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
++          lt_tool_outputfile="@TOOL_OUTPUT@"~
++          case $lt_outputfile in
++            *.exe|*.EXE) ;;
++            *)
++              lt_outputfile=$lt_outputfile.exe
++              lt_tool_outputfile=$lt_tool_outputfile.exe
++              ;;
++          esac~
++          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++            $RM "$lt_outputfile.manifest";
++          fi'
 +	;;
 +      *)
 +	# Assume MSVC wrapper
@@ -71647,7 +75745,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +	# The linker will automatically build a .lib file if we build a DLL.
@@ -71697,33 +75795,33 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +      ;;
 +
 +    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes,no = "$GCC,$with_gnu_ld"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -71731,25 +75829,25 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++      if test yes,no = "$GCC,$with_gnu_ld"; then
 +	case $host_cpu in
 +	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
 +	case $host_cpu in
 +	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
 +	m4_if($1, [], [
@@ -71757,14 +75855,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 +	  _LT_LINKER_OPTION([if $CC understands -b],
 +	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
 +	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
++	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 +	  ;;
 +	esac
 +      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	case $host_cpu in
@@ -71775,7 +75873,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	*)
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
 +	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
@@ -71786,16 +75884,16 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
 +	# This should be the same for all languages, so no per-tag cache variable.
 +	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
 +	  [lt_cv_irix_exported_symbol],
-+	  [save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++	  [save_LDFLAGS=$LDFLAGS
++	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 +	   AC_LINK_IFELSE(
 +	     [AC_LANG_SOURCE(
 +	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -71808,22 +75906,33 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      end]])])],
 +	      [lt_cv_irix_exported_symbol=yes],
 +	      [lt_cv_irix_exported_symbol=no])
-+           LDFLAGS="$save_LDFLAGS"])
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++           LDFLAGS=$save_LDFLAGS])
++	if test yes = "$lt_cv_irix_exported_symbol"; then
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 +	fi
++	_LT_TAGVAR(link_all_deplibs, $1)=no
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(inherit_rpath, $1)=yes
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
 +
-+    netbsd*)
++    linux*)
++      case $cc_basename in
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	_LT_TAGVAR(ld_shlibs, $1)=yes
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      esac
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +      else
@@ -71837,7 +75946,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    newsos6)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
@@ -71845,27 +75954,19 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    *nto* | *qnx*)
 +      ;;
 +
-+    openbsd*)
++    openbsd* | bitrig*)
 +      if test -f /usr/libexec/ld.so; then
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	else
-+	  case $host_os in
-+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	     ;;
-+	   *)
-+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 +	fi
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -71876,33 +75977,53 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      shrext_cmds=.dll
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +      ;;
 +
 +    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      ;;
 +
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -71913,24 +76034,24 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +    solaris*)
 +      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	wlarc='$wl'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
 +	  wlarc=''
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 +	  ;;
 +	*)
-+	  wlarc='${wl}'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  wlarc='$wl'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  _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${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	  ;;
 +	esac
 +      fi
@@ -71940,11 +76061,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +      *)
 +	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 +	# but is careful enough not to reorder.
 +	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	if test yes = "$GCC"; then
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +	else
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 +	fi
@@ -71954,10 +76075,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
++      if test sequent = "$host_vendor"; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
 +	# files that make .init and .fini sections work.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 +      fi
@@ -72006,43 +76127,43 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
++      # Note: We CANNOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
 +      # always be unresolved, which means just about no library would
 +      # ever link correctly.  If we're not using GNU ld we use -z text
 +      # though, which does catch some bad symbols but isn't as heavy-handed
 +      # as -z defs.
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 +      runpath_var='LD_RUN_PATH'
 +
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
@@ -72057,17 +76178,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      ;;
 +    esac
 +
-+    if test x$host_vendor = xsni; then
++    if test sni = "$host_vendor"; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
 +	;;
 +      esac
 +    fi
 +  fi
 +])
 +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 +
 +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 +
@@ -72084,7 +76205,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  # Assume -lc should be added
 +  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 +
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $_LT_TAGVAR(archive_cmds, $1) in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
@@ -72164,12 +76285,12 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_TAGDECL([], [hardcode_libdir_separator], [1],
 +    [Whether we need a single "-rpath" flag with a separated argument])
 +_LT_TAGDECL([], [hardcode_direct], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
 +    DIR into the resulting binary])
 +_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
 +    DIR into the resulting binary and the resulting library dependency is
-+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
++    "absolute", i.e impossible to change by setting $shlibpath_var if the
 +    library is relocated])
 +_LT_TAGDECL([], [hardcode_minus_L], [0],
 +    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -72210,10 +76331,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# ------------------------
 +# Ensure that the configuration variables for a C compiler are suitably
 +# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
++# the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_C_CONFIG],
 +[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
++lt_save_CC=$CC
 +AC_LANG_PUSH(C)
 +
 +# Source file extension for C test sources.
@@ -72253,18 +76374,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  LT_SYS_DLOPEN_SELF
 +  _LT_CMD_STRIPLIB
 +
-+  # Report which library types will actually be built
++  # Report what library types will actually be built
 +  AC_MSG_CHECKING([if libtool supports shared libraries])
 +  AC_MSG_RESULT([$can_build_shared])
 +
 +  AC_MSG_CHECKING([whether to build shared libraries])
-+  test "$can_build_shared" = "no" && enable_shared=no
++  test no = "$can_build_shared" && enable_shared=no
 +
 +  # On AIX, shared libraries and static libraries use the same namespace, and
 +  # are all built from PIC.
 +  case $host_os in
 +  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
++    test yes = "$enable_shared" && enable_static=no
 +    if test -n "$RANLIB"; then
 +      archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +      postinstall_cmds='$RANLIB $lib'
@@ -72272,8 +76393,12 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    ;;
 +
 +  aix[[4-9]]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
++    if test ia64 != "$host_cpu"; then
++      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++      yes,aix,yes) ;;			# shared object as lib.so file only
++      yes,svr4,*) ;;			# shared object as lib.so archive member only
++      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++      esac
 +    fi
 +    ;;
 +  esac
@@ -72281,13 +76406,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +  AC_MSG_CHECKING([whether to build static libraries])
 +  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
++  test yes = "$enable_shared" || enable_static=yes
 +  AC_MSG_RESULT([$enable_static])
 +
 +  _LT_CONFIG($1)
 +fi
 +AC_LANG_POP
-+CC="$lt_save_CC"
++CC=$lt_save_CC
 +])# _LT_LANG_C_CONFIG
 +
 +
@@ -72295,14 +76420,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# --------------------------
 +# Ensure that the configuration variables for a C++ compiler are suitably
 +# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
++# the compiler configuration to 'libtool'.
 +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 "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
++if test -n "$CXX" && ( test no != "$CXX" &&
++    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
++    (test g++ != "$CXX"))); then
 +  AC_PROG_CXXCPP
 +else
 +  _lt_caught_CXX_error=yes
@@ -72344,7 +76469,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# the CXX compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
++if test yes != "$_lt_caught_CXX_error"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="int some_variable = 0;"
 +
@@ -72386,35 +76511,35 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  if test -n "$compiler"; then
 +    # We don't want -fno-exception when compiling C++ code, so set the
 +    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 +    else
 +      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +    fi
 +
-+    if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      # Set up default GNU C++ configuration
 +
 +      LT_PATH_LD
 +
 +      # Check if GNU C++ uses GNU ld as the underlying linker, since the
 +      # archiving commands below assume that GNU ld is being used.
-+      if test "$with_gnu_ld" = yes; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      if test yes = "$with_gnu_ld"; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +
 +        # If archive_cmds runs LD, not CC, wlarc should be empty
 +        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 +        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
++        wlarc='$wl'
 +
 +        # ancient GNU ld didn't support --whole-archive et. al.
 +        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 +	  $GREP 'no-whole-archive' > /dev/null; then
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +        else
 +          _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +        fi
@@ -72433,7 +76558,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      # 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"'
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +
 +    else
 +      GXX=no
@@ -72450,18 +76575,30 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +      aix[[4-9]]*)
-+        if test "$host_cpu" = ia64; then
++        if test ia64 = "$host_cpu"; then
 +          # On IA64, the linker does run time linking by default, so we don't
 +          # have to do anything special.
 +          aix_use_runtimelinking=no
 +          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
++          no_entry_flag=
 +        else
 +          aix_use_runtimelinking=no
 +
 +          # Test if we are trying to use run time linking or normal
 +          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
++          # have runtime linking enabled, and use it for executables.
++          # For shared libraries, we enable/disable runtime linking
++          # depending on the kind of the shared library created -
++          # when "with_aix_soname,aix_use_runtimelinking" is:
++          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "aix,yes"  lib.so          shared, rtl:yes, for executables
++          #            lib.a           static archive
++          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
++          #            lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a(lib.so.V) shared, rtl:no
++          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a           static archive
 +          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 +	    for ld_flag in $LDFLAGS; do
 +	      case $ld_flag in
@@ -72471,6 +76608,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	        ;;
 +	      esac
 +	    done
++	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	      # so we don't have lib.a shared libs to link our executables.
++	      # We have to force runtime linking in this case.
++	      aix_use_runtimelinking=yes
++	      LDFLAGS="$LDFLAGS -Wl,-brtl"
++	    fi
 +	    ;;
 +          esac
 +
@@ -72489,13 +76633,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
++        case $with_aix_soname,$aix_use_runtimelinking in
++        aix,*) ;;	# no import file
++        svr4,* | *,yes) # use import file
++          # The Import File defines what to hardcode.
++          _LT_TAGVAR(hardcode_direct, $1)=no
++          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
++          ;;
++        esac
 +
-+        if test "$GXX" = yes; then
++        if test yes = "$GXX"; then
 +          case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +          # We only want to do this on AIX 4.2 and lower, the check
 +          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
@@ -72513,64 +76665,84 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  fi
 +          esac
 +          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag=$shared_flag' $wl-G'
 +	  fi
++	  # Need to ensure runtime linking is disabled for the traditional
++	  # shared library, or the linker may eventually find shared libraries
++	  # /with/ Import File - we do not want to mix them.
++	  shared_flag_aix='-shared'
++	  shared_flag_svr4='-shared $wl-G'
 +        else
 +          # not using gcc
-+          if test "$host_cpu" = ia64; then
++          if test ia64 = "$host_cpu"; then
 +	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	  # chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
++	    if test yes = "$aix_use_runtimelinking"; then
++	      shared_flag='$wl-G'
 +	    else
-+	      shared_flag='${wl}-bM:SRE'
++	      shared_flag='$wl-bM:SRE'
 +	    fi
++	    shared_flag_aix='$wl-bM:SRE'
++	    shared_flag_svr4='$wl-G'
 +          fi
 +        fi
 +
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
 +        # It seems that -bexpall does not export symbols beginning with
 +        # underscore (_), so it is better to generate a list of symbols to
 +	# export.
 +        _LT_TAGVAR(always_export_symbols, $1)=yes
-+        if test "$aix_use_runtimelinking" = yes; then
++	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +          # Warning - without using the other runtime loading flags (-brtl),
 +          # -berok will link without error, but may produce a broken library.
-+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++          # The "-G" linker flag allows undefined symbols.
++          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
 +          # Determine the default libpath from the value encoded in an empty
 +          # executable.
 +          _LT_SYS_MODULE_PATH_AIX([$1])
-+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +        else
-+          if test "$host_cpu" = ia64; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++          if test ia64 = "$host_cpu"; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 +	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +          else
 +	    # Determine the default libpath from the value encoded in an
 +	    # empty executable.
 +	    _LT_SYS_MODULE_PATH_AIX([$1])
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +	    # Warning - without using the other run time loading flags,
 +	    # -berok will link without error, but may produce a broken library.
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	    if test "$with_gnu_ld" = yes; then
++	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
++	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
++	    if test yes = "$with_gnu_ld"; then
 +	      # We only use this code for GNU lds that support --whole-archive.
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    else
 +	      # Exported symbols can be pulled into shared objects from archives
 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 +	    fi
 +	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	    # -brtl affects multiple linker settings, -berok does not and is overridden later
++	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
++	    if test svr4 != "$with_aix_soname"; then
++	      # This is similar to how AIX traditionally builds its shared
++	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	    fi
++	    if test aix != "$with_aix_soname"; then
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
++	    else
++	      # used by -dlpreopen to get the symbols
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	    fi
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 +          fi
 +        fi
 +        ;;
@@ -72580,7 +76752,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 +	  # support --undefined.  This deserves some investigation.  FIXME
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +	else
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	fi
@@ -72608,57 +76780,58 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	  # Tell ltmain to make .lib files, not .a files.
 +	  libext=lib
 +	  # Tell ltmain to make .dll files, not .so files.
-+	  shrext_cmds=".dll"
++	  shrext_cmds=.dll
 +	  # FIXME: Setting linknames here is a bad hack.
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	    else
-+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	    fi~
-+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	    linknames='
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++              cp "$export_symbols" "$output_objdir/$soname.def";
++              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++            else
++              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++            fi~
++            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++            linknames='
 +	  # The linker will not automatically build a static lib if we build a DLL.
 +	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +	  # Don't use ranlib
 +	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 +	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	    case $lt_outputfile in
-+	      *.exe|*.EXE) ;;
-+	      *)
-+		lt_outputfile="$lt_outputfile.exe"
-+		lt_tool_outputfile="$lt_tool_outputfile.exe"
-+		;;
-+	    esac~
-+	    func_to_tool_file "$lt_outputfile"~
-+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	      $RM "$lt_outputfile.manifest";
-+	    fi'
++            lt_tool_outputfile="@TOOL_OUTPUT@"~
++            case $lt_outputfile in
++              *.exe|*.EXE) ;;
++              *)
++                lt_outputfile=$lt_outputfile.exe
++                lt_tool_outputfile=$lt_tool_outputfile.exe
++                ;;
++            esac~
++            func_to_tool_file "$lt_outputfile"~
++            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++              $RM "$lt_outputfile.manifest";
++            fi'
 +	  ;;
 +	*)
 +	  # g++
 +	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +	  # as there is no search path for DLLs.
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	  _LT_TAGVAR(always_export_symbols, $1)=no
 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +
 +	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	    # If the export-symbols file already is a .def file (1st line
-+	    # is EXPORTS), use it as is; otherwise, prepend...
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      cp $export_symbols $output_objdir/$soname.def;
-+	    else
-+	      echo EXPORTS > $output_objdir/$soname.def;
-+	      cat $export_symbols >> $output_objdir/$soname.def;
-+	    fi~
-+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    # If the export-symbols file already is a .def file, use it as
++	    # is; otherwise, prepend EXPORTS...
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++              cp $export_symbols $output_objdir/$soname.def;
++            else
++              echo EXPORTS > $output_objdir/$soname.def;
++              cat $export_symbols >> $output_objdir/$soname.def;
++            fi~
++            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +	  else
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	  fi
@@ -72669,6 +76842,34 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        _LT_DARWIN_LINKER_FEATURES($1)
 +	;;
 +
++      os2*)
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	_LT_TAGVAR(hardcode_minus_L, $1)=yes
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	shrext_cmds=.dll
++	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  prefix_cmds="$SED"~
++	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	    prefix_cmds="$prefix_cmds -e 1d";
++	  fi~
++	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++	;;
++
 +      dgux*)
 +        case $cc_basename in
 +          ec++*)
@@ -72703,18 +76904,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +        ;;
 +
-+      gnu*)
-+        ;;
-+
 +      haiku*)
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +        _LT_TAGVAR(link_all_deplibs, $1)=yes
 +        ;;
 +
 +      hpux9*)
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +        _LT_TAGVAR(hardcode_direct, $1)=yes
 +        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 +				             # but as the default
@@ -72726,7 +76924,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +            _LT_TAGVAR(ld_shlibs, $1)=no
 +            ;;
 +          aCC*)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            # Commands to make compiler produce verbose output that lists
 +            # what "hidden" libraries, object files and flags are used when
 +            # linking a shared library.
@@ -72735,11 +76933,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +            # explicitly linking system object files so we need to strip them
 +            # from the output so that they don't get included in the library
 +            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +            ;;
 +          *)
-+            if test "$GXX" = yes; then
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            if test yes = "$GXX"; then
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            else
 +              # FIXME: insert proper C++ library support
 +              _LT_TAGVAR(ld_shlibs, $1)=no
@@ -72749,15 +76947,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        ;;
 +
 +      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        if test no = "$with_gnu_ld"; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +          case $host_cpu in
 +            hppa*64*|ia64*)
 +              ;;
 +            *)
-+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +              ;;
 +          esac
 +        fi
@@ -72783,13 +76981,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +          aCC*)
 +	    case $host_cpu in
 +	      hppa*64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      ia64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      *)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	    esac
 +	    # Commands to make compiler produce verbose output that lists
@@ -72800,20 +76998,20 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
 +	        case $host_cpu in
 +	          hppa*64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          ia64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          *)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	        esac
 +	      fi
@@ -72828,22 +77026,22 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +      interix[[3-9]]*)
 +	_LT_TAGVAR(hardcode_direct, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +	# Instead, shared libraries are loaded at an image base (0x10000000 by
 +	# default) and relocated if they conflict, which is a slow very memory
 +	# consuming and fragmenting process.  To avoid this, we pick a random,
 +	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +	;;
 +      irix5* | irix6*)
 +        case $cc_basename in
 +          CC*)
 +	    # SGI C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -72852,22 +77050,22 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 +	    ;;
 +          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	      else
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 +	      fi
 +	    fi
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 +	    ;;
 +        esac
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +        _LT_TAGVAR(inherit_rpath, $1)=yes
 +        ;;
 +
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -72875,8 +77073,8 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -72885,10 +77083,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -72902,59 +77100,59 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # earlier do not add the objects themselves.
 +	    case `$CC -V 2>&1` in
 +	      *"Version 7."*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	      *)  # Version 8.0 or newer
 +	        tmp_idyn=
 +	        case $host_cpu in
 +		  ia64*) tmp_idyn=' -i_dynamic';;
 +		esac
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	    esac
 +	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    ;;
 +          pgCC* | pgcpp*)
 +            # Portland Group C++ compiler
 +	    case `$CC -V` in
 +	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 +	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++               rm -rf $tpldir~
++               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 +	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+		$RANLIB $oldlib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++                $RANLIB $oldlib'
 +	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    *) # Version 6 and above use weak symbols
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    esac
 +
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +            ;;
 +	  cxx*)
 +	    # Compaq C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 +
 +	    runpath_var=LD_RUN_PATH
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -72968,18 +77166,18 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 +	    ;;
 +	  xl* | mpixl* | bgxl*)
 +	    # IBM XL 8.0 on PPC, with GNU ld
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    if test yes = "$supports_anon_versioning"; then
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++                echo "local: *; };" >> $output_objdir/$libname.ver~
++                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +	    fi
 +	    ;;
 +	  *)
@@ -72987,10 +77185,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    *Sun\ C*)
 +	      # Sun C++ 5.9
 +	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 +
 +	      # Not sure whether something based on
@@ -73048,22 +77246,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +	;;
 +
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      openbsd*)
++      openbsd* | bitrig*)
 +	if test -f /usr/libexec/ld.so; then
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
 +	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +	  fi
 +	  output_verbose_link_cmd=func_echo_all
 +	else
@@ -73079,9 +77272,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 +
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	    # Archives containing C++ object files must be created using
@@ -73099,17 +77292,17 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +          cxx*)
 +	    case $host in
 +	      osf3*)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +		;;
 +	      *)
 +	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
++                  echo "-hidden">> $lib.exp~
++                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
++                  $RM $lib.exp'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +		;;
 +	    esac
@@ -73124,27 +77317,27 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	    if test yes,no = "$GXX,$with_gnu_ld"; then
++	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 +	      case $host in
 +	        osf3*)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	        *)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	      esac
 +
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	      # 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"'
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +
 +	    else
 +	      # FIXME: insert proper C++ library support
@@ -73184,9 +77377,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 +	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	    _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${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -73194,7 +77387,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +	      *)
 +		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
++		# but understands '-z linker_flag'.
 +	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 +		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 +	        ;;
@@ -73211,42 +77404,42 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	    ;;
 +          gcx*)
 +	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 +
 +	    # The C++ compiler must be used to create the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 +	    ;;
 +          *)
 +	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	    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
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $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~
-+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -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'
 +
 +	        # 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"'
++	        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
++	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 +	        # platform.
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _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 -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $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"'
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 +	      fi
 +
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	      _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'
++		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +		  ;;
 +	      esac
 +	    fi
@@ -73255,52 +77448,52 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +        ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
 +
 +      case $cc_basename in
 +        CC*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +      esac
 +      ;;
 +
 +      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
++	# Note: We CANNOT use -z defs as we might desire, because we do not
 +	# link with -lc, and that would cause any symbols used from libc to
 +	# always be unresolved, which means just about no library would
 +	# ever link correctly.  If we're not using GNU ld we use -z text
 +	# though, which does catch some bad symbols but isn't as heavy-handed
 +	# as -z defs.
-+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 +	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +	_LT_TAGVAR(link_all_deplibs, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 +	runpath_var='LD_RUN_PATH'
 +
 +	case $cc_basename in
 +          CC*)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
++              '"$_LT_TAGVAR(old_archive_cmds, $1)"
 +	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-+	      '"$_LT_TAGVAR(reload_cmds, $1)"
++              '"$_LT_TAGVAR(reload_cmds, $1)"
 +	    ;;
 +	  *)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    ;;
 +	esac
 +      ;;
@@ -73331,10 +77524,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    esac
 +
 +    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 +
-+    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$GXX
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -73361,7 +77554,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  lt_cv_path_LD=$lt_save_path_LD
 +  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
++fi # test yes != "$_lt_caught_CXX_error"
 +
 +AC_LANG_POP
 +])# _LT_LANG_CXX_CONFIG
@@ -73383,13 +77576,14 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
 +func_stripname_cnf ()
 +{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  case @S|@2 in
++  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
++  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
 +  esac
 +} # func_stripname_cnf
 +])# _LT_FUNC_STRIPNAME_CNF
 +
++
 +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 +# ---------------------------------
 +# Figure out "hidden" library dependencies from verbose
@@ -73473,13 +77667,13 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  pre_test_object_deps_done=no
 +
 +  for p in `eval "$output_verbose_link_cmd"`; do
-+    case ${prev}${p} in
++    case $prev$p in
 +
 +    -L* | -R* | -l*)
 +       # Some compilers place space between "-{L,R}" and the path.
 +       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
++       if test x-L = "$p" ||
++          test x-R = "$p"; then
 +	 prev=$p
 +	 continue
 +       fi
@@ -73495,16 +77689,16 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +       case $p in
 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 +       esac
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case ${prev} in
++       if test no = "$pre_test_object_deps_done"; then
++	 case $prev in
 +	 -L | -R)
 +	   # Internal compiler library paths should come after those
 +	   # provided the user.  The postdeps already come after the
 +	   # user supplied libs so there is no need to process them.
 +	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
 +	   else
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
 +	   fi
 +	   ;;
 +	 # The "-l" case would never come before the object being
@@ -73512,9 +77706,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	 esac
 +       else
 +	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
++	   _LT_TAGVAR(postdeps, $1)=$prev$p
 +	 else
-+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
++	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 +	 fi
 +       fi
 +       prev=
@@ -73529,15 +77723,15 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +	 continue
 +       fi
 +
-+       if test "$pre_test_object_deps_done" = no; then
++       if test no = "$pre_test_object_deps_done"; then
 +	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+	   _LT_TAGVAR(predep_objects, $1)="$p"
++	   _LT_TAGVAR(predep_objects, $1)=$p
 +	 else
 +	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
 +	 fi
 +       else
 +	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_TAGVAR(postdep_objects, $1)="$p"
++	   _LT_TAGVAR(postdep_objects, $1)=$p
 +	 else
 +	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 +	 fi
@@ -73568,51 +77762,6 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  _LT_TAGVAR(postdep_objects,$1)=
 +  _LT_TAGVAR(postdeps,$1)=
 +  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
-+  CC* | sunCC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
 +esac
 +])
 +
@@ -73621,7 +77770,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +esac
 + _LT_TAGVAR(compiler_lib_search_dirs, $1)=
 +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 +fi
 +_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
 +    [The directories searched by this compiler when creating a shared library])
@@ -73641,10 +77790,10 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# --------------------------
 +# Ensure that the configuration variables for a Fortran 77 compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_F77_CONFIG],
 +[AC_LANG_PUSH(Fortran 77)
-+if test -z "$F77" || test "X$F77" = "Xno"; then
++if test -z "$F77" || test no = "$F77"; then
 +  _lt_disable_F77=yes
 +fi
 +
@@ -73681,7 +77830,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# the F77 compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
++if test yes != "$_lt_disable_F77"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
@@ -73703,7 +77852,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  _LT_LINKER_BOILERPLATE
 +
 +  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${F77-"f77"}
@@ -73717,21 +77866,25 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    AC_MSG_RESULT([$can_build_shared])
 +
 +    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
@@ -73739,11 +77892,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +    AC_MSG_CHECKING([whether to build static libraries])
 +    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    AC_MSG_RESULT([$enable_static])
 +
-+    _LT_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$G77
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -73760,9 +77913,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  fi # test -n "$compiler"
 +
 +  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+  CFLAGS="$lt_save_CFLAGS"
-+fi # test "$_lt_disable_F77" != yes
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
++fi # test yes != "$_lt_disable_F77"
 +
 +AC_LANG_POP
 +])# _LT_LANG_F77_CONFIG
@@ -73772,11 +77925,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# -------------------------
 +# Ensure that the configuration variables for a Fortran compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_FC_CONFIG],
 +[AC_LANG_PUSH(Fortran)
 +
-+if test -z "$FC" || test "X$FC" = "Xno"; then
++if test -z "$FC" || test no = "$FC"; then
 +  _lt_disable_FC=yes
 +fi
 +
@@ -73813,7 +77966,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# the FC compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
++if test yes != "$_lt_disable_FC"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
@@ -73835,7 +77988,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  _LT_LINKER_BOILERPLATE
 +
 +  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${FC-"f95"}
@@ -73851,21 +78004,25 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    AC_MSG_RESULT([$can_build_shared])
 +
 +    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
@@ -73873,11 +78030,11 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +
 +    AC_MSG_CHECKING([whether to build static libraries])
 +    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    AC_MSG_RESULT([$enable_static])
 +
-+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+    _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
@@ -73897,7 +78054,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +  GCC=$lt_save_GCC
 +  CC=$lt_save_CC
 +  CFLAGS=$lt_save_CFLAGS
-+fi # test "$_lt_disable_FC" != yes
++fi # test yes != "$_lt_disable_FC"
 +
 +AC_LANG_POP
 +])# _LT_LANG_FC_CONFIG
@@ -73907,7 +78064,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# --------------------------
 +# Ensure that the configuration variables for the GNU Java Compiler compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_GCJ_CONFIG],
 +[AC_REQUIRE([LT_PROG_GCJ])dnl
 +AC_LANG_SAVE
@@ -73941,7 +78098,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +CFLAGS=$GCJFLAGS
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
++_LT_TAGVAR(LD, $1)=$LD
 +_LT_CC_BASENAME([$compiler])
 +
 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -73978,7 +78135,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# --------------------------
 +# Ensure that the configuration variables for the GNU Go compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_GO_CONFIG],
 +[AC_REQUIRE([LT_PROG_GO])dnl
 +AC_LANG_SAVE
@@ -74012,7 +78169,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +CFLAGS=$GOFLAGS
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
++_LT_TAGVAR(LD, $1)=$LD
 +_LT_CC_BASENAME([$compiler])
 +
 +# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -74049,7 +78206,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# -------------------------
 +# Ensure that the configuration variables for the Windows resource compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_RC_CONFIG],
 +[AC_REQUIRE([LT_PROG_RC])dnl
 +AC_LANG_SAVE
@@ -74065,7 +78222,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
++lt_simple_link_test_code=$lt_simple_compile_test_code
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_TAG_COMPILER
@@ -74075,7 +78232,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_LINKER_BOILERPLATE
 +
 +# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
++lt_save_CC=$CC
 +lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=
@@ -74104,7 +78261,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
 +  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
 +    [AC_CHECK_TOOL(GCJ, gcj,)
-+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
 +      AC_SUBST(GCJFLAGS)])])[]dnl
 +])
 +
@@ -74215,7 +78372,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
 +# along with /bin/sed that truncates output.
 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && continue
++  test ! -f "$lt_ac_sed" && continue
 +  cat /dev/null > conftest.in
 +  lt_ac_count=0
 +  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -74232,9 +78389,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
 +    cmp -s conftest.out conftest.nl || break
 +    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
++    test 10 -lt "$lt_ac_count" && break
 +    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
++    if test "$lt_ac_count" -gt "$lt_ac_max"; then
 +      lt_ac_max=$lt_ac_count
 +      lt_cv_path_SED=$lt_ac_sed
 +    fi
@@ -74258,27 +78415,7 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +# Find out whether the shell is Bourne or XSI compatible,
 +# or has some other useful features.
 +m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,b/c, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
 +  lt_unset=false
@@ -74302,102 +78439,9 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +])# _LT_CHECK_SHELL_FEATURES
 +
 +
-+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-+# ------------------------------------------------------
-+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-+m4_defun([_LT_PROG_FUNCTION_REPLACE],
-+[dnl {
-+sed -e '/^$1 ()$/,/^} # $1 /c\
-+$1 ()\
-+{\
-+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+])
-+
-+
-+# _LT_PROG_REPLACE_SHELLFNS
-+# -------------------------
-+# Replace existing portable implementations of several shell functions with
-+# equivalent extended shell implementations where those features are available..
-+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-+[if test x"$xsi_shell" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-+    func_basename_result="${1##*/}"])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac
-+    func_basename_result="${1##*/}"])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+    # positional parameters, so assign one to ordinary parameter first.
-+    func_stripname_result=${3}
-+    func_stripname_result=${func_stripname_result#"${1}"}
-+    func_stripname_result=${func_stripname_result%"${2}"}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+    func_split_long_opt_name=${1%%=*}
-+    func_split_long_opt_arg=${1#*=}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+    func_split_short_opt_arg=${1#??}
-+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+    case ${1} in
-+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+      *)    func_lo2o_result=${1} ;;
-+    esac])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-+fi
-+
-+if test x"$lt_shell_append" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+    func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-+
-+  # Save a `func_append' function call where possible by direct use of '+='
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+  # Save a `func_append' function call even when '+=' is not available
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+fi
-+
-+if test x"$_lt_function_replace_fail" = x":"; then
-+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-+fi
-+])
-+
 +# _LT_PATH_CONVERSION_FUNCTIONS
 +# -----------------------------
-+# Determine which file name conversion functions should be used by
++# Determine what file name conversion functions should be used by
 +# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
 +# for certain cross-compile configurations and native mingw.
 +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
@@ -74461,21 +78505,21 @@ diff -ruN arpack-ng-3.9.0/m4/libtool.m4 arpack-ng-3.9.0-patch/m4/libtool.m4
 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
 +         [0], [convert $build files to toolchain format])dnl
 +])# _LT_PATH_CONVERSION_FUNCTIONS
-diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
---- arpack-ng-3.9.0/m4/ltoptions.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/m4/ltoptions.m4	2023-02-12 10:13:26.944109889 +0000
-@@ -0,0 +1,384 @@
+diff -ruN arpack-ng-3.9.1/m4/ltoptions.m4 arpack-ng-3.9.1-patch/m4/ltoptions.m4
+--- arpack-ng-3.9.1/m4/ltoptions.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/m4/ltoptions.m4	2023-11-11 16:51:16.271915112 +0900
+@@ -0,0 +1,437 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
-+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-+#   Inc.
++#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
++#   Foundation, Inc.
 +#   Written by Gary V. Vaughan, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
-+# serial 7 ltoptions.m4
++# serial 8 ltoptions.m4
 +
 +# This is to help aclocal find these macros, as it can't see m4_define.
 +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -74496,7 +78540,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
 +        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
++    [m4_warning([Unknown $1 option '$2'])])[]dnl
 +])
 +
 +
@@ -74542,13 +78586,15 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +  dnl
 +  dnl If no reference was made to various pairs of opposing options, then
 +  dnl we run the default mode handler for the pair.  For example, if neither
-+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
++  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
 +  dnl archives by default:
 +  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+  		   [_LT_ENABLE_FAST_INSTALL])
++		   [_LT_ENABLE_FAST_INSTALL])
++  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
++		   [_LT_WITH_AIX_SONAME([aix])])
 +  ])
 +])# _LT_SET_OPTIONS
 +
@@ -74579,7 +78625,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +[_LT_SET_OPTION([LT_INIT], [dlopen])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
++put the 'dlopen' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
@@ -74615,7 +78661,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +_LT_SET_OPTION([LT_INIT], [win32-dll])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
++put the 'win32-dll' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
@@ -74624,9 +78670,9 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +
 +# _LT_ENABLE_SHARED([DEFAULT])
 +# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-shared flag, and supports the 'shared' and
++# 'disable-shared' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_SHARED],
 +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([shared],
@@ -74639,14 +78685,14 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +    *)
 +      enable_shared=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_shared=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac],
 +    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -74678,9 +78724,9 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +
 +# _LT_ENABLE_STATIC([DEFAULT])
 +# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-static flag, and support the 'static' and
++# 'disable-static' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_STATIC],
 +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([static],
@@ -74693,14 +78739,14 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +    *)
 +     enable_static=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_static=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac],
 +    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -74732,9 +78778,9 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +
 +# _LT_ENABLE_FAST_INSTALL([DEFAULT])
 +# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-fast-install flag, and support the 'fast-install'
++# and 'disable-fast-install' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_FAST_INSTALL],
 +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([fast-install],
@@ -74747,14 +78793,14 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +    *)
 +      enable_fast_install=no
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$pkg" = "X$p"; then
 +	  enable_fast_install=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac],
 +    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -74771,14 +78817,14 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
++the 'fast-install' option into LT_INIT's first parameter.])
 +])
 +
 +AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 +[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
++the 'disable-fast-install' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
@@ -74786,11 +78832,64 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 +
 +
++# _LT_WITH_AIX_SONAME([DEFAULT])
++# ----------------------------------
++# implement the --with-aix-soname flag, and support the `aix-soname=aix'
++# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
++# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
++m4_define([_LT_WITH_AIX_SONAME],
++[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
++shared_archive_member_spec=
++case $host,$enable_shared in
++power*-*-aix[[5-9]]*,yes)
++  AC_MSG_CHECKING([which variant of shared library versioning to provide])
++  AC_ARG_WITH([aix-soname],
++    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
++      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
++    [case $withval in
++    aix|svr4|both)
++      ;;
++    *)
++      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
++      ;;
++    esac
++    lt_cv_with_aix_soname=$with_aix_soname],
++    [AC_CACHE_VAL([lt_cv_with_aix_soname],
++      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
++    with_aix_soname=$lt_cv_with_aix_soname])
++  AC_MSG_RESULT([$with_aix_soname])
++  if test aix != "$with_aix_soname"; then
++    # For the AIX way of multilib, we name the shared archive member
++    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
++    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
++    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
++    # the AIX toolchain works better with OBJECT_MODE set (default 32).
++    if test 64 = "${OBJECT_MODE-32}"; then
++      shared_archive_member_spec=shr_64
++    else
++      shared_archive_member_spec=shr
++    fi
++  fi
++  ;;
++*)
++  with_aix_soname=aix
++  ;;
++esac
++
++_LT_DECL([], [shared_archive_member_spec], [0],
++    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
++])# _LT_WITH_AIX_SONAME
++
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
++
++
 +# _LT_WITH_PIC([MODE])
 +# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 +# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 +m4_define([_LT_WITH_PIC],
 +[AC_ARG_WITH([pic],
 +    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -74801,19 +78900,17 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +    *)
 +      pic_mode=default
 +      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 +      for lt_pkg in $withval; do
-+	IFS="$lt_save_ifs"
++	IFS=$lt_save_ifs
 +	if test "X$lt_pkg" = "X$lt_p"; then
 +	  pic_mode=yes
 +	fi
 +      done
-+      IFS="$lt_save_ifs"
++      IFS=$lt_save_ifs
 +      ;;
 +    esac],
-+    [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++    [pic_mode=m4_default([$1], [default])])
 +
 +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 +])# _LT_WITH_PIC
@@ -74826,7 +78923,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +[_LT_SET_OPTION([LT_INIT], [pic-only])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
++put the 'pic-only' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
@@ -74849,13 +78946,14 @@ diff -ruN arpack-ng-3.9.0/m4/ltoptions.m4 arpack-ng-3.9.0-patch/m4/ltoptions.m4
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
-diff -ruN arpack-ng-3.9.0/m4/ltsugar.m4 arpack-ng-3.9.0-patch/m4/ltsugar.m4
---- arpack-ng-3.9.0/m4/ltsugar.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/m4/ltsugar.m4	2023-02-12 10:13:27.054110334 +0000
-@@ -0,0 +1,123 @@
+diff -ruN arpack-ng-3.9.1/m4/ltsugar.m4 arpack-ng-3.9.1-patch/m4/ltsugar.m4
+--- arpack-ng-3.9.1/m4/ltsugar.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/m4/ltsugar.m4	2023-11-11 16:51:16.312915271 +0900
+@@ -0,0 +1,124 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
++# Foundation, Inc.
 +# Written by Gary V. Vaughan, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
@@ -74888,7 +78986,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltsugar.m4 arpack-ng-3.9.0-patch/m4/ltsugar.m4
 +# ------------
 +# Manipulate m4 lists.
 +# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
++# Autoconf-2.59, which quotes differently.
 +m4_define([lt_car], [[$1]])
 +m4_define([lt_cdr],
 +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -74899,7 +78997,7 @@ diff -ruN arpack-ng-3.9.0/m4/ltsugar.m4 arpack-ng-3.9.0-patch/m4/ltsugar.m4
 +
 +# lt_append(MACRO-NAME, STRING, [SEPARATOR])
 +# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 +# Note that neither SEPARATOR nor STRING are expanded; they are appended
 +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 +# No SEPARATOR is output if MACRO-NAME was previously undefined (different
@@ -74976,13 +79074,13 @@ diff -ruN arpack-ng-3.9.0/m4/ltsugar.m4 arpack-ng-3.9.0-patch/m4/ltsugar.m4
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
-diff -ruN arpack-ng-3.9.0/m4/ltversion.m4 arpack-ng-3.9.0-patch/m4/ltversion.m4
---- arpack-ng-3.9.0/m4/ltversion.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/m4/ltversion.m4	2023-02-12 10:13:27.163110776 +0000
+diff -ruN arpack-ng-3.9.1/m4/ltversion.m4 arpack-ng-3.9.1-patch/m4/ltversion.m4
+--- arpack-ng-3.9.1/m4/ltversion.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/m4/ltversion.m4	2023-11-11 16:51:16.352915425 +0900
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
++#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 +#   Written by Scott James Remnant, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
@@ -74991,25 +79089,26 @@ diff -ruN arpack-ng-3.9.0/m4/ltversion.m4 arpack-ng-3.9.0-patch/m4/ltversion.m4
 +
 +# @configure_input@
 +
-+# serial 3337 ltversion.m4
++# serial 4179 ltversion.m4
 +# This file is part of GNU Libtool
 +
-+m4_define([LT_PACKAGE_VERSION], [2.4.2])
-+m4_define([LT_PACKAGE_REVISION], [1.3337])
++m4_define([LT_PACKAGE_VERSION], [2.4.6])
++m4_define([LT_PACKAGE_REVISION], [2.4.6])
 +
 +AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.4.2'
-+macro_revision='1.3337'
++[macro_version='2.4.6'
++macro_revision='2.4.6'
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
-diff -ruN arpack-ng-3.9.0/m4/lt~obsolete.m4 arpack-ng-3.9.0-patch/m4/lt~obsolete.m4
---- arpack-ng-3.9.0/m4/lt~obsolete.m4	1970-01-01 00:00:00.000000000 +0000
-+++ arpack-ng-3.9.0-patch/m4/lt~obsolete.m4	2023-02-12 10:13:27.268111202 +0000
-@@ -0,0 +1,98 @@
+diff -ruN arpack-ng-3.9.1/m4/lt~obsolete.m4 arpack-ng-3.9.1-patch/m4/lt~obsolete.m4
+--- arpack-ng-3.9.1/m4/lt~obsolete.m4	1970-01-01 09:00:00.000000000 +0900
++++ arpack-ng-3.9.1-patch/m4/lt~obsolete.m4	2023-11-11 16:51:16.396915595 +0900
+@@ -0,0 +1,99 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
-+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
++#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
++#   Foundation, Inc.
 +#   Written by Scott James Remnant, 2004.
 +#
 +# This file is free software; the Free Software Foundation gives
@@ -75020,7 +79119,7 @@ diff -ruN arpack-ng-3.9.0/m4/lt~obsolete.m4 arpack-ng-3.9.0-patch/m4/lt~obsolete
 +
 +# These exist entirely to fool aclocal when bootstrapping libtool.
 +#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 +# which have later been changed to m4_define as they aren't part of the
 +# exported API, or moved to Autoconf or Automake where they belong.
 +#
@@ -75034,7 +79133,7 @@ diff -ruN arpack-ng-3.9.0/m4/lt~obsolete.m4 arpack-ng-3.9.0-patch/m4/lt~obsolete
 +# included after everything else.  This provides aclocal with the
 +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 +# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 +#
 +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 +# Yes, that means every name once taken will need to remain here until
diff --git a/hdf5/cppbuild.sh b/hdf5/cppbuild.sh
index d7c8cfce9b9..75d02856786 100755
--- a/hdf5/cppbuild.sh
+++ b/hdf5/cppbuild.sh
@@ -22,6 +22,7 @@ INSTALL_PATH=`pwd`
 echo "Decompressing archives..."
 tar --totals -xf ../hdf5-$HDF5_VERSION.tar.bz2
 tar --totals -xf ../libaec-$AEC_VERSION.tar.gz
+tar --totals -xf ../$ZLIB.tar.gz
 pushd hdf5-$HDF5_VERSION
 
 #sedinplace '/cmake_minimum_required/d' $(find ./ -iname CMakeLists.txt)
@@ -189,14 +190,17 @@ case $PLATFORM in
         ninja install
         popd
 
+        mkdir -p ../$ZLIB/build
+        pushd ../$ZLIB/build
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH ..
+        ninja -j $MAKEJ
+        ninja install
+        popd
+
         mkdir -p build/bin
         cp ../lib/*.lib build/bin
         pushd build
-        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DSZAEC_TGZ_NAME:STRING="libaec-$AEC_VERSION.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -DHDF5_ENABLE_SZIP_ENCODING=ON -DUSE_LIBAEC=ON -DSZIP_LIBRARY:FILEPATH="$INSTALL_PATH/lib/szip_static.lib" -DSZIP_INCLUDE_DIR="$INSTALL_PATH/include" -DSZIP_USE_EXTERNAL:BOOL=OFF -DHDF5_BUILD_CPP_LIB=ON -DHDF5_BUILD_JAVA=ON ..
-        sedinplace 's/Release\\libz.lib/zlibstatic.lib/g' build.ninja
-        sedinplace 's/Release\\libaec.lib/aec_static.lib/g' build.ninja
-        sedinplace 's/Release\\libszaec.lib/szip_static.lib/g' build.ninja
-        ninja -j $MAKEJ HDF5_ZLIB
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DZLIB_LIBRARY="$INSTALL_PATH/lib/zlibstatic.lib" -DZLIB_INCLUDE_DIR="$INSTALL_PATH/include" -DZLIB_USE_EXTERNAL=OFF -DSZIP_LIBRARY="$INSTALL_PATH/lib/szip-static.lib" -DSZIP_INCLUDE_DIR="$INSTALL_PATH/include" -DSZIP_USE_EXTERNAL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -DHDF5_ENABLE_SZIP_ENCODING=ON -DUSE_LIBAEC=ON -DHDF5_BUILD_CPP_LIB=ON -DHDF5_BUILD_JAVA=ON ..
         ninja -j $MAKEJ
         ninja install
         cp bin/zlib* ../../lib/
@@ -213,15 +217,17 @@ case $PLATFORM in
         ninja install
         popd
 
+        mkdir -p ../$ZLIB/build
+        pushd ../$ZLIB/build
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH ..
+        ninja -j $MAKEJ
+        ninja install
+        popd
+
         mkdir -p build/bin
         cp ../lib/*.lib build/bin
         pushd build
-        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DSZAEC_TGZ_NAME:STRING="libaec-$AEC_VERSION.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -DHDF5_ENABLE_SZIP_ENCODING=ON -DUSE_LIBAEC=ON -DSZIP_LIBRARY:FILEPATH="$INSTALL_PATH/lib/szip_static.lib" -DSZIP_INCLUDE_DIR="$INSTALL_PATH/include" -DSZIP_USE_EXTERNAL:BOOL=OFF -DHDF5_BUILD_CPP_LIB=ON -DHDF5_BUILD_JAVA=ON ..
-
-        sedinplace 's/Release\\libz.lib/zlibstatic.lib/g' build.ninja
-        sedinplace 's/Release\\libaec.lib/aec_static.lib/g' build.ninja
-        sedinplace 's/Release\\libszaec.lib/szip_static.lib/g' build.ninja
-        ninja -j $MAKEJ HDF5_ZLIB
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DZLIB_LIBRARY="$INSTALL_PATH/lib/zlibstatic.lib" -DZLIB_INCLUDE_DIR="$INSTALL_PATH/include" -DZLIB_USE_EXTERNAL=OFF -DSZIP_LIBRARY="$INSTALL_PATH/lib/szip-static.lib" -DSZIP_INCLUDE_DIR="$INSTALL_PATH/include" -DSZIP_USE_EXTERNAL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -DHDF5_ENABLE_SZIP_ENCODING=ON -DUSE_LIBAEC=ON -DHDF5_BUILD_CPP_LIB=ON -DHDF5_BUILD_JAVA=ON ..
         ninja -j $MAKEJ
         ninja install
         cp bin/zlib* ../../lib/
diff --git a/hdf5/src/main/java/org/bytedeco/hdf5/presets/hdf5.java b/hdf5/src/main/java/org/bytedeco/hdf5/presets/hdf5.java
index 2c301d21b05..9488a3c4f30 100644
--- a/hdf5/src/main/java/org/bytedeco/hdf5/presets/hdf5.java
+++ b/hdf5/src/main/java/org/bytedeco/hdf5/presets/hdf5.java
@@ -51,7 +51,7 @@
         "H5FaccProp.h", "H5FcreatProp.h", "H5AtomType.h", "H5PredType.h", "H5EnumType.h", "H5IntType.h", "H5FloatType.h", "H5StrType.h", "H5CompType.h",
         "H5ArrayType.h", "H5VarLenType.h", "H5DataSet.h", "H5Group.h", "H5File.h", "H5Library.h"},
             link = {"hdf5@.310", "hdf5_cpp@.310", "hdf5_hl@.310", "hdf5_hl_cpp@.310"}, resource = {"include", "lib"}),
-    @Platform(value = "windows", link = {"zlibstatic", "libhdf5", "libhdf5_cpp", "libhdf5_hl", "libhdf5_hl_cpp", "aec_static", "szip_static"}) })
+    @Platform(value = "windows", link = {"shlwapi#", "zlibstatic", "libhdf5", "libhdf5_cpp", "libhdf5_hl", "libhdf5_hl_cpp", "aec-static", "szip-static"}) })
 public class hdf5 implements InfoMapper {
     static { Loader.checkVersion("org.bytedeco", "hdf5"); }